bud 0.1.0.pre1 → 0.9.0

data/lib/bud/storage/dbm.rb

@@ -1,10 +1,9 @@
 require 'dbm'
 
 module Bud
-  # Persistent table implementation based on ndbm.
+  # Persistent table implementation based on dbm.
   class BudDbmTable < BudPersistentCollection # :nodoc: all
     def initialize(name, bud_instance, given_schema)
-      @invalidated = true
       dbm_dir = bud_instance.options[:dbm_dir]
       raise Bud::Error, "dbm support must be enabled via 'dbm_dir'" unless dbm_dir
       if bud_instance.port.nil?
@@ -23,6 +22,7 @@ module Bud
 
       super(name, bud_instance, given_schema)
       @to_delete = []
+      @invalidated = true
 
       db_fname = "#{dirname}/#{name}.dbm"
       flags = DBM::WRCREAT
@@ -70,7 +70,6 @@ module Bud
     end
 
     def make_tuple(k_ary, v_ary)
-      #t = Array.new(k_ary.length + v_ary.length)
       t = @struct.new
       @key_colnums.each_with_index do |k,i|
         t[k] = k_ary[i]
@@ -85,7 +84,7 @@ module Bud
       each_from([@delta], &block)
       each_storage(&block)
     end
-    
+
     def each_raw(&block)
       each_storage(&block)
     end
@@ -142,7 +141,7 @@ module Bud
     def tick_deltas
       unless @delta.empty?
         merge_to_db(@delta)
-        @tick_delta += @delta.values
+        @tick_delta += @delta.values if accumulate_tick_deltas
         @delta.clear
       end
       unless @new_delta.empty?
@@ -151,7 +150,7 @@ module Bud
       end
       return !(@delta.empty?)
     end
-    
+
     public
     def flush_deltas
       unless @delta.empty?
@@ -164,21 +163,20 @@ module Bud
     end
 
     # This is verbatim from BudTable.  Need to DRY up.  Should we be a subclass of BudTable?
-    public 
+    public
     def pending_delete(o)
       if o.class <= Bud::PushElement
          o.wire_to_delete self
-       elsif o.class <= Bud::BudCollection
-         o.pro.wire_to_delete self
-       else
-         @to_delete = @to_delete + o.map{|t| prep_tuple(t) unless t.nil?}
-       end
+      elsif o.class <= Bud::BudCollection
+        o.pro.wire_to_delete self
+      else
+        @to_delete = @to_delete + o.map{|t| prep_tuple(t) unless t.nil?}
+      end
     end
     superator "<-" do |o|
       pending_delete(o)
     end
-    
-    
+
     def insert(tuple)
       key = get_key_vals(tuple)
       merge_tuple_to_db(key, tuple)
@@ -215,15 +213,7 @@ module Bud
     def invalidate_cache
     end
 
-    def method_missing(sym, *args, &block)
-      @dbm.send sym, *args, &block
-    end
-
-    public
-    def length
-      @dbm.length
-    end
-
+    # XXX: shouldn't this check @delta as well?
     public
     def empty?
       @dbm.empty?

data/lib/bud/storage/zookeeper.rb

@@ -36,10 +36,6 @@ module Bud
       stat_and_watch
     end
 
-    def clone_empty
-      raise Bud::Error
-    end
-
     def stat_and_watch
       r = @zk.stat(:path => @zk_path, :watcher => @stat_watcher)
       @stat_watch_id = r[:req_id]