bud 0.9.5 → 0.9.6

data/lib/bud/rewrite.rb

@@ -3,14 +3,13 @@ require 'rubygems'
 class RuleRewriter < Ruby2Ruby # :nodoc: all
   attr_accessor :rule_indx, :rules, :depends
 
-  OP_LIST = Set.new([:<<, :<, :<=])
-  TEMP_OP_LIST = Set.new([:-@, :~, :+@])
-  MONOTONE_WHITELIST = Set.new([:==, :+, :<=, :-, :<, :>, :*, :~,
-                                :pairs, :matches, :combos, :flatten, :new,
-                                :lefts, :rights, :map, :flat_map, :pro, :merge,
-                                :cols, :key_cols, :val_cols, :payloads, :lambda,
-                                :tabname, :ip_port, :port, :ip, :int_ip_port,
-                                :current_value])
+  OP_LIST = [:<<, :<, :<=].to_set
+  TEMP_OP_LIST = [:-@, :~, :+@].to_set
+  MONOTONE_WHITELIST = [:==, :+, :<=, :-, :<, :>, :*, :~,
+                        :pairs, :matches, :combos, :flatten, :new,
+                        :lefts, :rights, :map, :flat_map, :pro, :merge,
+                        :cols, :key_cols, :val_cols, :payloads, :lambda,
+                        :tabname, :current_value].to_set
 
   def initialize(seed, bud_instance)
     @bud_instance = bud_instance
@@ -196,15 +195,17 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
     Bud::Lattice.global_morphs.include?(op)
   end
 
-  # Rewrite top-level rhs array and hash literals to lambdas. During wiring,
-  # these are turned into coll_expr collections.
+  # Rewrite top-level rhs literal expressions into lambdas. During wiring, these
+  # are turned into coll_expr collections. For normal relational Bloom, the only
+  # literal we expect to see is an array literal, but lattices can be
+  # initialized with other kinds of literals (e.g., integers for lmax).
   def lambda_rewrite(rhs)
     # the <= case
-    if is_coll_literal(rhs[0])
+    if is_rhs_literal(rhs[0])
       return s(:iter, s(:call, nil, :lambda), s(:args), rhs)
     # the superator case
     elsif rhs[0] == :call \
-      and rhs[1] and rhs[1][0] and is_coll_literal(rhs[1][0]) \
+      and rhs[1] and rhs[1][0] and is_rhs_literal(rhs[1][0]) \
       and rhs[2] and (rhs[2] == :+@ or rhs[2] == :-@ or rhs[2] == :~@)
       return s(rhs[0], s(:iter, s(:call, nil, :lambda), s(:args), rhs[1]), rhs[2], *rhs[3..-1])
     else
@@ -212,8 +213,8 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
     end
   end
 
-  def is_coll_literal(e)
-    [:array, :hash].include? e
+  def is_rhs_literal(e)
+    [:array, :hash, :lit].include? e
   end
 
   def collect_rhs(exp)
@@ -259,7 +260,7 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
     rhs_ast = MapRewriter.new.process(rhs_ast)
     rhs_ast = RenameRewriter.new(@bud_instance).process(rhs_ast)
     rhs_ast = LatticeRefRewriter.new(@bud_instance).process(rhs_ast)
-    ufr = UnsafeFuncRewriter.new
+    ufr = UnsafeFuncRewriter.new(@bud_instance)
     rhs_ast = ufr.process(rhs_ast)
 
     if @bud_instance.options[:no_attr_rewrite]
@@ -336,16 +337,25 @@ class RenameRewriter < SexpProcessor
   end
 end
 
-# Check for whether the rule invokes any "unsafe" functions (funcs that might
-# return a different value every time they are called, e.g., budtime). Note that
-# although we call this a rewriter, it doesn't modify the input AST.
+# Check for whether the rule invokes any "unsafe" functions (functions that
+# might return a different value every time they are called, e.g., budtime). The
+# test for "unsafe" functions is pretty naive: any function call with a nil
+# receiver is treated as unsafe unless it is belongs to a list of "safe"
+# functions (below) or it denotes a lattice identifier. In the latter case, the
+# rule is akin to an implicit join with the lattice, so we only rescan it on
+# deltas to the lattice (see "rescan_on_merge" in LatticeWrapper).
+#
+# Although this is called a rewriter, it doesn't modify the input AST.
 class UnsafeFuncRewriter < SexpProcessor
