bud 0.0.5 → 0.0.6

data/lib/bud/server.rb

@@ -37,7 +37,7 @@ module Bud
     def message_received(obj)
       unless (obj.class <= Array and obj.length == 2 and
               @bud.tables.include?(obj[0].to_sym) and obj[1].class <= Array)
-        raise BudError, "Bad inbound message of class #{obj.class}: #{obj.inspect}"
+        raise BudError, "bad inbound message of class #{obj.class}: #{obj.inspect}"
       end
 
       @bud.rtracer.recv(obj) if @bud.options[:rtrace]

data/lib/bud/state.rb

@@ -44,7 +44,7 @@ module Bud
     @tables[name] = Bud::BudTable.new(name, self, schema)
   end
   
-  # declare a syncronously-flushed persistent collection.  default schema <tt>[:key] => [:val]</tt>. 
+  # declare a syncronously-flushed persistent collection.  default schema <tt>[:key] => [:val]</tt>.
   def sync(name, storage, schema=nil)
     define_collection(name)
     case storage
@@ -55,7 +55,7 @@ module Bud
       @tables[name] = Bud::BudTcTable.new(name, self, schema)
       @tc_tables[name] = @tables[name]
     else
-      raise BudError, "Unknown synchronous storage engine #{storage.to_s}"
+      raise BudError, "unknown synchronous storage engine #{storage.to_s}"
     end
   end
   
@@ -70,7 +70,7 @@ module Bud
       @tables[name] = Bud::BudZkTable.new(name, options[:path], options[:addr], self)
       @zk_tables[name] = @tables[name]
     else
-      raise BudError, "Unknown async storage engine #{storage.to_s}"
+      raise BudError, "unknown async storage engine #{storage.to_s}"
     end
   end
 

data/lib/bud/storage/dbm.rb

@@ -30,7 +30,7 @@ module Bud
       end
       @dbm = DBM.open(db_fname, 0666, flags)
       if @dbm.nil?
-        raise BudError, "Failed to open dbm database '#{db_fname}': #{@dbm.errmsg}"
+        raise BudError, "failed to open dbm database '#{db_fname}': #{@dbm.errmsg}"
       end
     end
 
@@ -68,7 +68,7 @@ module Bud
         t[k] = k_ary[i]
       end
       val_cols.each_with_index do |c,i|
-        t[schema.index(c)] = v_ary[i]
+        t[cols.index(c)] = v_ary[i]
       end
       tuple_accessors(t)
     end
@@ -115,7 +115,7 @@ module Bud
     end
 
     def merge_tuple(key, tuple)
-      val = val_cols.map{|c| tuple[schema.index(c)]}
+      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)
@@ -154,7 +154,7 @@ module Bud
         cols_str = @dbm[k_str]
         unless cols_str.nil?
           db_cols = MessagePack.unpack(cols_str)
-          delete_cols = val_cols.map{|c| tuple[schema.index(c)]}
+          delete_cols = val_cols.map{|c| tuple[cols.index(c)]}
           if db_cols == delete_cols
             @dbm.delete k_str
           end

data/lib/bud/storage/tokyocabinet.rb

@@ -35,7 +35,7 @@ module Bud
         flags |= TokyoCabinet::HDB::OTRUNC
       end
       if !@hdb.open(db_fname, flags)
-        raise BudError, "Failed to open TokyoCabinet DB '#{db_fname}': #{@hdb.errmsg}"
+        raise BudError, "failed to open TokyoCabinet DB '#{db_fname}': #{@hdb.errmsg}"
       end
       @hdb.tranbegin
     end
@@ -74,7 +74,7 @@ module Bud
         t[k] = k_ary[i]
       end
       val_cols.each_with_index do |c,i|
-        t[schema.index(c)] = v_ary[i]
+        t[cols.index(c)] = v_ary[i]
       end
       tuple_accessors(t)
     end
@@ -121,7 +121,7 @@ module Bud
     end
 
     def merge_tuple(key, tuple)
-      val = val_cols.map{|c| tuple[schema.index(c)]}
+      val = val_cols.map{|c| tuple[cols.index(c)]}
       key_s = MessagePack.pack(key)
       val_s = MessagePack.pack(val)
       if @hdb.putkeep(key_s, val_s) == false
@@ -158,7 +158,7 @@ module Bud
         cols_str = @hdb[k_str]
         unless cols_str.nil?
           hdb_cols = MessagePack.unpack(cols_str)
-          delete_cols = val_cols.map{|c| tuple[schema.index(c)]}
+          delete_cols = val_cols.map{|c| tuple[cols.index(c)]}
           if hdb_cols == delete_cols
             @hdb.delete k_str
           end

data/lib/bud/storage/zookeeper.rb

@@ -164,15 +164,15 @@ module Bud
     end
 
     superator "<+" do |o|
-      raise BudError, "Illegal use of <+ with zookeeper store '#{@tabname}' on left"
+      raise BudError, "illegal use of <+ with zookeeper store '#{@tabname}' on left"
     end
 
     def <=(o)
-      raise BudError, "Illegal use of <= with zookeeper store '#{@tabname}' on left"
+      raise BudError, "illegal use of <= with zookeeper store '#{@tabname}' on left"
     end
 
     def <<(o)
-      raise BudError, "Illegal use of << with zookeeper store '#{@tabname}' on left"
+      raise BudError, "illegal use of << with zookeeper store '#{@tabname}' on left"
     end
   end
 end

data/lib/bud/stratify.rb

@@ -8,12 +8,15 @@ class Stratification # :nodoc: all
     # Data inserted by client (Bud rewrite code)
     table :depends, [:rule, :head, :op, :body, :neg]
 
+    # Intermediate state
     scratch :depends_clean, [:head, :body, :neg, :temporal]
     scratch :depends_tc, [:head, :body, :via, :neg, :temporal]
+    scratch :stratum_base, [:predicate, :stratum]
+
+    # Output state
     scratch :cycle, [:predicate, :via, :neg, :temporal]
-    table :stratum_base, [:predicate, :stratum]
-    table :stratum, [:predicate, :stratum]
-    table :top_strat, [:stratum]
+    scratch :stratum, [:predicate, :stratum]
+    scratch :top_strat, [:stratum]
   end
 
   def declaration

data/lib/bud/viz.rb

@@ -40,7 +40,7 @@ class VizOnline #:nodoc: all
       lt = "#{t[0]}_vizlog".to_sym
       if t[2] == "Bud::BudChannel"
         lts = "#{snd_alias}_vizlog".to_sym
-        @table_info << [snd_alias, t[2]] 
+        @table_info << [snd_alias, t[2]]
       end
       @table_info << [t[0], t[2]]
     end

data/lib/bud/viz_util.rb

@@ -51,10 +51,10 @@ class VizHelper
       end
 
       d = "#{@dir}/tm_#{time.bud_time}"
-      write_graphs(@t_tabinf, @t_cycle, @t_depends, @t_rules, d, @dir, nil, false, nil, time.bud_time, card_info)
+      write_graphs(@t_tabinf, builtin_tables, @t_cycle, @t_depends, @t_rules, d,
+                   @dir, nil, false, nil, time.bud_time, card_info)
     end
   end
-
 end
 
 
@@ -65,12 +65,15 @@ module VizUtil #:nodoc: all
       tab = t[0].to_s
       tabinf[tab] = t[1].class.to_s
     end
-    write_graphs(tabinf, bud_instance.t_cycle, bud_instance.t_depends, bud_instance.t_rules, viz_name, output_base, fmt, collapse, bud_instance.meta_parser.depanalysis)
+    write_graphs(tabinf, bud_instance.builtin_tables, bud_instance.t_cycle,
+                 bud_instance.t_depends, bud_instance.t_rules, viz_name,
+                 output_base, fmt, collapse, bud_instance.meta_parser.depanalysis)
   end
 
-  def write_graphs(tabinf, cycle, depends, rules, viz_name, output_base, fmt, collapse, depanalysis=nil, budtime=-1, card_info=nil)
+  def write_graphs(tabinf, builtin_tables, cycle, depends, rules, viz_name,
+                   output_base, fmt, collapse, depanalysis=nil, budtime=-1, card_info=nil)
     staging = "#{viz_name}.staging"
-    gv = GraphGen.new(tabinf, cycle, staging, budtime, collapse, card_info)
+    gv = GraphGen.new(tabinf, builtin_tables, cycle, staging, budtime, collapse, card_info)
     gv.process(depends)
     dump(rules, output_base, gv)
     gv.finish(depanalysis, fmt)
@@ -117,7 +120,7 @@ module VizUtil #:nodoc: all
       code[v[0]] = "\n# RULE #{k}\n " + code[v[0]] + "\n" + v[1]
     end
     gv_obj.nodes.each_pair do |k, v|
-      fout = File.new("#{output_base}/#{k}.html", "w+")
+      fout = File.new("#{output_base}/#{k[0..55]}.html", "w+")
       fout.puts header
       k.split(", ").each do |i|
         unless code[i].nil?
@@ -213,6 +216,8 @@ END_JS
     meta_tabs = {"t_table_info" => :tabinf, "t_table_schema" => :tabscm, "t_cycle" => :cycle, "t_depends" => :depends, "t_rules" => :rules}
     meta = {}
     data = []
+
+    dir = Dir.glob("#{dir}/bud*").first
     ret = DBM.open("#{dir}/the_big_log.dbm")
     ret.each_pair do |k, v|
       key = MessagePack.unpack(k)
@@ -270,5 +275,4 @@ END_JS
     stream.puts "</tr>"
     stream.close
   end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bud
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Peter Alvaro
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports
@@ -180,12 +180,14 @@ dependencies:
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency