pacer 0.9.1.1-java → 1.0.0-java

data/lib/pacer/core/graph/element_route.rb

@@ -3,11 +3,14 @@ module Pacer::Core::Graph
   # Basic methods for routes shared between all route types that emit
   # routes: {VerticesRoute}, {EdgesRoute} and {MixedRoute}
   module ElementRoute
+    def graph
+      config[:graph]
+    end
 
     # Attach a filter to the current route.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [ElementMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [ElementWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [ElementRoute] the same type and extensions as the source route.
     def filter(*filters, &block)
       Pacer::Route.property_filter(self, filters, block)
@@ -37,8 +40,8 @@ module Pacer::Core::Graph
     # Create a new TinkerGraph based on the paths of all matching elements.
     #
     # @return [TinkerGraph] the subgraph
-    def subgraph
-      paths.subgraph
+    def subgraph opts = {}
+      paths.subgraph nil, opts
     end
 
     # Delete all matching elements.
@@ -118,14 +121,14 @@ module Pacer::Core::Graph
 
     def build_index(index, index_key = nil, property = nil, create = true)
       index_name = index
-      unless index.is_a? com.tinkerpop.blueprints.pgm.Index
-        index = graph.index_name index.to_s
+      unless index.is_a? com.tinkerpop.blueprints.Index
+        index = graph.index index.to_s
       end
       sample_element = first
       unless index
         if sample_element
           if create
-            index = graph.createManualIndex index_name, graph.element_type(sample_element)
+            index = graph.index index_name, graph.element_type(sample_element), create: true
           else
             raise "No index found for #{ index } on #{ graph }" unless index
           end
@@ -133,7 +136,7 @@ module Pacer::Core::Graph
           return nil
         end
       end
-      index_key ||= index.index_name
+      index_key ||= index.name
       property ||= index_key
       if block_given?
         bulk_job do |element|
@@ -151,21 +154,11 @@ module Pacer::Core::Graph
 
     protected
 
-    # Determines which iterator mixin is applied to the iterator when #each is called
     def configure_iterator(iter)
-      if wrapper
-        iter.extend Pacer::Core::Route::IteratorWrapperMixin
-        iter.wrapper = wrapper
-        iter.extensions = @extensions if @extensions.any?
-        iter.graph = graph
-      elsif extensions and extensions.any?
-        iter.extend Pacer::Core::Route::IteratorExtensionsMixin
-        iter.extensions = extensions 
-        iter.graph = graph
-      else
-        iter.extend Pacer::Core::Route::IteratorMixin
-        iter.graph = graph
-      end
+      pipe = Pacer::Pipes::WrappingPipe.new graph, element_type, extensions
+      pipe.wrapper = wrapper if wrapper
+      pipe.setStarts iter
+      pipe
     end
   end
 end

data/lib/pacer/core/graph/graph_index_route.rb

@@ -4,9 +4,11 @@ module Pacer::Core::Graph
   # blueprints library.
   module GraphIndexRoute
     # Returns a new route to all graph vertices. Standard filter options.
-    def v(*filters, &block)
-      filters = Pacer::Route.filters(filters)
-      route = indexed_route(:vertex, filters, block)
+    def v(*args, &block)
+      filters = Pacer::Route.filters(args)
+      if features.supportsIndices
+        route = indexed_route(:vertex, filters, block)
+      end
       if route
         route
       else
@@ -15,9 +17,11 @@ module Pacer::Core::Graph
     end
 
     # Returns a new route to all graph edges. Standard filter options.
-    def e(*filters, &block)
-      filters = Pacer::Route.edge_filters(filters)
-      route = indexed_route(:edge, filters, block)
+    def e(*args, &block)
+      filters = Pacer::Route.edge_filters(args)
+      if features.supportsIndices
+        route = indexed_route(:edge, filters, block)
+      end
       if route
         route
       else
@@ -28,11 +32,11 @@ module Pacer::Core::Graph
     attr_accessor :choose_best_index
     attr_accessor :search_manual_indices
 
-    protected
+    private
 
     def indexed_route(element_type, filters, block)
       filters.graph = self
-      filters.indices = graph.getIndices
+      filters.indices = graph.indices
       filters.choose_best_index = choose_best_index != false
       filters.search_manual_indices = search_manual_indices
       idx, key, value = filters.best_index(element_type)

data/lib/pacer/core/graph/graph_route.rb

@@ -3,14 +3,11 @@ module Pacer::Core::Graph
   # This module adds route methods to the basic graph classes returned from the
   # blueprints library.
   module GraphRoute
-    import com.tinkerpop.pipes.transform.VerticesPipe
-    import com.tinkerpop.pipes.transform.EdgesPipe
-
     # Returns a new route to all graph vertices. Standard filter options.
     def v(*filters, &block)
       filters = Pacer::Route.filters(filters)
       route = chain_route :element_type => :vertex,
-        :pipe_class => VerticesPipe,
+        :pipe_class => Pacer::Pipes::VerticesPipe,
         :route_name => 'GraphV'
       Pacer::Route.property_filter(route, filters, block)
     end
@@ -19,7 +16,7 @@ module Pacer::Core::Graph
     def e(*filters, &block)
       filters = Pacer::Route.edge_filters(filters)
       route = chain_route :element_type => :edge,
-        :pipe_class => EdgesPipe,
+        :pipe_class => Pacer::Pipes::EdgesPipe,
         :route_name => 'GraphE'
       Pacer::Route.property_filter(route, filters, block)
     end

data/lib/pacer/core/graph/mixed_route.rb

@@ -3,13 +3,11 @@ module Pacer::Core::Graph
   # Basic methods for routes that may contain both vertices and edges. That can
   # happen as the result of a branched route, for example.
   module MixedRoute
-    include ElementRoute
-
     # Pass through only vertices.
     def v(*args, &block)
       route = chain_route :element_type => :vertex,
         :pipe_class => Pacer::Pipes::TypeFilterPipe,
-        :pipe_args => Pacer::VertexMixin,
+        :pipe_args => Pacer::Wrappers::VertexWrapper,
         :wrapper => wrapper,
         :extensions => extensions
       Pacer::Route.property_filter(route, args, block)
@@ -19,7 +17,7 @@ module Pacer::Core::Graph
     def e(*args, &block)
       route = chain_route :element_type => :edge,
         :pipe_class => Pacer::Pipes::TypeFilterPipe,
-        :pipe_args => Pacer::EdgeMixin,
+        :pipe_args => Pacer::Wrappers::EdgeWrapper,
         :wrapper => wrapper,
         :extensions => extensions
       Pacer::Route.property_filter(route, args, block)
@@ -76,7 +74,7 @@ module Pacer::Core::Graph
     # Calculate and save result.
     def result(name = nil)
       ids = collect do |element|
-        if element.is_a? Pacer::VertexMixin
+        if element.is_a? Pacer::Wrappers::VertexWrapper
           [:vertex, element.element_id]
         else
           [:edge, element.element_id]

data/lib/pacer/core/graph/vertices_route.rb

@@ -2,14 +2,12 @@ module Pacer::Core::Graph
 
   # Basic methods for routes that contain only vertices.
   module VerticesRoute
-    import com.tinkerpop.pipes.transform.OutEdgesPipe
-    import com.tinkerpop.pipes.transform.OutPipe
-    import com.tinkerpop.pipes.transform.InEdgesPipe
-    import com.tinkerpop.pipes.transform.InPipe
-    import com.tinkerpop.pipes.transform.BothEdgesPipe
-    import com.tinkerpop.pipes.transform.BothPipe
-
-    include ElementRoute
+    import com.tinkerpop.gremlin.pipes.transform.OutEdgesPipe
+    import com.tinkerpop.gremlin.pipes.transform.OutPipe
+    import com.tinkerpop.gremlin.pipes.transform.InEdgesPipe
+    import com.tinkerpop.gremlin.pipes.transform.InPipe
+    import com.tinkerpop.gremlin.pipes.transform.BothEdgesPipe
+    import com.tinkerpop.gremlin.pipes.transform.BothPipe
 
     # Extends the route with out edges from this route's matching vertices.
     #
@@ -17,7 +15,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def out_e(*filters, &block)
       filters = extract_labels(filters)
@@ -34,7 +32,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def out(*filters, &block)
       filters = extract_labels(filters)
@@ -51,7 +49,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def in_e(*filters, &block)
       filters = extract_labels(filters)
@@ -68,7 +66,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def in(*filters, &block)
       filters = extract_labels(filters)
@@ -85,7 +83,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def both_e(*filters, &block)
       filters = extract_labels(filters)
@@ -102,7 +100,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def both(*filters, &block)
       filters = extract_labels(filters)
@@ -119,7 +117,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexMixin(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def v(*filters, &block)
       filter(*filters, &block)
@@ -130,7 +128,7 @@ module Pacer::Core::Graph
     # @return [element_type(:vertex)] The actual type varies based on
     # which graph is in use.
     def element_type
-      graph.element_type(:vertex)
+      :vertex
     end
 
     # Delete all matching vertices and all edges which link to this
@@ -172,16 +170,17 @@ module Pacer::Core::Graph
       has_props = !props.empty?
       edge_ids = []
       counter = 0
-      graph.managed_transactions do
-        graph.managed_transaction do
-          each do |from_v|
-            to_vertices.each do |to_v|
-              counter += 1
-              graph.managed_checkpoint if counter % graph.bulk_job_size == 0
-              begin
-                edge = graph.create_edge(nil, from_v, to_v, label.to_s, props)
-                edge_ids << edge.element_id
-              end
+      graph.transaction do |commit, rollback|
+        v.each do |from_v|
+          to_vertices.each do |to_v|
+            counter += 1
+            if counter == graph.bulk_job_size
+              commit.call
+              counter = 0
+            end
+            begin
+              edge = graph.create_edge(nil, from_v, to_v, label.to_s, props)
+              edge_ids << edge.element_id
             end
           end
         end
@@ -214,7 +213,7 @@ module Pacer::Core::Graph
 
     # TODO: move id_pipe_class into the element_type object
     def id_pipe_class
-      com.tinkerpop.pipes.transform.IdVertexPipe
+      com.tinkerpop.gremlin.pipes.transform.IdVertexPipe
     end
   end
 end

data/lib/pacer/core/route.rb

@@ -35,7 +35,7 @@ module Pacer
       #
       # @todo move this to graph routes.
       #
-      # @return [GraphMixin]
+      # @return [PacerGraph]
       def graph
         @graph = nil unless defined? @graph
         @graph ||= (@back || @source).graph rescue nil
@@ -109,7 +109,7 @@ module Pacer
       # @return [Enumerator] if no block is given
       def each
         iter = iterator
-        configure_iterator(iter)
+        iter = configure_iterator(iter)
         if block_given?
           while true
             yield iter.next
@@ -117,7 +117,7 @@ module Pacer
         else
           iter
         end
-      rescue java.util.NoSuchElementException
+      rescue Pacer::EmptyPipe, java.util.NoSuchElementException
         self
       end
 
@@ -127,10 +127,17 @@ module Pacer
       # @return [java.util.Iterator] the pipe.
       def pipe
         iterator = each
-        yield iterator if block_given?
-        iterator
-      rescue java.util.NoSuchElementException
-        iterator
+        if block_given?
+          yield iterator if block_given?
+        else
+          iterator
+        end
+      rescue Pacer::EmptyPipe, java.util.NoSuchElementException
+        nil
+      end
+
+      def description(join = ' -> ')
+        "#<#{inspect_strings.join(join)}>"
       end
 
       # Returns a string representation of the route definition. If there are
@@ -142,7 +149,7 @@ module Pacer
       # @return [String]
       def inspect(limit = nil)
         if Pacer.hide_route_elements or hide_elements or source_iterator.nil?
-          "#<#{inspect_strings.join(' -> ')}>"
+          description
         else
           Pacer.hide_route_elements do
             count = 0
@@ -169,7 +176,7 @@ module Pacer
               end
             end
             puts "Total: #{ count }"
-            "#<#{inspect_strings.join(' -> ')}>"
+            description
           end
         end
       end
@@ -192,54 +199,14 @@ module Pacer
         none?
       end
 
-      # Add an extension to the route.
-      #
-      # If the extension has a Route module inside it, this route will
-      # be extended with the extension's Route module.
-      #
-      # If the extension has a Vertex or Edge module inside it, any vertices
-      # or edges emitted from this route will be extended with with the
-      # extension as well.
-      #
-      # @see VertexMixin#add_extensions
-      # @see EdgeMixin#add_extensions
-      #
-      # @return [self]
-      def add_extension(mod, add_to_list = true)
-        return self unless mod.respond_to?(:const_defined?)
-        is_extension = false
-        if mod.const_defined? :Route
-          is_extension = true
-          extend mod::Route
-        end
-        if add_to_list and (is_extension or mod.const_defined? :Vertex or mod.const_defined? :Edge)
-          @extensions << mod
-        end
-        self
-      end
-
       def set_wrapper(wrapper)
-        if wrapper.respond_to? :extensions
-          wrapper.extensions.each do |ext|
-            add_extension ext, false
-          end
-        end
-        @wrapper = wrapper
-        self
+        chain_route wrapper: wrapper
       end
-      alias wrapper= set_wrapper
 
       def wrapper
         @wrapper
       end
 
-      # Add extensions to this route.
-      #
-      # @see #add_extension
-      def extensions=(exts)
-        add_extensions Set[*exts]
-      end
-
       # Get the set of extensions currently on this route.
       #
       # The order of extensions for custom defined wrappers are
@@ -248,31 +215,32 @@ module Pacer
       # extensions in order followed by any additional extensions in
       # undefined order.
       #
-      # If a wrapper is present, returns an Array. Otherwise a Set.
+      # Returns an Array
       #
-      # @return [Enumerable[extension]]
-      def extensions
+      # @return [Array[extension]]
+      attr_reader :extensions
+
+      def all_extensions
         if wrapper
-          wrapper.extensions + @extensions.to_a
+          wrapper.extensions + extensions
         else
-          @extensions
+          extensions
         end
       end
 
       # If any objects in the given array are modules that contain a Route
       # submodule, extend this route with the Route module.
-      # @see #add_extension
       # @return [self]
       def add_extensions(exts)
-        modules = exts.select { |obj| obj.is_a? Module or obj.is_a? Class }
-        modules.each do |mod|
-          add_extension(mod)
-        end
-        self
+        chain_route extensions: (extensions - exts) + exts
+      end
+
+      def set_extensions(exts)
+        chain_route extensions: exts, wrapper: nil
       end
 
       def no_extensions
-        chain_route(:extensions => nil, :wrapper => nil)
+        chain_route(:extensions => [], :wrapper => nil)
       end
 
       # Change the source of this route.
@@ -293,9 +261,10 @@ module Pacer
 
       # Set the previous route in the chain.
       def back=(back)
-        if back.is_a? Route and not back.is_a? GraphMixin
+        if back.is_a? Route and not back.is_a? PacerGraph
           @back = back
         else
+          @back = nil
           @source = back
         end
       end
@@ -316,6 +285,7 @@ module Pacer
       # Overridden to extend the iterator to apply mixins
       # or wrap elements
       def configure_iterator(iter)
+        iter
       end
 
       def get_section_route(name)
@@ -363,9 +333,9 @@ module Pacer
 
       # Return an iterator for a variety of source object types.
       def iterator_from_source(src)
-        if src.is_a? Pacer::GraphMixin
+        if src.is_a? PacerGraph
           al = java.util.ArrayList.new
-          al << src
+          al << src.blueprints_graph
           al.iterator
         elsif src.is_a? Pacer::Wrappers::ElementWrapper
           Pacer::Pipes::EnumerablePipe.new src.element
@@ -496,7 +466,6 @@ module Pacer
         s = "#{s} #{ info }" if info
         s
       end
-
     end
   end
 end

data/lib/pacer/exceptions.rb

@@ -1,11 +1,18 @@
 module Pacer
-  class ElementNotFound < StandardError
-  end
+  class Error < StandardError; end
+    class UserError < Error; end
+      class ElementNotFound < UserError; end
+      class ElementExists < UserError; end
 
-  class ElementExists < StandardError
-  end
+    class LogicError < Error; end
+      class ClientError < LogicError; end
+        class TransactionConcludedError < ClientError; end
+        class NestedTransactionRollback < ClientError; end
+        class NestedMockTransactionRollback < NestedTransactionRollback; end
+        class MockTransactionRollback < ClientError; end
+        class UnsupportedOperation < ClientError; end
 
-  class UnsupportedOperation < StandardError
-  end
+      class InternalError < LogicError; end
+    class TransientError < Error; end
 end
 

data/lib/pacer/extensions/block_filter_element.rb

@@ -6,11 +6,6 @@ module Pacer
           @back = back
         end
 
-        # The previous route element.
-        def back
-          @back
-        end
-
         # The vars hash contains variables that were set earlier in the processing
         # of the route. Vars may also be set within the block.
         def vars

data/lib/pacer/filter/collection_filter.rb

@@ -27,6 +27,8 @@ module Pacer
     module CollectionFilter
       import java.util.HashSet
 
+      include Pacer::Visitors::VisitsSection
+
       attr_reader :var, :comparison, :ids, :objects
 
       def except=(collection)
@@ -36,6 +38,7 @@ module Pacer
 
       def except_var=(var)
         @var = var
+        self.section = var
         @comparison = Pacer::Pipes::NOT_EQUAL
       end
 
@@ -46,6 +49,7 @@ module Pacer
 
       def only_var=(var)
         @var = var
+        self.section = var
         @comparison = Pacer::Pipes::EQUAL
       end
 
@@ -73,8 +77,11 @@ module Pacer
       end
 
       def attach_pipe(end_pipe)
-        if var
-          pipe = Pacer::Pipes::CollectionFilterPipe.new(vars[var], comparison)
+        if section_visitor_target
+          element = section_visitor_target.new
+          # Will cause section_visitor to call the #on_element and #reset methods.
+          section_visitor.visitor = element
+          pipe = Pacer::Pipes::CollectionFilterPipe.new(element, comparison)
         elsif ids
           pipe = Pacer::Pipes::IdCollectionFilterPipe.new(ids, comparison)
         else

data/lib/pacer/filter/empty_filter.rb

@@ -13,7 +13,7 @@ module Pacer
       # @param [Route] back the route the new route is based on.
       # @return [Route]
       def empty(back)
-        Pacer::Route.new :filter => :empty, :back => back
+        back.chain_route :filter => :empty
       end
 
       def block_branch(back, block, branch_start = nil)
@@ -21,7 +21,7 @@ module Pacer
           route = block.call rescue nil
         else
           unless branch_start
-            if back.is_a? Pacer::Graph 
+            if back.is_a? Pacer::Graph
               branch_start = back
             else
               branch_start = Pacer::Route.empty(back)
@@ -61,7 +61,16 @@ module Pacer
       end
 
       def inspect_class_name
-        s = "#{element_type.to_s.scan(/Elem|Obj|V|E/).last}"
+        s = case element_type
+            when :vertex
+              'V'
+            when :edge
+              'E'
+            when :object
+              'Obj'
+            when :mixed
+              'Elem'
+            end
         s = "#{s} #{ @info }" if @info
         s
       end

data/lib/pacer/filter/future_filter.rb

@@ -18,11 +18,11 @@ module Pacer
       attr_accessor :min, :max
 
       def block=(block)
-        @future_filter = [block, true]
+        @future_filter = [block, false]
       end
 
       def neg_block=(block)
-        @future_filter = [block, false]
+        @future_filter = [block, true]
       end
 
       protected
@@ -41,14 +41,14 @@ module Pacer
 
       def lookahead_route
         if @future_filter
-          block, has_elements = @future_filter
+          block, negate = @future_filter
           @future_filter = nil
           route = block.call(Pacer::Route.empty(self))
           if min or max
             route = route.has_count_route(:min => min, :max => max).is(true)
           end
-          unless has_elements
-            route = route.chain_route(:element_type => :object, :pipe_class => Pacer::Pipes::IsEmptyPipe, :route_name => 'negate')
+          if negate
+            route = route.chain_route(pipe_class: Pacer::Pipes::IsEmptyPipe, :route_name => 'negate')
           end
           @route = route
         elsif @route