zillabyte 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzIxMDllNWM4Zjk5MGRiNjQ2ZTZhMTUzMDlkMjY2MGY2OTkzNGYwMQ==
+    ZTA5ZjU3OWVjMTMzYzVmOWFiNDhhNTM1OTg2ODM4NWQ4MDlmMDFmNg==
   data.tar.gz: !binary |-
-    ZTEwZWM4MDk0MzkxZDc5OGJmNWMwYzUyZDlmYTFlNWMzMzM0YmJlOQ==
+    MTY4Y2MxNmVlZjBkNDEyZDg2ZTcyODgzNWZmOGVmZDJmMDFjOTg0Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWM5MTJkZjI1ZWNmYTA3NjkyOGU0ODIwMmI1ZjU0YmQ5MDE0NzgxMTUyNTIy
-    M2UwYWZmNWY5ZDJlYWI0YzMyMTkwYTUyMjk1OTY0MWRhYzU4N2Y0NDY2ZmM1
-    OTBlYjUzYTI4YWFmMmIxOGE0YTBkM2YxYTM1ZTM1ZmYyMjM0N2E=
+    ZDgxM2IyNTlhNmY3MGQ2MjdlYmU1ZTEzMWJhYTFlMzYxZjdiYjNjNjNkNzU1
+    NGIyNGY3MDllY2U0NjczNTJlODEwNTcwYTI5ZTI2NTQxNDY3Mzc2YTQwZTkz
+    MmRiYmZlMTg4YmJkMjhiNTdkODJlNDUyOGY4OTE1YmIwNTJiMmU=
   data.tar.gz: !binary |-
-    MzAxZjM2ZmMwY2RiYzQ0NDgyY2U1ZGE1ZDVkZjMyNmZhYzAxNWIyMjVjY2Mw
-    MGMxY2RjNDYwNDIxNDA2ZTdmOGE5MjMxYWM4OWRhMDE1YjNmYmIwMzcyYmI5
-    YmZiNmZkMjViNzFmMGU2N2JiYjdmZDU2ZTg3OWY0Zjk5YzdjNDM=
+    ZDZkOTljYzc2Y2Q4YTYyMjg3OTY0ODVhNmJjZDYwYWJhMzU5MjBjYTgwZGQ3
+    NjQ0OTZlN2Y1ZmQ4Y2E0ZTBjNmJiODhkZTVlYTU2OTVkNzdkYzJjMDYzYjZi
+    YTBkMWM0MGY1NzBhNTYzMTc0ZmNiZjE5YzcxM2IwNWRmY2Q2NzQ=

data/ruby/lib/zillabyte/harness/app.rb

@@ -43,6 +43,7 @@ class Zillabyte::Harness::App < Zillabyte::Harness::Base
       else
         node_hash["end_cycle_policy"] = h._end_cycle_policy
       end
+      
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_info_file)
     elsif(@_options[:command] == :execute and @_options[:name] == h._name)
       pipe_name = @_options[:pipe]

data/ruby/lib/zillabyte/harness/each.rb

@@ -1,5 +1,5 @@
 class Zillabyte::Harness::Each
-  attr_accessor :_name, :_type, :_emits, :_output_format, :_prepare, :_execute
+  attr_accessor :_name, :_type, :_emits, :_output_format, :_parallelism, :_prepare, :_execute
 
   def initialize()
     @_name = "each_"+Zillabyte::Harness::Counter.get()
@@ -19,6 +19,10 @@ class Zillabyte::Harness::Each
     @_output_format = v
   end
 
+  def parallelism(v)
+    @_parallelism = v
+  end
+
   def prepare(&block)
     @_prepare = block
   end

data/ruby/lib/zillabyte/harness/filter.rb

@@ -1,5 +1,5 @@
 class Zillabyte::Harness::Filter
-  attr_accessor :_name, :_type, :_emits, :_prepare, :_keep
+  attr_accessor :_name, :_type, :_emits, :_parallelism, :_prepare, :_keep
 
   def initialize()
     @_name = "filter_"+Zillabyte::Harness::Counter.get()
@@ -13,6 +13,10 @@ class Zillabyte::Harness::Filter
   def emits(*v)
     @_emits = *v
   end
+
+  def parallelism(v)
+    @_parallelism = v
+  end
   
   def prepare(&block)
     @_prepare = block

data/ruby/lib/zillabyte/harness/group_by.rb

@@ -1,5 +1,5 @@
 class Zillabyte::Harness::GroupBy
-  attr_accessor :_name, :_type, :_group_by, :_emits, :_begin_group, :_aggregate, :_end_group
+  attr_accessor :_name, :_type, :_group_by, :_emits, :_parallelism, :_begin_group, :_aggregate, :_end_group
 
   def initialize(*v)
     @_name = "group_by_"+Zillabyte::Harness::Counter.get()
@@ -14,6 +14,10 @@ class Zillabyte::Harness::GroupBy
   def emits(*v)
     @_emits = *v
   end
+
+  def parallelism(v)
+    @_parallelism = v
+  end
   
   def begin_group(&block)
     @_begin_group = block

data/ruby/lib/zillabyte/harness/helper.rb

@@ -153,7 +153,13 @@ class Zillabyte::Harness::Helper
     if filter._emits.size != 1
       msg = "#{ee}A \"filter\" must emit a single stream. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
+    end 
+    
+    if filter._parallelism && filter._parallelism.to_i <= 0
+      msg = "Parallelism for component_source must be positive integer" 
+      Zillabyte::Harness::Helper.print_error(msg)
     end
+
     if !filter._keep
       msg = "#{ee}A \"filter\" must contain a \"keep\" block. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
@@ -164,6 +170,11 @@ class Zillabyte::Harness::Helper
     ee = "Error in \"each\": \n\t "
     pp = @@_print_check_each
 
+    if each._parallelism && each._parallelism.to_i <= 0
+      msg = "Parallelism for each must be positive integer" 
+      Zillabyte::Harness::Helper.print_error(msg)
+    end
+
     if !each._execute
       msg = "#{ee}An \"each\" must contain an \"execute\" block. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
@@ -180,6 +191,12 @@ class Zillabyte::Harness::Helper
       msg = "#{ee} A \"group_by\" must contain a non-empty \"group_by\" clause. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
     end
+
+    if group_by._parallelism && group_by._parallelism.to_i <= 0
+      msg = "Parallelism for group_by must be positive integer" 
+      Zillabyte::Harness::Helper.print_error(msg)
+    end
+
     group_by._group_by.each do |field|
       if(!(field.is_a?(String) or field.is_a?(Symbol)) or (field =~ /^\w+$/).nil?)
         msg = "#{ee}Field names must be non-empty STRINGS with only alphanumeric and underscore characters at \"#{field}\"."
@@ -256,6 +273,7 @@ class Zillabyte::Harness::Helper
 
     name = sink._name
     columns = sink._columns
+
     if(!name)
       msg = "#{ee}Relation name must be specified! #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
@@ -335,7 +353,7 @@ class Zillabyte::Harness::Helper
     if(columns.empty?)
       msg = "#{ee}Must be at least one output field to \"#{node._name}\". #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
-    end
+    end 
 
     columns.each do |col|
       cname = col.keys[0]

data/ruby/lib/zillabyte/harness/injected_component.rb

@@ -15,7 +15,7 @@ class Zillabyte::Harness::InjectedComponent
   def component_id(v)
     @_id = v.to_s
   end
-
+  
   def additional_inputs(*v)
     @_consumes = *v
   end

data/ruby/lib/zillabyte/harness/join.rb

@@ -36,5 +36,4 @@ class Zillabyte::Harness::Join
     end
     
   end
-
 end

data/ruby/lib/zillabyte/harness/live_delegator.rb

@@ -79,7 +79,6 @@ module Zillabyte
             :replace           => ''        # Use a blank for those replacements
           }
         json_s = msg.join("\n").chomp.encode(Encoding.find('ASCII'), encoding_options)
-
         return JSON.parse(json_s)
         
       end

data/ruby/lib/zillabyte/harness/sink.rb

@@ -1,5 +1,5 @@
 class Zillabyte::Harness::Sink
-  attr_accessor :_name, :_relation, :_type, :_columns, :_scope
+  attr_accessor :_name, :_relation, :_type,  :_columns, :_scope
 
   def initialize()
     @_type = 'sink'

data/ruby/lib/zillabyte/harness/stream.rb

@@ -34,7 +34,12 @@ class Zillabyte::Harness::Stream
     @_app._nodes << h
 
     if(@_app._options[:command] == :info)
+
       node_hash = {"name" => h._name, "type" => h._type, "output_format" => h._output_format}
+      if (h._parallelism)
+        node_hash["parallelism"] = h._parallelism
+      end
+
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_app._info_file)
       arc_hash = {"name" => @_name, "origin" => @_previous_node_name, "dest" => h._name}
       Zillabyte::Harness::Helper.write_arc_to_file(arc_hash, @_app._info_file)
@@ -72,7 +77,12 @@ class Zillabyte::Harness::Stream
     @_app._nodes << h
 
     if(@_app._options[:command] == :info)
+
       node_hash = {"name" => h._name, "type" => h._type}
+      if (h._parallelism)
+        node_hash["parallelism"] = h._parallelism
+      end
+
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_app._info_file)
       arc_hash = {"name" => @_name, "origin" => @_previous_node_name, "dest" => h._name}
       Zillabyte::Harness::Helper.write_arc_to_file(arc_hash, @_app._info_file)
@@ -110,6 +120,10 @@ class Zillabyte::Harness::Stream
       
       # Info.. 
       node_hash = {"name" => h._name, "type" => h._type, "group_by" => h._group_by}
+     if(h._parallelism)
+        node_hash["parallelism"] = h._parallelism
+      end
+      
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_app._info_file)
       arc_hash = {"name" => @_name, "origin" => @_previous_node_name, "dest" => h._name}
       Zillabyte::Harness::Helper.write_arc_to_file(arc_hash, @_app._info_file)
@@ -163,6 +177,7 @@ class Zillabyte::Harness::Stream
         "lhs_fields" => h._lhs_fields,
         "rhs_fields" => h._rhs_fields,
         "join_type" => h._join_type}
+      
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_app._info_file)
       arc_hash1 = {"name" => @_name, "origin" => @_previous_node_name, "dest" => h._name, "left" => 1}
       Zillabyte::Harness::Helper.write_arc_to_file(arc_hash1, @_app._info_file)
@@ -221,6 +236,7 @@ class Zillabyte::Harness::Stream
     @_app._nodes << h
     if(@_app._options[:command] == :info)
       node_hash = {"name" => h._name, "type" => h._type, "columns" => h._columns, "relation" => h._relation || h._name, "scope" => h._scope}
+     
       Zillabyte::Harness::Helper.write_node_to_file(node_hash, @_app._info_file)
       arc_hash = {"name" => @_name, "origin" => @_previous_node_name, "dest" => h._name}
       Zillabyte::Harness::Helper.write_arc_to_file(arc_hash, @_app._info_file)

data/ruby/lib/zillabyte/version.rb

@@ -1,3 +1,3 @@
 module Zillabyte
-  VERSION = "0.1.5" unless defined?(VERSION)
+  VERSION = "0.1.6" unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
 description: The Official Zillabyte Gem
 email:
 - gem@zillabyte.com