pacer 1.0.3-java → 1.1.0-java

data/lib/pacer/filter/property_filter/filters.rb

@@ -89,6 +89,11 @@ module Pacer
           end
         end
 
+        def remove_property_keys(keys)
+          properties.delete_if { |a| keys.include? a.first }
+          non_ext_props.delete_if { |a| keys.include? a.first }
+        end
+
         # Set which indices are available to be used to determine the
         # best_index.
         #
@@ -225,7 +230,7 @@ module Pacer
           return nil if avail.empty?
           index_options = []
           properties.each do |k, v|
-            if index_for_property(avail, index_options, k, v)
+            if v and index_for_property(avail, index_options, k, v)
               return @best_index
             end
           end

data/lib/pacer/graph/graph_transactions_mixin.rb

@@ -47,6 +47,11 @@ module Pacer
       end
     end
 
+    # Set this to true if you don't want to use transactions.
+    #
+    # By default, transactions are enabled.
+    attr_accessor :disable_transactions
+
   private
 
     def threadlocal_graph_info
@@ -58,7 +63,7 @@ module Pacer
       tgi = threadlocal_graph_info
       tx_depth = tgi[:tx_depth] ||= 0
       tgi[:tx_depth] += 1
-      if blueprints_graph.is_a? TransactionalGraph
+      if (not disable_transactions) and blueprints_graph.is_a? TransactionalGraph
         if tx_depth == 0
           base_tx_finalizers
         elsif opts[:nesting] == true

data/lib/pacer/graph/pacer_graph.rb

@@ -26,13 +26,18 @@ module Pacer
       self
     end
 
-    def reopen
-      graph = @reopen.call
-      if graph.is_a? PacerGraph
-        @blueprints_graph = graph.blueprints_graph
+    def vendor(full = false)
+      g = blueprints_graph
+      g = g.raw_graph if g.respond_to? :raw_graph
+      if full
+        g.java_class.name
       else
-        @blueprints_graph = graph
+        g.java_class.name.split('.')[1]
       end
+    end
+
+    def reopen
+      @blueprints_graph = unwrap_graph @reopen.call
       self
     end
 
@@ -42,6 +47,17 @@ module Pacer
       self
     end
 
+    def use_wrapper(klass)
+      reopen = proc do
+        klass.new unwrap_graph(@reopen.call)
+      end
+      PacerGraph.new encoder, reopen, @shutdown
+    end
+
+    def use_encoder(encoder)
+      PacerGraph.new encoder, @reopen, @shutdown
+    end
+
     def graph_id
       blueprints_graph.object_id
     end
@@ -187,6 +203,26 @@ module Pacer
       blueprints_graph.features
     end
 
+    def inspect
+      "#<PacerGraph #{ blueprints_graph.to_s }"
+    end
+
+
+    private
+
+    def unwrap_graph(graph)
+      if graph.is_a? PacerGraph
+        graph.blueprints_graph
+      else
+        graph
+      end
+    end
+
+
+
+
+    public
+
     module Encoding
       def encode_property(value)
         encoder.encode_property value
@@ -201,35 +237,16 @@ module Pacer
     module Naming
       # The proc used to name vertices.
       #
-      # @return [Proc]
-      def vertex_name
-        @vertex_name if defined? @vertex_name
-      end
-
-      # Set the proc used to name vertices.
-      #
-      # @param [Proc(vertex)] a_proc returns a string given a vertex
-      def vertex_name=(a_proc)
-        @vertex_name = a_proc
-      end
+      # @return [Proc] returns a string given a vertex
+      attr_accessor :vertex_name
 
       # The proc used to name edges.
       #
-      # @return [Proc]
-      def edge_name
-        @edge_name if defined? @edge_name
-      end
-
-      # Set the proc used to name edges.
-      #
-      # @param [Proc(edge)] a_proc returns a string given an edge
-      def edge_name=(a_proc)
-        @edge_name = a_proc
-      end
+      # @return [Proc] returns a string given an edge
+      attr_accessor :edge_name
     end
     include Naming
 
-
     module BulkJob
       attr_accessor :in_bulk_job
 
@@ -346,9 +363,9 @@ module Pacer
       def create_key_index(name, type)
         if features.supportsKeyIndices
           if element_type(type) == :vertex and features.supportsVertexKeyIndex
-            blueprints_graph.createKeyIndex name, index_class(:vertex)
+            blueprints_graph.createKeyIndex name.to_s, index_class(:vertex)
           elsif element_type(type) == :edge and features.supportsEdgeKeyIndex
-            blueprints_graph.createKeyIndex name, index_class(:edge)
+            blueprints_graph.createKeyIndex name.to_s, index_class(:edge)
           end
         end
       end

