bud 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,12 @@
+== 0.9.4 / 2012-09-06
+
+* Optimize grouping performance
+* Fix regression in dbm-backed collections with MRI 1.8
+* Fix regression in grouping operator with MRI 1.8 (#280)
+* Fix bug in programs that applied non-monotonic operators to scratch
+  collections under certain circumstances (#281)
+* Fix bug in "notin" with multiple qualifiers (#282)
+
 == 0.9.3 / 2012-08-20
 
 * Change behavior of accum() aggregate to return a Set, rather than an Array in

data/lib/bud.rb

@@ -466,16 +466,13 @@ module Bud
       rescan_invalidate_tc(stratum, rescan, invalidate)
     end
 
-    puts "(PRE) Default rescan: #{rescan.inspect}" if $BUD_DEBUG
-    puts "(PRE) Default inval: #{invalidate.inspect}" if $BUD_DEBUG
-
     prune_rescan_invalidate(rescan, invalidate)
     # transitive closure
     @default_rescan = rescan.to_a
     @default_invalidate = invalidate.to_a
 
-    puts "(POST) Default rescan: #{rescan.inspect}" if $BUD_DEBUG
-    puts "(POST) Default inval: #{invalidate.inspect}" if $BUD_DEBUG
+    puts "Default rescan: #{rescan.inspect}" if $BUD_DEBUG
+    puts "Default inval: #{invalidate.inspect}" if $BUD_DEBUG
 
     # Now compute for each table that is to be scanned, the set of dependent
     # tables and elements that will be invalidated if that table were to be

data/lib/bud/collections.rb

@@ -254,6 +254,11 @@ module Bud
       @storage.each_value(&block)
     end
 
+    public
+    def each_tick_delta(&block)
+      @tick_delta.each(&block)
+    end
+
     public
     def invalidate_at_tick
       true # being conservative here as a default.
@@ -566,16 +571,16 @@ module Bud
     public
     def tick_deltas # :nodoc: all
       unless @delta.empty?
-        puts "#{qualified_tabname}.tick_delta delta --> storage (#{@delta.size} elems)" if $BUD_DEBUG
+        puts "#{qualified_tabname}.tick_deltas delta --> storage (#{@delta.size} elems)" if $BUD_DEBUG
         @storage.merge!(@delta)
         @tick_delta.concat(@delta.values) if accumulate_tick_deltas
         @delta.clear
       end
 
       unless @new_delta.empty?
-        puts "#{qualified_tabname}.tick_delta new_delta --> delta (#{@new_delta.size} elems)" if $BUD_DEBUG
+        puts "#{qualified_tabname}.tick_deltas new_delta --> delta (#{@new_delta.size} elems)" if $BUD_DEBUG
 
-        # NB: key conflicts between different new_delta tuples are detected in
+        # NB: key conflicts between two new_delta tuples are detected in
         # do_insert().
         @new_delta.each_pair do |key, tup|
           merge_to_buf(@delta, key, tup, @storage[key])
@@ -713,10 +718,18 @@ module Bud
   end
 
   class BudScratch < BudCollection # :nodoc: all
+    # We don't need to accumulate @tick_delta separately from @storage for
+    # scratch collections, since @storage for scratches doesn't persistent
+    # across ticks (semantics-wise, at least).
     def accumulate_tick_deltas
       false
     end
 
+    public
+    def each_tick_delta(&block)
+      @storage.each_value(&block)
+    end
+
     public
     def tick  # :nodoc: all
       @delta.clear
@@ -808,10 +821,9 @@ module Bud
     end
 
     def bootstrap
-      # override BudCollection;  pending should not be moved into delta.
+      # override BudCollection; pending should not be moved into delta.
     end
 
-
     private
     def remove_at_sign!(cols)
       i = cols.find_index {|c| c.to_s.start_with? "@"}

data/lib/bud/executor/elements.rb

@@ -492,7 +492,7 @@ module Bud
         else
           # In the first iteration, tick_delta would be non-null IFF the
           # collection has grown in an earlier stratum
-          @collection.tick_delta.each {|item| push_out(item)}
+          @collection.each_tick_delta {|item| push_out(item)}
         end
       end
 

data/lib/bud/executor/group.rb

@@ -35,7 +35,7 @@ module Bud
       end
 
       @seen_new_data = true
-      key = @keys.map{|k| item[k]}
+      key = item.values_at(*@keys)
       group_state = @groups[key]
       if group_state.nil?
         @groups[key] = @aggpairs.map do |ap|
@@ -71,14 +71,12 @@ module Bud
       return unless @seen_new_data
       @seen_new_data = false
 
-      @groups.each do |g, grps|
-        grp = @keys == $EMPTY ? [[]] : [g]
+      @groups.each do |key, group_state|
+        rv = key.clone
         @aggpairs.each_with_index do |ap, agg_ix|
-          grp << ap[0].final(grps[agg_ix])
+          rv << ap[0].final(group_state[agg_ix])
         end
-        outval = grp[0].flatten
-        (1..grp.length-1).each {|i| outval << grp[i]}
-        push_out(outval)
+        push_out(rv)
       end
     end
   end

data/lib/bud/executor/join.rb

@@ -552,10 +552,10 @@ module Bud
       # the tables.
       @lhs_keycols, @rhs_keycols = preds.reduce([[], []]) do |memo, item|
         # each item is a hash
-        l = item.keys[0]
-        r = item.values[0]
-        memo[0] << find_col(l, @lhs)
-        memo[1] << find_col(r, @rhs)
+        item.each_pair do |l, r|
+          memo[0] << find_col(l, @lhs)
+          memo[1] << find_col(r, @rhs)
+        end
         memo
       end
     end

data/lib/bud/storage/dbm.rb

@@ -147,7 +147,7 @@ module Bud
         # We allow @new_delta to contain duplicates but eliminate them here. We
         # can't just allow duplicate delta tuples because that might cause
         # spurious infinite delta processing loops.
-        @new_delta.reject! {|key| self[key] == @new_delta[key]}
+        @new_delta.reject! {|key, val| self[key] == val}
 
         @delta = @new_delta
         @new_delta = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bud
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine