bud 0.9.7 → 0.9.8

data/lib/bud/rebl.rb

@@ -207,8 +207,8 @@ class LibRebl
   attr_accessor :rules, :state
   attr_reader :ip, :port, :rebl_class_inst
   @@builtin_tables = [:stdio, :periodics_tbl, :halt, :localtick,
-                      :t_depends, :t_cycle, :t_provides, :t_rules,
-                      :t_stratum, :t_underspecified,
+                      :t_depends, :t_cycle, :t_provides, :t_rule_stratum,
+                      :t_rules, :t_stratum, :t_underspecified,
                       :t_table_info, :t_table_schema, :rebl_breakpoint]
   @@classid = 0
 

data/lib/bud/rewrite.rb

@@ -1,21 +1,21 @@
 require 'rubygems'
 
 class RuleRewriter < Ruby2Ruby # :nodoc: all
-  attr_accessor :rule_indx, :rules, :depends
+  attr_accessor :rule_idx, :rules, :depends
 
   OP_LIST = [:<<, :<, :<=].to_set
   TEMP_OP_LIST = [:-@, :~, :+@].to_set
-  MONOTONE_WHITELIST = [:==, :+, :<=, :-, :<, :>, :*, :~,
+  MONOTONE_WHITELIST = [:==, :+, :<=, :-, :<, :>, :*, :~, :+@,
                         :pairs, :matches, :combos, :flatten, :new,
                         :lefts, :rights, :map, :flat_map, :pro, :merge,
                         :schema, :cols, :key_cols, :val_cols, :payloads, :lambda,
                         :tabname, :current_value].to_set
 
-  def initialize(seed, bud_instance)
+  def initialize(bud_instance, rule_idx)
     @bud_instance = bud_instance
     @tables = {}
     @nm = false
-    @rule_indx = seed
+    @rule_idx = rule_idx
     @collect = false
     @rules = []
     @depends = []
@@ -60,7 +60,7 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
     #       s(:call, s(:call, nil, :a), :b),
     #         :bar))
     # to the string "a.b.bar"
-    raise Bud::CompileError, "malformed exp: #{exp}" unless exp.sexp_type == :call
+    raise Bud::CompileError, "malformed expression: #{exp}" unless exp.sexp_type == :call
     _, recv, op = exp
     return recv.nil? ? op.to_s : call_to_id(recv) + "." + op.to_s
   end
@@ -75,6 +75,8 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
   # converting ASTs to strings with doing analysis on ASTs. Those should be
   # split into two separate passes.
   def process_iter(exp)
+    # first field of exp is tag; shift it
+    exp.shift
     iter = process exp.shift
     args = exp.shift
 
@@ -129,7 +131,7 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
   end
 
   def process_call(exp)
-    recv, op, *args = exp
+    tag, recv, op, *args = exp
     if OP_LIST.include?(op) and @context[1] == :defn and @context.length == 2
       # NB: context.length is 2 when see a method call at the top-level of a
       # :defn block -- this is where we expect Bloom statements to appear
@@ -138,8 +140,11 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
       # 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.
+      if args.first.sexp_type != :call
+        raise Bud::CompileError, "illegal argument to notin: #{args.first}"
+      end
       notintab = call_to_id(args[0])   # args expected to be of the form (:call nil :y ...)
-      @tables[notintab.to_s] = true    # "true" denotes non-monotonic dependency
+      @tables[notintab] = true    # "true" denotes non-monotonic dependency
       super
     else
       # Parse a call of the form a.b.c.foo
@@ -242,19 +247,19 @@ class RuleRewriter < Ruby2Ruby # :nodoc: all
       op = op.to_s
     end
 
-    @rules << [@bud_instance, @rule_indx, lhs, op, rule_txt,
+    @rules << [@bud_instance, @rule_idx, lhs, op, rule_txt,
                rule_txt_orig, unsafe_funcs_called]
     @tables.each_pair do |t, nm|
       in_rule_body = @refs_in_body.include? t
-      @depends << [@bud_instance, @rule_indx, lhs, op, t, nm, in_rule_body]
+      @depends << [@bud_instance, @rule_idx, lhs, op, t, nm, in_rule_body]
     end
 
     reset_instance_vars
-    @rule_indx += 1
+    @rule_idx += 1
   end
 
   def do_rule(exp)
-    lhs, op, rhs_ast = exp
+    tag, lhs, op, rhs_ast = exp
     lhs = process(lhs)
 
     rhs_ast = MapRewriter.new.process(rhs_ast)
@@ -376,6 +381,9 @@ class UnsafeFuncRewriter < SexpProcessor
 
   def process_iter(exp)
     tag, recv, iter_args, body = exp
+    if (iter_args == 0)
+      iter_args = s(:args)
+    end
     new_body = push_and_process(body)
     return s(tag, process(recv), process(iter_args), new_body)
   end
@@ -415,6 +423,9 @@ class LatticeRefRewriter < SexpProcessor
   def process_iter(exp)
     tag, recv, iter_args, body = exp
     new_body = push_and_process(body)
+    if (iter_args == 0)
+      iter_args = s(:args)
+    end
     return s(tag, process(recv), process(iter_args), new_body)
   end
 

data/lib/bud/state.rb

@@ -128,9 +128,9 @@ module Bud
   end
 
   # declare a collection to be read from +filename+.  rhs of statements only
-  def file_reader(name, filename, delimiter='\n')
+  def file_reader(name, filename)
     define_collection(name)
-    @tables[name] = Bud::BudFileReader.new(name, filename, delimiter, self)
+    @tables[name] = Bud::BudFileReader.new(name, filename, self)
   end
 
   # declare a collection to be auto-populated every +period+ seconds.  schema <tt>[:key] => [:val]</tt>.

data/lib/bud/storage/zookeeper.rb

@@ -26,6 +26,13 @@ module Bud
       @child_watch_id = nil
     end
 
+    def invalidate_at_tick
+      true
+    end
+
+    def invalidate_cache
+    end
+
     # Since the watcher callbacks might invoke EventMachine, we wait until after
     # EM startup to start watching for Zk events.
     def start_watchers

data/lib/bud/version.rb

@@ -0,0 +1,3 @@
+module Bud
+  VERSION = "0.9.8"
+end

data/lib/bud/viz.rb

@@ -3,7 +3,7 @@ require 'bud/state'
 class VizOnline #:nodoc: all
   attr_reader :logtab
 
-  META_TABLES = %w[t_cycle t_depends t_provides t_rules t_stratum
+  META_TABLES = %w[t_cycle t_depends t_provides t_rule_stratum t_rules t_stratum
                    t_table_info t_table_schema t_underspecified].to_set
 
   def initialize(bud_instance)
@@ -56,8 +56,8 @@ class VizOnline #:nodoc: all
         row = row[0]
       end
 
-      # 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.
+      # t_depends, t_rule_stratum, and t_rules have Bud object as their first
+      # field. Replace with a string, since Bud instances cannot be serialized.
       if row[0].class <= Bud
         row = row.to_a
         row = [row[0].class.to_s] + row[1..-1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bud
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Peter Alvaro
@@ -12,176 +12,176 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: getopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: superators19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 description: A prototype of the Bloom distributed programming language as a Ruby DSL.
 email:
 - bloomdevs@gmail.com
@@ -194,15 +194,44 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- History.txt
+- LICENSE
+- README.md
+- Rakefile
+- bin/budlabel
+- bin/budplot
+- bin/budtimelines
+- bin/budvis
+- bin/rebl
+- docs/README.md
+- docs/bfs.md
+- docs/bfs_arch.png
+- docs/bloom-loop.png
+- docs/cheat.md
+- docs/getstarted.md
+- docs/intro.md
+- docs/modules.md
+- docs/operational.md
+- docs/rebl.md
+- docs/ruby_hooks.md
+- docs/visualizations.md
+- examples/README.md
+- examples/basics/hello.rb
+- examples/basics/paths.rb
+- examples/chat/README.md
+- examples/chat/chat.rb
+- examples/chat/chat_protocol.rb
+- examples/chat/chat_server.rb
+- lib/bud.rb
 - lib/bud/aggs.rb
 - lib/bud/bud_meta.rb
 - lib/bud/collections.rb
 - lib/bud/depanalysis.rb
 - lib/bud/errors.rb
+- lib/bud/executor/README.rescan
 - 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/labeling/bloomgraph.rb
 - lib/bud/labeling/budplot_style.rb
@@ -220,36 +249,9 @@ files:
 - lib/bud/state.rb
 - lib/bud/storage/dbm.rb
 - lib/bud/storage/zookeeper.rb
+- lib/bud/version.rb
 - lib/bud/viz.rb
 - lib/bud/viz_util.rb
-- lib/bud.rb
-- bin/budlabel
-- bin/budplot
-- bin/budtimelines
-- bin/budvis
-- bin/rebl
-- docs/bfs.md
-- docs/bfs_arch.png
-- docs/bloom-loop.png
-- docs/cheat.md
-- docs/getstarted.md
-- docs/intro.md
-- docs/modules.md
-- docs/operational.md
-- docs/README.md
-- docs/rebl.md
-- docs/ruby_hooks.md
-- docs/visualizations.md
-- examples/basics/hello.rb
-- examples/basics/paths.rb
-- examples/chat/chat.rb
-- examples/chat/chat_protocol.rb
-- examples/chat/chat_server.rb
-- examples/chat/README.md
-- examples/README.md
-- README.md
-- LICENSE
-- History.txt
 homepage: http://www.bloom-lang.org
 licenses:
 - BSD
@@ -260,17 +262,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bloom-lang
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A prototype Bloom DSL for distributed programming.