Merge lp:~ben-a/u1db/fixes--1262956 into lp:u1db

[B Carrillo]

avoids double iteration

[lp:~ben-a/u1db/fixes--1262956]

444. By B Carrillo on 2013-12-20

Avoid double iteration

[dobey (dobey)]

This change results in 25 tests failing. You can run the tests with: (mkdir -p build && cd build && cmake .. && make check)

These tests will have to not fail, and it would be nice if there were a way to test this specific change as well.

review: Needs Fixing

[dobey (dobey)]

A month with no replies, so rejecting this.

Unmerged revisions

444. By B Carrillo on 2013-12-20

Avoid double iteration

=== modified file 'u1db/sync.py'
--- u1db/sync.py	2012-10-09 17:00:12 +0000
+++ u1db/sync.py	2013-12-20 03:49:42 +0000
@@ -134,10 +134,9 @@
         # prepare to send all the changed docs
         docs_to_send = self.source.get_docs(changed_doc_ids,
             check_for_conflicts=False, include_deleted=True)
-        # TODO: there must be a way to not iterate twice
-        docs_by_generation = zip(
-            docs_to_send, (gen for _, gen, _ in changes),
-            (trans for _, _, trans in changes))
+        docs_by_generation = (
+            (doc, gen, trans)
+            for (doc, (_, gen, trans)) in zip(docs_to_send, changes))
 
         # exchange documents and try to insert the returned ones with
         # the target, return target synced-up-to gen