pacer 1.3.4-java → 1.3.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0437b2986f40401080f7411e1a9544d0f755ba6
-  data.tar.gz: dccae462788df22508168a2020967d8ff6b68ee4
+  metadata.gz: 8c1a23e3e54a2756db3922e88510185ad2ccf8bc
+  data.tar.gz: 7f2fd6f0f42832e55b91c8dbaf230bb0c3050549
 SHA512:
-  metadata.gz: d57a870de4286fc56cf7c0dd0def46110fd95bd0179c8de3bb255547351dfb9e3d400bc1d91989adef29a5b53e1cffbd66fe888d1986fe6a8a7e3320e12ce4e6
-  data.tar.gz: def7ed535a7df4fa3337722aa553f7bc4235fa15c6667372edb442d452d035c107e53a8e3b44c1d221bc0a42860e0defec0b9e0698e0ba81736dc4bf5b28559f
+  metadata.gz: a1b4a54c3a52d987414be288ededf52c8a18d3c4243bb3ec9fb0166e0b0df5fd8efe524a118c53b1469a2fb841eda2e1568e45bf87cd86ba7dac52706db6e1fc
+  data.tar.gz: 898247e0abb0e20b9f1b5eab079cc366bb046d356239ccb0fc3ab4c31e9bcdff83bf5b0d75fa01d44ac3709f50e94ca5cd533a8ff20f58084d8e57f5368a9647

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

@@ -36,6 +36,7 @@ module Pacer::Core::Graph
 
     def indexed_route(element_type, filters, block)
       filters.graph = self
+      filters.use_lookup!
       filters.indices = graph.indices
       filters.choose_best_index = choose_best_index != false
       filters.search_manual_indices = search_manual_indices

data/lib/pacer/filter/loop_filter.rb

@@ -215,10 +215,10 @@ HELP
         expando.setStarts empty.iterator
         if route
           control_pipe = Pacer::Route.pipeline route
+          control_pipe.setStarts expando
         else
-          control_pipe = Pacer::Pipes::IdentityPipe.new
+          control_pipe = expando
         end
-        control_pipe.setStarts expando
         [expando, control_pipe]
       end
 

data/lib/pacer/filter/object_filter.rb

@@ -3,17 +3,17 @@ module Pacer
     module RouteOperations
       def is(value)
         if value.is_a? Symbol
-          chain_route :filter => :property, :block => proc { |v| v.vars[value] == v }
+          chain_route filter: Pacer::Filter::SectionFilter, section: value
         else
-          chain_route({ :filter => :object, :value => value })
+          chain_route filter: Pacer::Filter::ObjectFilter, value: value
         end
       end
 
       def is_not(value)
         if value.is_a? Symbol
-          chain_route :filter => :property, :block => proc { |v| v.vars[value] != v }
+          chain_route filter: Pacer::Filter::SectionFilter, section: value, negate: true
         else
-          chain_route({ :filter => :object, :value => value, :negate => true })
+          chain_route filter: Pacer::Filter::ObjectFilter, value: value, negate: true
         end
       end
 
@@ -46,5 +46,55 @@ module Pacer
         end
       end
     end
+
+    module SectionFilter
+      # VisitsSection module provides:
+      #  section=
+      #  section_visitor
+      include Pacer::Visitors::VisitsSection
+
+      attr_accessor :negate
+
+      def attach_pipe(end_pipe)
+        pipe = FilterSectionPipe.new(section_visitor, negate)
+        pipe.setStarts end_pipe if end_pipe
+        pipe
+      end
+
+      class FilterSectionPipe < Pacer::Pipes::RubyPipe
+        attr_reader :section, :negate
+        attr_accessor :other
+
+        def initialize(section, negate)
+          super()
+          @section = section
+          @negate = negate
+          section.visitor = self if section
+        end
+
+        def processNextStart
+          value = starts.next
+          if negate
+            while value == other
+              value = starts.next
+            end
+          else
+            while value != other
+              value = starts.next
+            end
+          end
+          value
+        end
+
+        def on_raw_element(x)
+          self.other = x
+        end
+
+        def reset
+          self.other = nil
+          super
+        end
+      end
+    end
   end
 end

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

@@ -172,6 +172,22 @@ module Pacer
           result
         end
 
+        # Check #lookup in extensions, in preerence to #route_conditions
+        # for filters to apply.
+        #
+        # Designed to allow filters to be defined in extensions that
+        # will not be used on every appearance of the extension (too
+        # many property filters in a traversal can impose a serious
+        # performance penalty. It is expected that lookup filters will
+        # only be used for index lookups.
+        def use_lookup!
+          extensions.each do |ext|
+            if ext.respond_to? :lookup
+              add_filters ext.lookup, ext
+            end
+          end
+        end
+
       protected
 
         attr_accessor :non_ext_props
@@ -191,9 +207,7 @@ module Pacer
             else
               self.extensions << filter
             end
-            if filter.respond_to? :route_conditions
-              add_filters filter.route_conditions, filter
-            end
+            extract_conditions(filter)
             if filter.respond_to? :route
               self.route_modules << filter
             end
@@ -203,20 +217,22 @@ module Pacer
           else
             if filter.respond_to? :wrapper
               self.wrapper = filter.wrapper
-              if filter.respond_to? :route_conditions
-                add_filters filter.route_conditions, filter
-              end
+              extract_conditions(filter)
             elsif filter.respond_to? :parts
               self.extensions.concat filter.parts.to_a
-              if filter.respond_to? :route_conditions
-                add_filters filter.route_conditions, filter
-              end
+              extract_conditions(filter)
             else
               raise "Unknown filter: #{ filter.class }: #{ filter.inspect }"
             end
           end
         end
 
+        def extract_conditions(filter)
+          if filter.respond_to? :route_conditions
+            add_filters filter.route_conditions, filter
+          end
+        end
+
         def add_filters(filters, extension)
           if filters.is_a? Array
             filters.each do |filter|

data/lib/pacer/loader.rb

@@ -102,7 +102,7 @@ require 'pacer/transform/payload'
 require 'pacer/transform/lookup_ids'
 
 require 'pacer/side_effect/aggregate'
-require 'pacer/side_effect/as'
+require 'pacer/side_effect/as_var'
 require 'pacer/side_effect/group_count'
 require 'pacer/side_effect/is_unique'
 require 'pacer/side_effect/counted'

data/lib/pacer/pipe/simple_visitor_pipe.rb

@@ -3,7 +3,7 @@ module Pacer
     class SimpleVisitorPipe < Pacer::Pipes::RubyPipe
       attr_reader :visitor, :in_section, :wrapper, :graph
 
-      attr_accessor :use_on_element, :use_after_element, :use_reset
+      attr_accessor :use_on_raw_element, :use_on_element, :use_after_element, :use_visitor_reset
 
       def initialize(wrapper, graph)
         super()
@@ -14,15 +14,17 @@ module Pacer
 
       def visitor=(visitor)
         @visitor = visitor
+        @use_on_raw_element  = visitor.respond_to? :on_raw_element
         @use_on_element      = visitor.respond_to? :on_element
         @use_after_element   = visitor.respond_to? :after_element
-        @use_reset           = visitor.respond_to? :reset
+        @use_visitor_reset   = visitor.respond_to? :visitor_reset
       end
 
       def processNextStart
         visitor.after_element if use_after_element and in_section
         current = starts.next
         @in_section = true unless in_section
+        visitor.on_raw_element current if use_on_raw_element
         if use_on_element
           wrapped = wrapper.new graph, current
           visitor.on_element(wrapped)
@@ -34,7 +36,7 @@ module Pacer
       end
 
       def reset
-        visitor.reset if use_reset
+        visitor.visitor_reset if use_visitor_reset
         @in_section = false
         super
       end

data/lib/pacer/side_effect/{as.rb → as_var.rb}

@@ -3,14 +3,16 @@ module Pacer
     # Store the current intermediate element in the route's vars hash by the
     # given name so that it is accessible subsequently in the processing of the
     # route.
-    def as(name)
-      as = ::Pacer::SideEffect::As
+    #
+    # Deprecated.
+    def as_var(name)
+      as = ::Pacer::SideEffect::AsVar
       section(name, as::SingleElementSet).chain_route :side_effect => as, :variable_name => name
     end
   end
 
   module SideEffect
-    module As
+    module AsVar
       class AsPipe < Pacer::Pipes::RubyPipe
         attr_accessor :vars
 

data/lib/pacer/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
 
     JAR = "pacer-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"

data/lib/pacer/visitors/section.rb

@@ -4,6 +4,11 @@ module Pacer
       def section(section_name = nil, visitor_target = nil)
         chain_route visitor: :section, section_name: section_name, visitor_target: visitor_target
       end
+
+      # see #as_var for the old as implementation
+      def as(section_name = nil)
+        section section_name
+      end
     end
   end
 

data/lib/pacer/wrappers/element_wrapper.rb

@@ -47,6 +47,18 @@ module Pacer::Wrappers
         @route_conditions
       end
 
+      def lookup
+        return @lookup if defined? @lookup
+        @lookup = extensions.inject({}) do |h, ext|
+          if ext.respond_to? :lookup
+            h.merge! ext.lookup
+          else
+            h
+          end
+        end
+        @lookup
+      end
+
       protected
 
       def build_extension_wrapper(exts, mod_names, superclass)

data/pom.xml

@@ -8,7 +8,7 @@
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
       <blueprints.version>2.3.0</blueprints.version>
-      <gem.version>1.3.4</gem.version>
+      <gem.version>1.3.5</gem.version>
       <pipes.version>2.3.0</pipes.version>
       <gremlin.version>2.3.0</gremlin.version>
     </properties>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -112,7 +112,7 @@ files:
 - lib/pacer/route/mixin/route_operations.rb
 - lib/pacer/route_builder.rb
 - lib/pacer/side_effect/aggregate.rb
-- lib/pacer/side_effect/as.rb
+- lib/pacer/side_effect/as_var.rb
 - lib/pacer/side_effect/counted.rb
 - lib/pacer/side_effect/group_count.rb
 - lib/pacer/side_effect/is_unique.rb
@@ -220,7 +220,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.3.4-standalone.jar
+- lib/pacer-1.3.5-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT