RubyGems - bud - Versions diffs - 0.0.7 → 0.0.8 - Mend

bud 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

data/bin/budplot +97 -8
data/bin/budvis +1 -2
data/docs/cheat.md +1 -1
data/lib/bud/aggs.rb +2 -1
data/lib/bud/bud_meta.rb +8 -7
data/lib/bud/collections.rb +36 -48
data/lib/bud/graphs.rb +48 -21
data/lib/bud/joins.rb +1 -1
data/lib/bud/meta_algebra.rb +168 -0
data/lib/bud/monkeypatch.rb +32 -5
data/lib/bud/rewrite.rb +53 -14
data/lib/bud/server.rb +25 -4
data/lib/bud/state.rb +13 -14
data/lib/bud/storage/dbm.rb +19 -8
data/lib/bud/storage/tokyocabinet.rb +18 -8
data/lib/bud/viz.rb +7 -5
data/lib/bud/viz_util.rb +93 -11
data/lib/bud.rb +30 -16
metadata +4 -3

data/bin/budplot CHANGED Viewed

@@ -4,7 +4,9 @@ require 'bud'
 require 'bud/bud_meta'
 require 'bud/depanalysis'
 require 'bud/graphs'
+require 'bud/meta_algebra'
 require 'bud/viz_util'
+require 'getopt/std'
 include VizUtil
@@ -42,12 +44,34 @@ def make_instance(mods)
   def_lines = ["class FooBar",
                "include Bud",
+               "include MetaAlgebra",
+               "include MetaReports",
                mods.map {|m| "include #{m}"},
                "end"
               ]
   class_def = def_lines.flatten.join("\n")
   eval(class_def)
-  FooBar.new
+  f =FooBar.new
+  3.times{ f.tick }
+  f
+end
+def trace_counts(begins)
+  complexity = {:data => {}, :coord => {}}
+  if !begins[:start].nil?
+    begins[:start].each_pair do |k, v|
+      if @data and @data[k]
+        complexity[:data][k] = @data[k].length
+      end
+    end
+    begins[:finish].each_pair do |k, v|
+      if @data and @data[k]
+        complexity[:coord][k] = @data[k].length
+      end
+    end
+  end
+  complexity
 end
 def process(mods)
@@ -79,12 +103,44 @@ def process(mods)
   end
   viz_name = "bud_doc/" + mods.join("_") + "_viz"
-  write_index(inp, outp, priv, viz_name)
-  graph_from_instance(d, "#{viz_name}_collapsed", "bud_doc", true)
-  graph_from_instance(d, "#{viz_name}_expanded", "bud_doc", false)
+  graph_from_instance(d, "#{viz_name}_collapsed", "bud_doc", true, nil, @data)
+  graph_from_instance(d, "#{viz_name}_expanded", "bud_doc", false, nil, @data)
+  begins = graph_from_instance(d, "#{viz_name}_expanded_dot", "bud_doc", false, "dot", @data)
+  complexity = trace_counts(begins)
+  # try to figure out the degree of the async edges
+  deg = find_degrees(d, @data)
+  unless deg.nil?
+    deg.each_pair do |k, v|
+      puts "DEGREE: #{k} = #{v.keys.length}"
+    end
+  end
+  write_index(inp, outp, priv, viz_name, complexity)
 end
-def write_index(inp, outp, priv, viz_name)
+def find_degrees(inst, data)
+  degree = {}
+  return if data.nil?
+  data.each_pair do |k, v|
+    tab = inst.tables[k.gsub("_snd", "").to_sym]
+    if !tab.nil?
+      if tab.class == Bud::BudChannel
+        v.each_pair do |k2, v2|
+          v2.each do |row|
+            loc = row[tab.locspec_idx]
+            degree[k] ||= {}
+            degree[k][loc] = true
+          end
+        end
+      end
+    end
+  end
+  return degree
+end
+def write_index(inp, outp, priv, viz_name, cx)
   f = File.open("bud_doc/index.html", "w")
   f.puts "<html>"
   f.puts "<embed src=\"#{ENV['PWD']}/#{viz_name}_collapsed.svg\" width=\"100%\" height=\"60%\" type=\"image/svg+xml\" pluginspage=\"http://www.adobe.com/svg/viewer/install/\" />"
@@ -97,14 +153,24 @@ def write_index(inp, outp, priv, viz_name)
   f.puts "<h2>Output Interfaces</h2>"
   do_table(f, outp)
   f.puts "</td><td>"
-  f.puts "<h2>Private State</h2>"
-  do_table(f, priv)
-  f.puts "</td>"
+  f.puts "<h2>Trace Analysis Results</h2>"
+  f.puts "<h3>Data Complexity</h3>"
+  do_cx(f, cx[:data])
+  f.puts "<h3>Coordination Complexity</h3>"
+  do_cx(f, cx[:coord])
   f.puts "</tr></table>"
   f.puts "</html>"
   f.close
 end
+def do_cx(f, cx)
+  f.puts "<table border='1'>"
+  cx.each_pair do |k, v|
+    f.puts "<tr><td>#{k}</td><td>#{v.inspect}</td></tr>"
+  end
+  f.puts "</table>"
+end
 def do_table(f, info)
   f.puts "<table border='1'>"
   info.sort{|a, b| a[0].to_s <=> b[0].to_s}.each do |tbl_name, tbl_impl|
@@ -117,11 +183,34 @@ def do_table(f, info)
   f.puts "</table>"
 end
+def get_trace_data
+  data = nil
+  if @opts["t"]
+    data = {}
+    traces = @opts['t'].class == String ? [@opts['t']] : @opts['t']
+    traces.each do |t|
+      meta, da = get_meta2(t)
+      da.each do |d|
+        data[d[1]] ||= {}
+        data[d[1]][d[0]] ||= []
+        data[d[1]][d[0]] << d[2]
+      end
+    end
+  end
+  data
+end
 if ARGV.length < 2
   puts "Usage: budplot LIST_OF_FILES LIST_OF_MODULES_OR_CLASSES"
   exit
 end
+@opts = Getopt::Std.getopts("t:")
+@data = get_trace_data
 `mkdir bud_doc`
 modules = []

data/bin/budvis CHANGED Viewed

@@ -28,10 +28,9 @@ usage unless ARGV[0]
 usage if ARGV[0] == '--help'
 meta, data = get_meta2(BUD_DBM_DIR)
-vh = VizHelper.new(meta[:tabinf], meta[:cycle], meta[:depends], meta[:rules], ARGV[0])
+vh = VizHelper.new(meta[:tabinf], meta[:cycle], meta[:depends], meta[:rules], ARGV[0], meta[:provides])
 data.each do |d|
   vh.full_info << d
 end
 vh.tick
 vh.summarize(ARGV[0], meta[:schminf])

data/docs/cheat.md CHANGED Viewed

@@ -196,7 +196,7 @@ implicit map:
     end
 ## BudCollection-Specific Methods ##
-`bc.schema`: returns the schema of `bc` (Hash of key column names => non-key column names)<br>
+`bc.schema`: returns the schema of `bc` (Hash of key column names => non-key column names). Note that for channels, this omits the location specifier (<tt>@</tt>).<br>
 `bc.cols`: returns the column names in `bc` as an Array<br>

data/lib/bud/aggs.rb CHANGED Viewed

@@ -181,7 +181,8 @@ module Bud
   end
   # aggregate method to be used in Bud::BudCollection.group.
-  # accumulates all x inputs into an array
+  # accumulates all x inputs into an array. note that the order of the elements
+  # in the resulting array is undefined.
   def accum(x)
     [Accum.new, x]
   end

data/lib/bud/bud_meta.rb CHANGED Viewed

@@ -49,7 +49,7 @@ class BudMeta #:nodoc: all
       @bud_instance.sinks[s.first] = true
     end
-    dump_rewrite(rewritten_strata) if @bud_instance.options[:dump_rewrite]
+    dump_rewrite(no_attr_rewrite_strata) if @bud_instance.options[:dump_rewrite]
     return rewritten_strata, no_attr_rewrite_strata
   end
@@ -97,13 +97,13 @@ class BudMeta #:nodoc: all
     unless rv.nil?
       if rv.class <= Sexp
         error_pt = rv
-        error_msg = "Parse error"
+        error_msg = "parse error"
       else
         error_pt, error_msg = rv
       end
-      # try to "generate" the source code associated with the problematic block,
-      # so as to generate a more meaningful error message.
+      # try to dump the source code associated with the problematic block, so as
+      # to produce a more meaningful error message.
       begin
         code = Ruby2Ruby.new.process(Marshal.load(Marshal.dump(error_pt)))
         src_msg = "\nCode: #{code}"
@@ -139,7 +139,7 @@ class BudMeta #:nodoc: all
       # Check for a common case
       if n.sexp_type == :lasgn
-        return [n, "Illegal operator: '='"]
+        return [n, "illegal operator: '='"]
       end
       return pt unless n.sexp_type == :call and n.length == 4
@@ -150,10 +150,10 @@ class BudMeta #:nodoc: all
       return n if lhs.nil? or lhs.sexp_type != :call
       lhs_name = lhs[2].to_sym
       unless @bud_instance.tables.has_key? lhs_name
-        return [n, "Table does not exist: '#{lhs_name}'"]
+        return [n, "collection does not exist: '#{lhs_name}'"]
       end
-      return [n, "Illegal operator: '#{op}'"] unless [:<, :<=].include? op
+      return [n, "illegal operator: '#{op}'"] unless [:<, :<=].include? op
       # Check superator invocation. A superator that begins with "<" is parsed
       # as a call to the binary :< operator. The right operand to :< is a :call
@@ -195,6 +195,7 @@ class BudMeta #:nodoc: all
     else
       top = 1
     end
     return top
   end

data/lib/bud/collections.rb CHANGED Viewed

@@ -149,7 +149,7 @@ module Bud
     # project the collection to its key attributes
     public
     def keys
-      self.map{|t| @key_colnums.map {|i| t[i]}}
+      self.map{|t| get_key_vals(t)}
     end
     # project the collection to its non-key attributes
@@ -255,6 +255,7 @@ module Bud
     def [](k)
       # assumes that key is in storage or delta, but not both
       # is this enforced in do_insert?
+      check_enumerable(k)
       t = @storage[k]
       return t.nil? ? @delta[k] : t
     end
@@ -264,7 +265,7 @@ module Bud
     def include?(item)
       return true if key_cols.nil? or (key_cols.empty? and length > 0)
       return false if item.nil? or item.empty?
-      key = @key_colnums.map{|i| item[i]}
+      key = get_key_vals(item)
       return (item == self[key])
     end
@@ -282,8 +283,8 @@ module Bud
     private
     def raise_pk_error(new_guy, old)
-      keycols = @key_colnums.map{|i| old[i]}
-      raise KeyConstraintError, "key conflict inserting #{new_guy.inspect} into \"#{tabname}\": existing tuple #{old.inspect}, key_cols = #{keycols.inspect}"
+      key = get_key_vals(old)
+      raise KeyConstraintError, "key conflict inserting #{new_guy.inspect} into \"#{tabname}\": existing tuple #{old.inspect}, key = #{key.inspect}"
     end
     private
@@ -308,15 +309,22 @@ module Bud
       return o
     end
+    private
+    def get_key_vals(t)
+      @key_colnums.map do |i|
+        t[i]
+      end
+    end
     private
     def do_insert(o, store)
       return if o.nil? # silently ignore nils resulting from map predicates failing
       o = prep_tuple(o)
-      keycols = @key_colnums.map{|i| o[i]}
+      key = get_key_vals(o)
-      old = store[keycols]
+      old = store[key]
       if old.nil?
-        store[keycols] = tuple_accessors(o)
+        store[key] = tuple_accessors(o)
       else
         raise_pk_error(o, old) unless old == o
       end
@@ -374,10 +382,10 @@ module Bud
     end
     private
-    def include_any_buf?(t, key_vals)
+    def include_any_buf?(t, key)
       bufs = [self, @delta, @new_delta]
       bufs.each do |b|
-        old = b[key_vals]
+        old = b[key]
         next if old.nil?
         if old != t
           raise_pk_error(t, old)
@@ -391,16 +399,15 @@ module Bud
     public
     def merge(o, buf=@new_delta) # :nodoc: all
       unless o.nil?
-        o = o.uniq if o.respond_to?(:uniq)
         check_enumerable(o)
         establish_schema(o) if @cols.nil?
-        # it's a pity that we are massaging the tuples that already exist in the head
+        # it's a pity that we are massaging tuples that may be dups
         o.each do |t|
           next if t.nil? or t == []
           t = prep_tuple(t)
-          key_vals = @key_colnums.map{|k| t[k]}
-          buf[key_vals] = tuple_accessors(t) unless include_any_buf?(t, key_vals)
+          key = get_key_vals(t)
+          buf[key] = tuple_accessors(t) unless include_any_buf?(t, key)
         end
       end
       return self
@@ -432,7 +439,7 @@ module Bud
       self <+ o
       self <- o.map do |t|
         unless t.nil?
-          self[@key_colnums.map{|k| t[k]}]
+          self[get_key_vals(t)]
         end
       end
     end
@@ -461,9 +468,14 @@ module Bud
       @new_delta = {}
     end
-    private
-    def method_missing(sym, *args, &block)
-      @storage.send sym, *args, &block
+    public
+    def length
+      @storage.length
+    end
+    public
+    def empty?
+      @storage.empty?
     end
     ######## aggs
@@ -480,7 +492,6 @@ module Bud
       end
     end
     # a generalization of argmin/argmax to arbitrary exemplary aggregates.
     # for each distinct value of the grouping key columns, return the items in that group
     # that have the value of the exemplary aggregate +aggname+
@@ -592,7 +603,7 @@ module Bud
     # Attributes can be referenced as symbols, or as +collection_name.attribute_name+
     public
     def group(key_cols, *aggpairs)
-      key_cols = [] if key_cols.nil?
+      key_cols ||= []
       keynames = key_cols.map do |k|
         if k.class == Symbol
           k
@@ -892,15 +903,15 @@ module Bud
     public
     def tick #:nodoc: all
       @to_delete.each do |tuple|
-        keycols = @key_colnums.map{|k| tuple[k]}
-        if @storage[keycols] == tuple
-          @storage.delete keycols
+        key = get_key_vals(tuple)
+        if @storage[key] == tuple
+          @storage.delete key
         end
       end
-      @pending.each do |keycols, tuple|
-        old = @storage[keycols]
+      @pending.each do |key, tuple|
+        old = @storage[key]
         if old.nil?
-          @storage[keycols] = tuple
+          @storage[key] = tuple
         else
           raise_pk_error(tuple, old) unless tuple == old
         end
@@ -957,26 +968,3 @@ module Bud
     end
   end
 end
-module Enumerable
-  public
-  # monkeypatch to Enumerable to rename collections and their schemas
-  def rename(new_tabname, new_schema=nil)
-    budi = (respond_to?(:bud_instance)) ? bud_instance : nil
-    if new_schema.nil? and respond_to?(:schema)
-      new_schema = schema
-    end
-    scr = Bud::BudScratch.new(new_tabname.to_s, budi, new_schema)
-    scr.uniquify_tabname
-    scr.merge(self, scr.storage)
-    scr
-  end
-  public
-  # We rewrite "map" calls in Bloom blocks to invoke the "pro" method
-  # instead. This is fine when applied to a BudCollection; when applied to a
-  # normal Enumerable, just treat pro as an alias for map.
-  def pro(&blk)
-    map(&blk)
-  end
-end

data/lib/bud/graphs.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 require 'rubygems'
-require 'digest/md5'
 require 'graphviz'
 class GraphGen #:nodoc: all
   attr_reader :nodes
-  def initialize(tableinfo, builtin_tables, cycle, name, budtime, collapse=false, cardinalities={})
+  def initialize(tableinfo, builtin_tables, cycle, name, budtime, collapse=false, cardinalities={}, pathsto={}, begins={})
     @graph = GraphViz.new(:G, :type => :digraph, :label => "")
+    #@graph.dim =  2
     @graph.node[:fontname] = "Times-Roman"
     @graph.node[:fontsize] = 18
     @graph.edge[:fontname] = "Times-Roman"
@@ -16,6 +16,8 @@ class GraphGen #:nodoc: all
     @collapse = collapse
     @budtime = budtime
     @builtin_tables = builtin_tables
+    @pathsto = pathsto
+    @begins = begins
     # map: table name -> type
     @tabinf = {}
@@ -87,20 +89,46 @@ class GraphGen #:nodoc: all
     end
   end
+  def color_node(paths)
+    return "" if paths.nil?
+    case paths[0][:val]
+    when :A, :N
+      "yellow"
+    when :D, :G
+      "red"
+    else
+      puts "UNKNOWN tag #{paths[0][:val]} class #{paths[0][:val].class}"
+      "black"
+    end
+  end
   def addonce(node, negcluster, inhead=false)
     if !@nodes[node]
-      @nodes[node] = @graph.add_node("n_#{node}")
+      @nodes[node] = @graph.add_nodes(node)
+      node_p = @nodes[node]
+      node_p.label = node
+      if @begins[:finish] and @begins[:finish][node]
+        # point of divergence.
+        node_p.penwidth = 4
+      end
       if @cards and @cards[node]
-        @nodes[node].label = "#{node}\n (#{@cards[node].to_s})"
+        node_p.label = "#{node}\n (#{@cards[node].to_s})"
+        node_p.color = "green"
       else
-        @nodes[node].label = node
+        p = @pathsto[node].nil? ? "" : "\n(#{@pathsto[node][0][:val]})"
+        node_p.label = node + p
+        node_p.color = color_node(@pathsto[node])
       end
+    else
+      node_p = @nodes[node]
     end
     if @budtime == -1
-      @nodes[node].URL = "#{node}.html" if inhead
+      node_p.URL = "#{node}.html" if inhead
     else
-      @nodes[node].URL = "javascript:openWin(\"#{node}\", #{@budtime})"
+      node_p.URL = "javascript:openWin(\"#{node}\", #{@budtime})"
     end
     if negcluster
@@ -116,13 +144,13 @@ class GraphGen #:nodoc: all
           res = res + ", " + p
         end
       end
-      @nodes[node].label = res
-      @nodes[node].color = "red"
-      @nodes[node].shape = "octagon"
-      @nodes[node].penwidth = 3
-      @nodes[node].URL = "#{File.basename(@name).gsub(".staging", "").gsub("collapsed", "expanded")}.svg"
+      node_p.label = res
+      node_p.color = "red"
+      node_p.shape = "octagon"
+      node_p.penwidth = 3
+      node_p.URL = "#{File.basename(@name).gsub(".staging", "").gsub("collapsed", "expanded")}.svg"
     elsif @tabinf[node] and (@tabinf[node] == "Bud::BudTable")
-      @nodes[node].shape = "rect"
+      node_p.shape = "rect"
     end
   end
@@ -134,9 +162,10 @@ class GraphGen #:nodoc: all
     ekey = body + head
     if !@edges[ekey]
-      @edges[ekey] = @graph.add_edge(@nodes[body], @nodes[head], :penwidth => 5)
+      @edges[ekey] = @graph.add_edges(@nodes[body], @nodes[head], :penwidth => 5)
       @edges[ekey].arrowsize = 2
+      @edges[ekey].color = (@nodes[body]["color"].source || "")
       @edges[ekey].URL = "#{rule_id}.html" unless rule_id.nil?
       if head =~ /_msg\z/
         @edges[ekey].minlen = 2
@@ -212,7 +241,7 @@ class GraphGen #:nodoc: all
     if output.nil?
       @graph.output(:svg => @name)
     else
-      @graph.output(output => @name)
+      @graph.output(output.to_sym => @name)
     end
   end
 end
@@ -234,9 +263,8 @@ class SpaceTime
     @head = {}
     last = nil
     processes.each_with_index do |p, i|
-      #@head[p] = @hdr.add_node("process #{p}(#{i})")#, :color => "white", :label => "")
       @subs[p] = @g.subgraph("buster_#{i+1}")
-      @head[p] = @hdr.add_node("process #{p}(#{i})", :group => p)#, :color => "white", :label => "")
+      @head[p] = @hdr.add_nodes("process #{p}(#{i})", :group => p)#, :color => "white", :label => "")
     end
   end
@@ -272,10 +300,9 @@ class SpaceTime
         if @links
           url = "DBM_#{k}/tm_#{item}.svg"
         end
-        snd = @subs[k].add_node(label, {:label => item.to_s, :width => 0.1, :height => 0.1, :fontsize => 6, :pos => [1, i], :group => k, :URL => url})
+        snd = @subs[k].add_nodes(label, {:label => item.to_s, :width => 0.1, :height => 0.1, :fontsize => 6, :group => k, :URL => url})
         unless @head[k].id == snd.id
-          @subs[k].add_edge(@head[k], snd, :weight => 2)
+          @subs[k].add_edges(@head[k], snd, :weight => 2)
           @head[k] = snd
         end
       end
@@ -295,7 +322,7 @@ class SpaceTime
   def finish(file, fmt=nil)
     @edges.each_pair do |k, v|
       lbl = v[3] > 1 ? "#{v[2]}(#{v[3]})" : v[2]
-      @g.add_edge(v[0], v[1], :label => lbl, :color => "red", :weight => 1)
+      @g.add_edges(v[0], v[1], :label => lbl, :color => "red", :weight => 1)
     end
     if fmt.nil?
       @g.output(:svg => "#{file}.svg")

data/lib/bud/joins.rb CHANGED Viewed

@@ -291,7 +291,7 @@ module Bud
       otherpreds = allpreds - @localpreds
       unless otherpreds.empty?
         unless @rels[1].class <= Bud::BudJoin
-          raise Bud::CompileError, "join predicates don't match tables being joined: #{otherpreds.inspect}"
+          raise Bud::CompileError, "join predicates don't match collections being joined: #{otherpreds.inspect}"
         end
         @rels[1].setup_preds(otherpreds)
       end