Changeset 185 in tracdarcs

Timestamp:

06/11/10 16:05:16 (20 months ago)

Author:

lele@…

Hash name:

20100611140516-97f81-7eff9b8bd5140541eff4858d96bcf7b194974480

Message:

Implement eager cache
A new option, eager_annotations, controls whether the cache is
computed lazily as before, that is on demand at the first request, or
when the changeset is added (at sync time).

Location:

tracdarcs

Files:

• components.py (modified) (2 diffs)
• repository.py (modified) (3 diffs)
• updatedb.py (modified) (1 diff)

tracdarcs/components.py

@@ -44 +44 @@
     possible_encodings = Option('darcs', 'possible_encodings', 'utf-8,iso8859-1',
                                 "Specify possible repository encodings.")
+
+    eager_annotations = BoolOption('darcs', 'eager_annotations', 'false',
+                                   "Compute the annotation cache as soon as possible.")
 
     # IRepositoryConnector methods
@@ -70 +73 @@
                 DarcsCommand.RUNNING_DARCSES = BoundedSemaphore(value=int(self.max_concurrent_darcses))
 
-        return DarcsRepository(db, dir, self.env.log, darcs, possible_encodings, params)
+        return DarcsRepository(db, dir, self.env.log, darcs, possible_encodings, params,
+                               self.eager_annotations)
 
     # IWikiSyntaxProvider methods

tracdarcs/repository.py

@@ -61 +61 @@
 
 class DarcsRepository(Repository):
-    def __init__(self, db, path, log, darcscmd, possible_encodings, params):
+    def __init__(self, db, path, log, darcscmd, possible_encodings,
+                 params, eager_annotations):
         if IS_TRAC_0_12_OR_BETTER:
             Repository.__init__(self, 'darcs:%s' % path, params, log)
@@ -72 +73 @@
             self.log = log
             self.id = get_repository_id(db, path) or 0
+        self.eager_annotations = eager_annotations
         if IS_TRAC_0_10_X:
             self.sync()
@@ -233 +235 @@
 
     def sync(self, rev_callback=None, clean=False):
+        from dbutil import format_elapsed_time as trepr
+
         # Import any new changesets, if any
-        update_darcsdb(self.db, self.__cmd, self.log, self.id,
-                       rev_callback=rev_callback, clean=clean)
+
+        newrevs = update_darcsdb(self.db, self.__cmd, self.log, self.id,
+                                 rev_callback=rev_callback, clean=clean)
+
+        # In eager mode, precompute the content and the annotations for
+        # each file modified or added by latest changesets
+
+        if self.eager_annotations and newrevs:
+            i = 1
+            count = len(newrevs)
+            for rev in newrevs:
+                t0 = time.time()
+
+                c = self.get_changeset(rev)
+                for path,kind,change,prev_path,prev_rev in c.get_changes():
+                    if kind==Node.FILE and (change==Changeset.EDIT or change==Changeset.ADD):
+                        node = self.get_node(path, rev)
+                        node.get_content()
+                        node.get_annotations()
+
+                t1 = time.time()
+                usec = (t1-t0) * 1e6
+                self.log.info('Preannotated changeset %d/%d: %s', i, count, trepr(usec))
+                i += 1
 
 class DarcsNode(Node):

tracdarcs/updatedb.py

@@ -162 +162 @@
         for rev in revscommitted:
             rev_callback(rev)
+
+    return revscommitted
 
 def get_last_hash(db, repo_id):