git-ds 0.9.8 → 0.9.8.1

data/ChangeLog

@@ -1,3 +1,7 @@
+2011-07-30 :	mkfs <mkfs@thoughtgang.org>
+	*	Model#batch is now a wrapper for Database#batch
+	*	Transaction#perform now executes in batch mode
+
 2011-07-26 :	mkfs <mkfs@thoughtgang.org>
 	*	Added batch method as an optimization
 

data/lib/git-ds/database.rb

@@ -223,7 +223,6 @@ See Transaction.
       return transaction_in_staging(true, &block) if self.staging?
 
       begin
-        self.staging
         transaction_in_staging(false, &block)
       ensure
         self.unstage
@@ -339,6 +338,49 @@ See Database#transaction .
       rv
     end
 
+=begin rdoc
+Execute a block using an in-memory Staging index.
+
+This is an optimization. It writes the current index to the git staging index
+on disk, replaces it with an in-memory index that DOES NOT write to the object
+tree on disk, invokes the block, writes the in-memory index to the git staging
+index on disk, then reads the staging index into the repo/database and makes
+it the current index.
+
+The idea is to reduce disk writes caused by exec and transaction, which can
+end up being very costly when nested.
+
+NOTE: branch-and-merge will fail if in batch mode (TODO: FIX).
+=end
+    def batch(&block)
+      # NOTE: the use of 'self.staging' is quite important in this method.
+
+      # write current index to git-staging-index
+      idx = self.staging? ? self.staging : nil
+      idx.sync if idx
+
+      # replace current index with an in-mem staging index
+      unstage
+      self.staging=StageMemIndex.read(self)
+
+      begin
+        yield staging if block_given?
+
+      rescue Exception => e
+        # ensure index is discarded if there is a problem
+        unstage
+        self.staging if idx
+        raise e
+      end
+
+      # write in-mem staging index to git-staging-index
+      self.staging.sync
+
+      # read git-staging-index if appropriate
+      unstage
+      self.staging if idx
+    end
+
     # ----------------------------------------------------------------------
     private
 

data/lib/git-ds/index.rb

@@ -203,10 +203,33 @@ This can be used to access index contents created by command-line tools.
 
   end
 
+=begin rdoc
+In-memory staging index.
+
+This replaces the StageIndex#build method with a nop, so that the index is
+not written to disk.
+
+This is primarily useful in transactions or in methods such as Database#batch.
+Keepin the tree in-memory as long as necessary reduces disk writes and
+speeds up bulk insert/delete operations.
+=end
   class StageMemIndex < StageIndex
+
+=begin rdoc
+Return the sha of the stage index on disk. This DOES NOT synchronize the
+in-memory index with the on-disk index.
+=end
     def build
       return @sha
     end
+
+=begin rdoc
+Override StageIndex#sync to not rely on StageIndex#build.
+=end
+    def sync
+      self.read_tree(self.write)
+      @repo.exec_in_git_dir { `git read-tree #{@sha}` }
+    end
   end
 
 

data/lib/git-ds/model.rb

@@ -136,34 +136,10 @@ See Database#branch_and_merge.
 =begin
 Execute a block using an in-memory Staging index.
 
-This is an optimization. It writes the current index to the git staging index
-on disk, replaces it with an in-memory index that DOES NOT write to the object
-tree on disk, invokes the block, writes the in-memory index to the git staging
-index on disk, then reads the staging index into the repo/database and makes
-it the current index.
-
-The idea is to reduce disk writes caused by exec and transaction, which can
-end up being very costly when nested.
-
-NOTE: branch-and-merge will fail if in batch mode.
+This isjust a wrapper for Database#batch.
 =end
     def batch(&block)
-      # write current index to git-staging-index
-      idx = (@db.staging?) ? @db.staging : nil
-      idx.sync if idx
-
-      # replace current index with an in-mem staging index
-      @db.unstage
-      @db.staging=StageMemIndex.read(@db)
-
-      yield @db.staging if block_given?
-
-      # write in-mem staging index to git-staging-index
-      @db.staging.sync
-
-      # read git-staging-index if appropriate
-      @db.unstage
-      @db.staging if idx
+      @db.batch(&block)
     end
 
   end

data/lib/git-ds/transaction.rb

@@ -38,25 +38,13 @@ rollback() is called.
 =end
     def perform
       @propagate_exceptions = false # propagation off by default
-      rv = true
-      begin
-        instance_eval(&self.block)
-      rescue Exception => e
-        raise e if self.nested
-        raise e if (not e.kind_of? TransactionRollback) && @propagate_exceptions
-              
-        rv = false
-      end
 
-      if rv
-        self.index.build  # required during nesting to support merge_and_branch
-        if not self.nested
-          commit
-          @database.notify
-        end
-      end
+      return perform_top_level if not self.nested
 
-      rv
+      instance_eval(&self.block)
+      index.build 
+
+      true
     end
 
 =begin rdoc
@@ -76,5 +64,38 @@ Abort the transaction.
       raise TransactionRollback.new
     end
 
+=begin rdoc
+Overrides ExecCmd#index accessor as the Transaction index will change if
+batch mode is used.
+=end
+    def index
+      database.index
+    end
+
+    private
+
+=begin rdoc
+Top-level transactions are performed in batch mode to speed things up.
+=end
+    def perform_top_level
+      @propagate_exceptions = true
+      rv = true
+
+      begin
+        xact = self
+        database.batch do
+          xact.instance_eval(&xact.block)
+        end
+
+        commit
+        @database.notify
+      rescue Exception => e
+        raise e if (not e.kind_of? TransactionRollback) && @propagate_exceptions
+        rv = false
+      end
+
+      rv
+    end
+
   end
 end

data/tests/ut_database.rb

@@ -215,8 +215,9 @@ class TC_GitDatabaseTest < Test::Unit::TestCase
     
     # test rollback on raise
     @db.transaction {
+      propagate
       index.add(name1, data1)
-      raise "ROLLBACK!"
+      rollback
     }
     blob = index.current_tree./(name1)
     assert_nil(blob, "transaction raise still created '#{name1}' in staging")

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: git-ds
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 9
   - 8
-  version: 0.9.8
+  - 1
+  version: 0.9.8.1
 platform: ruby
 authors: 
 - TG Community
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -04:00
+date: 2011-07-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency