bud 0.9.2 → 0.9.3

data/lib/bud/monkeypatch.rb

@@ -62,7 +62,7 @@ class Array
   alias :oldeq :==
   def ==(o)
     if o.kind_of? Struct
-      o = (o.to_a)
+      o = o.to_a
     end
     self.oldeq(o)
   end

data/lib/bud/rebl.rb

@@ -197,7 +197,7 @@ class LibRebl
   attr_reader :ip, :port, :rebl_class_inst
   @@builtin_tables = [:stdio, :periodics_tbl, :halt, :localtick,
                       :t_depends, :t_cycle, :t_provides, :t_rules,
-                      :t_depends_tc, :t_stratum, :t_underspecified,
+                      :t_stratum, :t_underspecified,
                       :t_table_info, :t_table_schema, :rebl_breakpoint]
   @@classid = 0
 
@@ -326,6 +326,9 @@ class LibRebl
       @rebl_class_inst.tables.merge!(@old_inst.tables.reject do |k,v|
                                        @@builtin_tables.include? k
                                      end)
+      @rebl_class_inst.tables.each do |k,v|
+        v.invalidate_cache
+      end
       @rebl_class_inst.channels.merge!(@old_inst.channels.reject do |k,v|
                                          @@builtin_tables.include? k
                                        end)
@@ -333,7 +336,7 @@ class LibRebl
       @rebl_class_inst.zk_tables.merge! @old_inst.zk_tables
 
       # Fix the bud instance pointers from copied tables.
-      @rebl_class_inst.tables.values.each do |v|
+      @rebl_class_inst.tables.each_value do |v|
         v.bud_instance = @rebl_class_inst
       end
     end

data/lib/bud/rewrite.rb

@@ -72,24 +72,27 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
       # :defn block -- this is where we expect Bloom statements to appear
       do_rule(exp)
     elsif op == :notin
-      # special case. In the rule  "z <= x.notin(y)", z depends positively on x, but negatively on y
-      # See further explanation in the "else" section for why this is a special case.
+      # Special case. In the rule "z <= x.notin(y)", z depends positively on x,
+      # but negatively on y. See further explanation in the "else" section for
+      # why this is a special case.
       notintab = call_to_id(args[1])   # args expected to be of the form (:arglist (:call nil :y ...))
-      @tables[notintab.to_s] = true # "true" denotes non-monotonic dependency.
+      @tables[notintab.to_s] = true    # "true" denotes non-monotonic dependency
       super
     else
-      # Parse a call of the form  a.b.c.foo.
-      # In the most general case, a.b is a nested module, a.b.c is a collection in that module, and
-      # a.b.c.foo is either a method or a field. If it is a method, and non-monotonic at that, we
-      # register a dependency between lhs and the table a.b.c.
-      # Note that notin is treated differently because in  a.b.c.notin(d.e.f), we register a non-monotonic
-      # dependency of lhs on "d.e.f", not with "a.b.c"
+      # Parse a call of the form a.b.c.foo
+      #
+      # In the most general case, a.b is a nested module, a.b.c is a collection
+      # in that module, and a.b.c.foo is either a method or a field. If it is a
+      # method, and non-monotonic at that, we register a dependency between lhs
+      # and the table a.b.c.  Note that notin is treated differently because in
+      # a.b.c.notin(d.e.f), we register a non-monotonic dependency of lhs on
+      # "d.e.f", not with "a.b.c"
       ty, qn, _ = exp_id_type(recv, op, args) # qn = qualified name
       if ty == :collection
         (@tables[qn] = @nm if @collect) unless @tables[qn]
       #elsif ty == :import .. do nothing
       elsif ty == :not_coll_id
-        # check if receiver is a collection, and further if the current exp
+        # Check if receiver is a collection, and further if the current exp
         # represents a field lookup
         op_is_field_name = false
         if recv and recv.first == :call
@@ -99,17 +102,17 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
             op_is_field_name = true if cols and cols.include?(op)
           end
         end
-        # for CALM analysis, mark deletion rules as non-monotonic
+        # For CALM analysis, mark deletion rules as non-monotonic
         @nm = true if op == :-@
         if recv
-          # don't worry about monotone ops, table names, table.attr calls, or
+          # Don't worry about monotone ops, table names, table.attr calls, or
           # accessors of iterator variables
           unless RuleRewriter.is_monotone(op) or op_is_field_name or
                  recv.first == :lvar or op.to_s.start_with?("__")
             @nm = true
           end
         else
-          # function called (implicit receiver = Bud instance) in a user-defined
+          # Function called (implicit receiver = Bud instance) in a user-defined
           # code block. Check if it is non-monotonic (like budtime, that
           # produces a new value every time it is called)
           @nm_funcs_called = true unless RuleRewriter.is_monotone(op)
@@ -126,7 +129,8 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
     MONOTONE_WHITELIST.include?(op)
   end
 
-  # rewrite constant array expressions to lambdas
+  # Rewrite top-level rhs array literals to lambdas. During wiring, these are
+  # turned into coll_expr collections.
   def lambda_rewrite(rhs)
     # the <= case
     if rhs[0] == :array

data/lib/bud/server.rb

@@ -30,7 +30,7 @@ class Bud::BudServer < EM::Connection #:nodoc: all
 
       unless accepted.empty?
         @bud.inbound[tbl_name] ||= []
-        @bud.inbound[tbl_name] += accepted
+        @bud.inbound[tbl_name].concat(accepted)
       end
       buf_leftover[tbl_name] = saved unless saved.empty?
     end

data/lib/bud/source.rb

@@ -61,49 +61,4 @@ module Source
     end
     retval # array of lines
   end
-
-  # Tok is string tokenizer that extracts a substring matching the
-  # supplied regex, and internally advances past the matched substring.
-  # Leading white space is ignored.
-  # tok = Tok.new("foo 123")
-  # x = tok =~ /\w+/  # => x == 'foo'
-  # y = tok =~ /\d+/  # => y = '123'
-  class Tok
-    attr_accessor :str, :group
-    def initialize(str)
-      @str = str
-      @group = nil
-    end
-
-    # match regex at beginning of string, and advance. Return matched token
-    def =~(regex)
-      s = @str
-      skiplen = 0
-      if s =~ /^\s*/
-        skiplen = $&.length
-        s = s[skiplen .. -1]
-      end
-      if (s =~ regex) == 0
-        # Regexp.last_match is local to this thread and method; squirrel
-        # it away for use in tok.[]
-        @group = Regexp.last_match
-        skiplen += $&.length
-        @str = @str[skiplen .. -1]
-        return $&
-      else
-        nil
-      end
-    end
-
-    # get the nth subgroup match
-    # t = Tok.new("a1122b"); t =~ /a(1+)(2+)b/ ; #=> t[0] =  a1122b; t[1] = 11; t[2] = 22
-    def [](n)
-      @group ? @group[n] : nil
-    end
-    def pushBack(str)
-      @str = str + @str
-    end
-
-    def to_s; @str; end
-  end
 end

data/lib/bud/storage/dbm.rb

@@ -126,14 +126,13 @@ module Bud
     end
 
     def merge_tuple_to_db(key, tuple)
-      val = val_cols.map{|c| tuple[cols.index(c)]}
       key_s = MessagePack.pack(key)
-      val_s = MessagePack.pack(val)
       if @dbm.has_key?(key_s)
         old_tuple = self[key]
         raise_pk_error(tuple, old_tuple) if tuple != old_tuple
       else
-        @dbm[key_s] = val_s
+        val = val_cols.map{|c| tuple[cols.index(c)]}
+        @dbm[key_s] = MessagePack.pack(val)
       end
     end
 
@@ -141,10 +140,15 @@ module Bud
     def tick_deltas
       unless @delta.empty?
         merge_to_db(@delta)
-        @tick_delta += @delta.values if accumulate_tick_deltas
+        @tick_delta.concat(@delta.values) if accumulate_tick_deltas
         @delta.clear
       end
       unless @new_delta.empty?
+        # 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]}
+
         @delta = @new_delta
         @new_delta = {}
       end
@@ -155,14 +159,15 @@ module Bud
     def flush_deltas
       unless @delta.empty?
         merge_to_db(@delta)
-        @tick_delta += @delta.values
+        @tick_delta.concat(@delta.values) if accumulate_tick_deltas
         @delta.clear
       end
       merge_to_db(@new_delta)
       @new_delta = {}
     end
 
-    # This is verbatim from BudTable.  Need to DRY up.  Should we be a subclass of BudTable?
+    # This is verbatim from BudTable.  Need to DRY up.  Should we be a subclass
+    # of BudTable?
     public
     def pending_delete(o)
       if o.class <= Bud::PushElement
@@ -170,7 +175,7 @@ module Bud
       elsif o.class <= Bud::BudCollection
         o.pro.wire_to(self, :delete)
       else
-        @to_delete = @to_delete + o.map{|t| prep_tuple(t) unless t.nil?}
+        @to_delete.concat(o.map{|t| prep_tuple(t) unless t.nil?})
       end
     end
     superator "<-" do |o|
@@ -184,7 +189,7 @@ module Bud
 
     alias << insert
 
-    # Remove to_delete and then add pending to db
+    # Remove to_delete and then move pending => delta.
     def tick
       deleted = nil
       @to_delete.each do |tuple|
@@ -204,7 +209,6 @@ module Bud
       @invalidated = !deleted.nil?
       unless @pending.empty?
         @delta = @pending
-#        merge_to_db(@pending)
         @pending = {}
       end
       flush

data/lib/bud/viz.rb

@@ -1,13 +1,14 @@
-require 'rubygems'
-require 'syntax/convertors/html'
-require 'gchart'
 require 'bud/state'
+require 'set'
 
 class VizOnline #:nodoc: all
   attr_reader :logtab
+
+  META_TABLES = %w[t_cycle t_depends t_depends_tc t_provides t_rules
+                   t_stratum t_table_info t_table_schema].to_set
+
   def initialize(bud_instance)
     @bud_instance = bud_instance
-    @meta_tables = {'t_rules' => 1, 't_depends' => 1, 't_table_info' => 1, 't_cycle' => 1, 't_stratum' => 1, 't_depends_tc' => 1, 't_table_schema' => 1, 't_provides' => 1}
     @bud_instance.options[:dbm_dir] = "DBM_#{@bud_instance.class}_#{bud_instance.options[:tag]}_#{bud_instance.object_id}_#{bud_instance.port}"
     @table_info = bud_instance.tables[:t_table_info]
     @table_schema = bud_instance.tables[:t_table_schema]
@@ -26,17 +27,14 @@ class VizOnline #:nodoc: all
     end
 
     tmp_set.each do |t|
-      news = [:c_bud_time]
       snd_alias = t[0].to_s + "_snd"
       @table_schema << [t[0], :c_bud_time, 0]
       t[1].each_with_index do |s, i|
-        news << s
         @table_schema << [t[0], s, i+1]
         if t[2] == "Bud::BudChannel"
           @table_schema << [snd_alias, s, i+1]
         end
       end
-      lt = "#{t[0]}_vizlog".to_sym
       if t[2] == "Bud::BudChannel"
         lts = "#{snd_alias}_vizlog".to_sym
         @table_info << [snd_alias, t[2]]
@@ -78,7 +76,7 @@ class VizOnline #:nodoc: all
     @bud_instance.tables.each do |t|
       tab = t[0]
       next if tab == "the_big_log"
-      next if @meta_tables[tab.to_s] and @bud_instance.budtime > 0
+      next if @bud_instance.budtime > 0 and META_TABLES.include? tab.to_s
       # PAA: why did we previously exclude periodics?
       add_rows(t[1], tab) #####unless t[1].class == Bud::BudPeriodic
       if t[1].class == Bud::BudChannel

data/lib/bud/viz_util.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bud/graphs'
 require 'bud/meta_algebra'
+require 'syntax/convertors/html'
 
 module TraceCardinality
   state do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bud
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -47,22 +47,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gchart
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: getopt
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +210,7 @@ files:
 - lib/bud/executor/elements.rb
 - lib/bud/executor/group.rb
 - lib/bud/executor/join.rb
+- lib/bud/executor/README.rescan
 - lib/bud/graphs.rb
 - lib/bud/meta_algebra.rb
 - lib/bud/metrics.rb