+  SAFE_FUNC_LIST = [:int_ip_port, :ip_port, :ip, :port].to_set
+
   attr_reader :unsafe_func_called
 
-  def initialize
+  def initialize(bud_instance)
     super()
     self.require_empty = false
     self.expected = Sexp
+    @bud_instance = bud_instance
     @unsafe_func_called = false
     @elem_stack = []
   end
@@ -356,7 +366,9 @@ class UnsafeFuncRewriter < SexpProcessor
     # We assume that unsafe funcs have a nil receiver (Bud instance is implicit
     # receiver).
     if recv.nil? and @elem_stack.size > 0
-      @unsafe_func_called = true unless RuleRewriter.is_monotone(op)
+      unless is_safe_func(op) || is_lattice?(op)
+        @unsafe_func_called = true
+      end
     end
 
     return s(tag, process(recv), op, *(args.map{|a| process(a)}))
@@ -375,6 +387,14 @@ class UnsafeFuncRewriter < SexpProcessor
     raise Bud::Error unless @elem_stack.pop == obj_id
     return rv
   end
+
+  def is_lattice?(op)
+    @bud_instance.lattices.has_key? op.to_sym
+  end
+
+  def is_safe_func(op)
+    SAFE_FUNC_LIST.include? op
+  end
 end
 
 # Rewrite references to lattice identifiers that appear in rule bodies. A

data/lib/bud/server.rb

@@ -11,11 +11,8 @@ class Bud::BudServer < EM::Connection #:nodoc: all
 
   def receive_data(data)
     # Feed the received data to the deserializer
-    @pac.feed data
-
-    # streaming deserialize
-    @pac.each do |obj|
-      message_received(obj)
+    @pac.feed_each(data) do |obj|
+      recv_message(obj)
     end
 
     # apply the channel filter to each channel's pending tuples
@@ -54,7 +51,7 @@ class Bud::BudServer < EM::Connection #:nodoc: all
     @bud.rtracer.sleep if @bud.options[:rtrace]
   end
 
-  def message_received(obj)
+  def recv_message(obj)
     unless (obj.class <= Array and obj.length == 3 and
             @bud.tables.include?(obj[0].to_sym) and
             obj[1].class <= Array and obj[2].class <= Array)

data/lib/bud/source.rb

@@ -17,7 +17,7 @@ module Source
     lines = cache(filename, num)
     # Note: num is 1-based.
 
-    parser = make_parser
+    parser = RubyParser.for_current_ruby
     stmt = ""       # collection of lines that form one complete Ruby statement
     ast = nil
     lines[num .. -1].each do |l|
@@ -38,21 +38,6 @@ module Source
     ast
   end
 
-  # ruby_parser 3.x can produce either 1.8- or 1.9-compatible ASTs. Since we
-  # want to eventually turn the ASTs back into code we can eval() using the
-  # current Ruby runtime, we want to generate an appropriately compatible AST.
-  def Source.make_parser
-    maj, min, patch = RUBY_VERSION.split(".")
-    case [maj.to_i, min.to_i]
-    when [1, 9] then
-      Ruby19Parser.new
-    when [1, 8] then
-      Ruby18Parser.new
-    else
-      raise Bud::Error, "unrecognized RUBY_VERSION: #{RUBY_VERSION}"
-    end
-  end
-
   def Source.cache(filename, num)  # returns array of lines
     if $cached_file_info.curr_file == filename
       retval = $cached_file_info.lines

data/lib/bud/state.rb

@@ -149,7 +149,7 @@ module Bud
       @terminal = name
     end
     define_collection(name)