data/lib/pacer/graph/yaml_encoder.rb

@@ -59,6 +59,8 @@ module Pacer
       else
         value
       end
+    rescue Psych::SyntaxError
+      value
     end
 
     private

data/lib/pacer/loader.rb

@@ -39,6 +39,7 @@ require 'pacer/wrappers/edge_wrapper'
 require 'pacer/wrappers/index_wrapper'
 require 'pacer/wrappers/wrapper_selector'
 require 'pacer/wrappers/wrapping_pipe_function'
+require 'pacer/wrappers/path_wrapping_pipe_function'
 
 require 'pacer/route_builder'
 require 'pacer/function_resolver'
@@ -48,6 +49,9 @@ require 'pacer/blueprints/tg'
 require 'pacer/blueprints/ruby_graph'
 require 'pacer/blueprints/multi_graph'
 
+require 'pacer/blueprints/payload_elements'
+
+require 'pacer/support/array'
 require 'pacer/support/array_list'
 require 'pacer/support/enumerable'
 require 'pacer/support/proc'
@@ -78,12 +82,17 @@ require 'pacer/transform/stream_sort'
 require 'pacer/transform/stream_uniq'
 require 'pacer/transform/gather'
 require 'pacer/transform/map'
+require 'pacer/transform/flat_map'
+require 'pacer/transform/make_pairs'
 require 'pacer/transform/process'
 require 'pacer/transform/join'
 require 'pacer/transform/path'
+require 'pacer/transform/path_tree'
+require 'pacer/transform/wrapped_path'
 require 'pacer/transform/scatter'
 require 'pacer/transform/has_count_cap'
 require 'pacer/transform/sort_section'
+require 'pacer/transform/payload'
 
 require 'pacer/side_effect/aggregate'
 require 'pacer/side_effect/as'

data/lib/pacer/pipe/block_filter_pipe.rb

@@ -2,17 +2,18 @@ module Pacer::Pipes
   class BlockFilterPipe < AbstractPipe
     field_reader :starts
 
-    attr_reader :block
+    attr_reader :block, :invert
 
     def initialize(back, block, invert = false)
       super()
+      @invert = invert
       @block = Pacer::Wrappers::WrappingPipeFunction.new back, block
     end
 
     def processNextStart()
       while raw_element = starts.next
         ok = block.call raw_element
-        ok = !ok if @invert
+        ok = !ok if invert
         return raw_element if ok
       end
       raise EmptyPipe.instance

data/lib/pacer/pipe/loop_pipe.rb

@@ -12,17 +12,17 @@ module Pacer::Pipes
       empty = ArrayList.new
       @expando.setStarts empty.iterator
       looping_pipe.setStarts(@expando)
-      #if control_block.arity < 0 and 1 < control_block.arity
+      if control_block.arity < 0 or control_block.arity > 2
         @yield_paths = true
         looping_pipe.enablePath true
-      #end
+      end
       @looping_pipe = looping_pipe
     end
 
     def next
       super
     ensure
-      @path = @next_path
+      @path = next_path
     end
 
     def setStarts(starts)
@@ -30,9 +30,15 @@ module Pacer::Pipes
       enablePath true if yield_paths
     end
 
+    def enablePath(b)
+      super
+      looping_pipe.enablePath true if b and not yield_paths
+    end
+
     protected
 
     attr_reader :wrapper, :control_block, :expando, :looping_pipe, :graph, :yield_paths
+    attr_accessor :next_path
 
     def processNextStart
       while true
@@ -41,32 +47,32 @@ module Pacer::Pipes
         if has_next
           element = looping_pipe.next
           depth = (expando.metadata || 0) + 1
-          @next_path = looping_pipe.getCurrentPath if yield_paths
+          self.next_path = looping_pipe.getCurrentPath if pathEnabled
         else
           element = starts.next
-          if pathEnabled
-            @next_path = starts.getCurrentPath
-          else
-            @next_path = ArrayList.new
-            @next_path.add element
-          end
+          self.next_path = starts.getCurrentPath if pathEnabled
           depth = 0
         end
         wrapped = wrapper.new(graph, element)
-        path = @next_path.map do |e|
-          wrapper.new graph, e
+        if pathEnabled
+          path = next_path.map do |e|
+            wrapper.new graph, e
+          end
+          control = control_block.call wrapped, depth, path
+        else
+          control = control_block.call wrapped, depth
         end
-        case control_block.call wrapped, depth, path
+        case control
         when :loop
-          expando.add element, depth, @next_path
+          expando.add element, depth, next_path
         when :emit
           return element
         when :emit_and_loop, :loop_and_emit
-          expando.add element, depth, @next_path
+          expando.add element, depth, next_path
           return element
-        when false, nil
+        when false, nil, :discard
         else
-          expando.add element, depth, @next_path
+          expando.add element, depth, next_path
           return element
         end
       end

data/lib/pacer/pipe/multi_pipe.rb

@@ -0,0 +1,40 @@
+module Pacer::Pipes
+  class MultiPipe < RubyPipe
+    import com.tinkerpop.pipes.util.iterators.MultiIterator
+    import com.tinkerpop.pipes.Pipe
+
+    attr_reader :pipes
+
+    def initialize(enums)
+      super()
+      @pipes = enums.map do |e|
+        if e.is_a? Pipe
+          e
+        else
+          e.to_iterable
+        end
+      end
+      setStarts MultiIterator.new(*pipes)
+    end
+
+    def +(enum)
+      MultiPipe.new(pipes + [enum])
+    end
+
+    def -(enum)
+      MultiPipe.new(pipes - [enum])
+    end
+
+    def getCurrentPath
+      starts.getCurrentPath
+    end
+
+    def processNextStart
+      starts.next
+    end
+
+    def inspect
+      "#<MultiPipe #{ pipes.count } sources>"
+    end
+  end
+end

data/lib/pacer/pipe/naked_pipe.rb

@@ -0,0 +1,21 @@
+module Pacer
+  module Pipes
+    class NakedPipe < RubyPipe
+      def getCurrentPath
+        starts.getCurrentPath
+      end
+
+      def processNextStart
+        e = starts.next
+        e = e.element if e.respond_to? :element
+        if e.respond_to? :raw_vertex
+          e.raw_vertex
+        elsif e.respond_to? :raw_edge
+          e.raw_edge
+        else
+          e
+        end
+      end
+    end
+  end
+end

data/lib/pacer/pipe/unwrapping_pipe.rb

@@ -1,6 +1,10 @@
 module Pacer
   module Pipes
     class UnwrappingPipe < RubyPipe
+      def getSideEffect
+        starts.getSideEffect
+      end
+
       def processNextStart
         starts.next.element
       end

data/lib/pacer/pipe/wrapping_pipe.rb

@@ -11,6 +11,10 @@ module Pacer
         @wrapper = Pacer::Wrappers::WrapperSelector.build element_type, @extensions
       end
 
+      def getSideEffect
+        starts.getSideEffect
+      end
+
       def getCurrentPath
         starts.getCurrentPath
       end

data/lib/pacer/pipes.rb

@@ -5,7 +5,6 @@ module Pacer
     import com.tinkerpop.pipes.AbstractPipe
     import com.tinkerpop.pipes.transform.IdentityPipe
     import com.tinkerpop.pipes.util.Pipeline
-    import com.tinkerpop.pipes.util.iterators.MultiIterator
     import com.tinkerpop.pipes.util.PipeHelper
 
     import com.tinkerpop.pipes.filter.RandomFilterPipe
@@ -37,6 +36,7 @@ require 'pacer/pipe/vertices_pipe'
 require 'pacer/pipe/edges_pipe'
 
 require 'pacer/pipe/never_pipe'
+require 'pacer/pipe/multi_pipe'
 require 'pacer/pipe/block_filter_pipe'
 require 'pacer/pipe/collection_filter_pipe'
 require 'pacer/pipe/enumerable_pipe'
@@ -64,3 +64,4 @@ require 'pacer/pipe/cross_product_transform_pipe'
 require 'pacer/pipe/wrapping_pipe'
 require 'pacer/pipe/path_wrapping_pipe'
 require 'pacer/pipe/unwrapping_pipe'
+require 'pacer/pipe/naked_pipe'

data/lib/pacer/route/mixin/route_operations.rb

@@ -39,6 +39,19 @@ module Pacer::Routes
       end
       result
     end
+    alias frequencies group_count
+
+    def frequency_groups(*props)
+      result = Hash.new { |h, k| h[k] = [] }
+      group_count(*props).each { |k, v| result[v] << k }
+      result
+    end
+
+    def frequency_counts(*props)
+      result = Hash.new 0
+      group_count(*props).each { |k, v| result[v] += 1 }
+      result
+    end
 
     def most_frequent(range = 0, include_counts = false)
       if include_counts
@@ -104,6 +117,8 @@ module Pacer::Routes
             'Obj'
           when :mixed
             'Elem'
+          else
+            element_type.to_s.capitalize
           end
       s = "#{s}-#{function.name.split('::').last.sub(/Filter|Route$/, '')}" if function
       s = "#{s} #{ @info }" if @info