-    @tables[name] = Bud::BudTerminal.new(name, [:line], self)
+    @tables[name] = Bud::BudTerminal.new(name, self)
     @channels[name] = @tables[name]
   end
 

data/lib/bud/viz.rb

@@ -3,18 +3,18 @@ require 'bud/state'
 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
+  META_TABLES = %w[t_cycle t_depends t_provides t_rules t_stratum
+                   t_table_info t_table_schema t_underspecified].to_set
 
   def initialize(bud_instance)
     @bud_instance = bud_instance
     @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]
-    @logtab = new_tab("the_big_log", [:table, :time, :contents], bud_instance)
+    @logtab = new_tab(:the_big_log, [:table, :time, :contents], bud_instance)
     tmp_set = []
     @bud_instance.tables.each do |name, tbl|
-      next if name == "the_big_log"
+      next if name == :the_big_log || name == :localtick
       # Temp collections don't have a schema until a fact has been inserted into
       # them; for now, we just include an empty schema for them in the viz
       if tbl.schema.nil?
@@ -56,11 +56,11 @@ class VizOnline #:nodoc: all
         row = row[0]
       end
 
-      # bud.t_depends and t_rules have bud object in field[0]. Remove them since
-      # bud instances cannot/must not be serialized.
+      # bud.t_depends and t_rules have bud object in field[0]. Replace them with
+      # a string, since bud instances cannot/must not be serialized.
       if row[0].class <= Bud
-        row = row.to_a if row.class != Array
-        row = [row[0].class.to_s] + row[1..-1] if row[0].class <= Bud
+        row = row.to_a
+        row = [row[0].class.to_s] + row[1..-1]
       end
       newrow = [tab, @bud_instance.budtime, row]
       begin
@@ -74,10 +74,9 @@ class VizOnline #:nodoc: all
   def do_cards
     @bud_instance.tables.each do |t|
       tab = t[0]
-      next if tab == "the_big_log"
+      next if tab == :the_big_log
       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
+      add_rows(t[1], tab)
       if t[1].class == Bud::BudChannel
         add_rows(t[1].pending, "#{tab}_snd")
       end

data/lib/bud/viz_util.rb

@@ -180,8 +180,8 @@ module VizUtil #:nodoc: all
     convertor = Syntax::Convertors::HTML.for_syntax "ruby"
     shredded_rules.each do |s|
       # b/c accessors don't make it through serialization anymore
-      bud_obj, rule_id, lhs, op, src, orig_src, nm_funcs_called = s.to_a
-      fout = File.new("#{output_base}/#{rule_id}.html", "w+")
+      bud_obj, rule_id, lhs, op, src, orig_src, unsafe_funcs_called = s.to_a
+      fout = File.new("#{output_base}/#{rule_id}-#{lhs}.html", "w+")
       fout.puts header
       fout.puts "<h1>Rule #{rule_id}</h1><br>"
 
@@ -364,7 +364,12 @@ END_JS
   def write_table_content(fn, row)
     stream = File.open(fn, "a")
     stream.puts "<tr>"
-    stream.puts row.map{|c| "<td>#{c.to_s}</td>"}.join(" ")
+    if row.class < Enumerable
+      stream.puts row.map{|c| "<td>#{c.to_s}</td>"}.join(" ")
+    else
+      # special case for periodics
+      stream.puts "<td>#{row.to_s}</td>"
+    end
     stream.puts "</tr>"
     stream.close
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bud
 version: !ruby/object:Gem::Version
-  version: 0.9.5
-  prerelease: 
+  version: 0.9.6
 platform: ruby
 authors:
 - Peter Alvaro
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,7 +31,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,7 +45,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: getopt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,7 +52,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,7 +59,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -74,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,7 +80,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -114,23 +101,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: superators19
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -138,7 +122,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -154,7 +136,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -162,7 +143,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -170,7 +150,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -178,7 +157,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -186,7 +164,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -262,26 +239,25 @@ files:
 homepage: http://www.bloom-lang.org
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bloom-lang
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A prototype Bloom DSL for distributed programming.
 test_files: []