pacer 1.4.2-java → 1.5.1-java

data/lib/pacer/graph/graph_ml.rb

@@ -17,8 +17,10 @@ module Pacer
       rescue java.net.MalformedURLException
         stream = java.io.FileInputStream.new path
       end
-      graph.send :creating_elements do
-        com.tinkerpop.blueprints.util.io.graphml.GraphMLReader.input_graph graph.blueprints_graph, stream
+      graph.transaction(nesting: true) do
+        graph.send :creating_elements do
+          com.tinkerpop.blueprints.util.io.graphml.GraphMLReader.input_graph graph.blueprints_graph, stream
+        end
       end
       true
     ensure

data/lib/pacer/graph/graph_transactions_mixin.rb

@@ -6,6 +6,10 @@ module Pacer
       threadlocal_graph_info.fetch(:tx_depth, 0) > 0
     end
 
+    def in_read_transaction?
+      threadlocal_graph_info.fetch(:read_tx_depth, 0) > 0
+    end
+
     # Basic usage:
     #
     # graph.transaction do |commit, rollback|
@@ -47,6 +51,24 @@ module Pacer
       end
     end
 
+    def read_transaction
+      tgi = threadlocal_graph_info
+      read_tx_depth = tgi[:read_tx_depth] ||= 0
+      tgi[:read_tx_depth] += 1
+      # Blueprints auto-starts the transaction
+      yield
+    ensure
+      rtd = tgi[:read_tx_depth] -= 1
+      if rtd == 0 and tgi[:tx_depth] == 0 and blueprints_graph.is_a? TransactionalGraph
+        # rollback after the bottom read transaction (no changes outside a real transaction block should have been possible)
+        blueprints_graph.stopTransaction TransactionalGraph::Conclusion::FAILURE
+      end
+    end
+
+    def reopen_read_transaction
+      # override this implementation-specific hook if needed (see pacer-neo4j)
+    end
+
     # Set this to true if you don't want to use transactions.
     #
     # By default, transactions are enabled.
@@ -71,6 +93,8 @@ module Pacer
         commit_implicit_transaction
       when :rollback
         rollback_implicit_transaction
+      else
+        fail Pacer::ClientError, "invalid value for #implicit_transaction: #{ implicit_transaction.inspect }"
       end
     end
 
@@ -135,11 +159,13 @@ module Pacer
         end
         puts "transaction committed" if Pacer.verbose == :very
         blueprints_graph.stopTransaction TransactionalGraph::Conclusion::SUCCESS
+        reopen_read_transaction
         on_commit_block.call if on_commit_block
       end
       rollback = ->(message = nil) do
         puts ["transaction rolled back", message].compact.join(': ') if Pacer.verbose == :very
         blueprints_graph.stopTransaction TransactionalGraph::Conclusion::FAILURE
+        reopen_read_transaction
       end
       [commit, rollback]
     end

data/lib/pacer/graph/pacer_graph.rb

@@ -204,7 +204,7 @@ module Pacer
     end
 
     def features
-      blueprints_graph.features
+      blueprints_graph.getFeatures
     end
 
     def inspect

data/lib/pacer/loader.rb

@@ -53,7 +53,6 @@ require 'pacer/blueprints/group_vertex'
 
 require 'pacer/blueprints/payload_elements'
 
-require 'pacer/support/array'
 require 'pacer/support/array_list'
 require 'pacer/support/enumerable'
 require 'pacer/support/proc'
@@ -79,7 +78,9 @@ require 'pacer/filter/block_filter'
 require 'pacer/filter/object_filter'
 require 'pacer/filter/random_filter'
 require 'pacer/filter/limit_section_filter'
+require 'pacer/filter/uniq_section'
 
+require 'pacer/transform/identity'
 require 'pacer/transform/branch'
 require 'pacer/transform/cap'
 require 'pacer/transform/stream_sort'

data/lib/pacer/pipe/collection_filter_pipe.rb

@@ -4,6 +4,8 @@ module Pacer
       AbstractCollectionFilterPipe = com.tinkerpop.pipes.filter.CollectionFilterPipe
     end
 
+    # This seemingly-useless class only exists because the class in Pipes
+    # is marked abstract despite being complete.
     class CollectionFilterPipe < Renamed::AbstractCollectionFilterPipe
     end
   end

data/lib/pacer/pipe/id_collection_filter_pipe.rb

@@ -1,13 +1,23 @@
 module Pacer::Pipes
   class IdCollectionFilterPipe < RubyPipe
+    import com.tinkerpop.blueprints.Contains
+    attr_reader :contains_in
+
     def initialize(ids, comparison)
       super()
       @ids = Set[*ids]
-      @comparison = comparison
+      if comparison == Contains::IN
+        @contains_in = true
+      elsif
+        comparison == Contains::NOT_IN
+        @contains_in = false
+      else
+        fail InternalError, "Unknown comparison type for ID collection filter"
+      end
     end
 
     def processNextStart
-      if @comparison == Pacer::Pipes::EQUAL
+      if contains_in
         while true
           element = @starts.next
           if element and @ids.include? element.getId

data/lib/pacer/pipe/loop_pipe.rb

@@ -1,6 +1,7 @@
 module Pacer::Pipes
   class LoopPipe < RubyPipe
     import java.util.ArrayList
+    BlueprintsGraph = com.tinkerpop.blueprints.Graph
 
     def initialize(graph, looping_pipe, control_block)
       super()
@@ -42,7 +43,6 @@ module Pacer::Pipes
 
     def processNextStart
       while true
-        # FIXME: hasNext shouldn't be raising an exception...
         has_next = looping_pipe.hasNext
         if has_next
           element = looping_pipe.next

data/lib/pacer/pipe/property_comparison_pipe.rb

@@ -15,17 +15,17 @@ module Pacer::Pipes
         l = obj.getProperty(@left)
         r = obj.getProperty(@right)
         case @filter
-        when FilterPipe::Filter::EQUAL
+        when Compare::EQUAL
           return obj if l == r
-        when FilterPipe::Filter::NOT_EQUAL
+        when Compare::NOT_EQUAL
           return obj if l != r
-        when FilterPipe::Filter::GREATER_THAN
+        when Compare::GREATER_THAN
           return obj if l and r and l > r
-        when FilterPipe::Filter::LESS_THAN
+        when Compare::LESS_THAN
           return obj if l and r and l < r
-        when FilterPipe::Filter::GREATER_THAN_EQUAL
+        when Compare::GREATER_THAN_EQUAL
           return obj if l and r and l >= r
-        when FilterPipe::Filter::LESS_THAN_EQUAL
+        when Compare::LESS_THAN_EQUAL
           return obj if l and r and l <= r
         end
       end

data/lib/pacer/pipes.rb

@@ -11,15 +11,16 @@ module Pacer
     import com.tinkerpop.pipes.filter.RangeFilterPipe
     import com.tinkerpop.pipes.filter.FilterPipe
 
-    import com.tinkerpop.gremlin.pipes.transform.IdPipe
-    import com.tinkerpop.gremlin.pipes.transform.PropertyPipe
+    import com.tinkerpop.pipes.transform.IdPipe
+    import com.tinkerpop.pipes.transform.PropertyPipe
 
     IN = com.tinkerpop.blueprints.Direction::IN
     OUT = com.tinkerpop.blueprints.Direction::OUT
     BOTH = com.tinkerpop.blueprints.Direction::BOTH
 
-    EQUAL = FilterPipe::Filter::EQUAL
-    NOT_EQUAL = FilterPipe::Filter::NOT_EQUAL
+    import com.tinkerpop.blueprints.Compare
+    EQUAL = Compare::EQUAL
+    NOT_EQUAL = Compare::NOT_EQUAL
     #GREATER_THAN, LESS_THAN, GREATER_THAN_EQUAL, LESS_THAN_EQUAL
   end
 

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

@@ -19,33 +19,34 @@ module Pacer::Routes
     # +size+ records.
     def bulk_job(size = nil, target_graph = nil, pre_commit = nil)
       target_graph ||= graph
-      if target_graph and not target_graph.in_bulk_job?
-        begin
-          target_graph.in_bulk_job = true
-          size ||= target_graph.bulk_job_size
-          counter = 0
-          target_graph.transaction(nesting: true) do |commit, rollback|
+      graph.read_transaction do
+        if target_graph and not target_graph.in_bulk_job?
+          begin
+            target_graph.in_bulk_job = true
+            size ||= target_graph.bulk_job_size
+            counter = 0
             print "Bulk job ->" if Pacer.verbose?
             each_slice(size) do |slice|
-              print " #{counter}" if Pacer.verbose?
-              counter += size
-              slice.each do |element|
-                yield element
+              target_graph.transaction(nesting: true) do
+                print " #{counter}" if Pacer.verbose?
+                counter += size
+                slice.each do |element|
+                  yield element
+                end
+                pre_commit.call if pre_commit
               end
-              pre_commit.call if pre_commit
-              commit.call
             end
+          ensure
+            puts '!' if Pacer.verbose?
+            target_graph.in_bulk_job = false
           end
-        ensure
-          puts '!' if Pacer.verbose?
-          target_graph.in_bulk_job = false
-        end
-      elsif target_graph
-        each do |element|
-          yield element
+        elsif target_graph
+          each do |element|
+            yield element
+          end
+        else
+          raise 'No graph in route for bulk job'
         end
-      else
-        raise 'No graph in route for bulk job'
       end
     end
   end

data/lib/pacer/support/enumerable.rb

@@ -47,10 +47,6 @@ module Enumerable
     Pacer::Pipes::EnumerablePipe.new self
   end
 
-  def +(other)
-    Pacer::Pipes::MultiPipe.new [self, other]
-  end
-
   # NOTE: if this is a collection of wrapped vertices or edges, Java pipes
   # may crash with something like:
   #

data/lib/pacer/transform/identity.rb

@@ -0,0 +1,10 @@
+module Pacer
+  module Routes
+    module RouteOperations
+      def identity
+        chain_route route_name: 'identity', pipe_class: com.tinkerpop.pipes.IdentityPipe
+      end
+    end
+  end
+end
+

data/lib/pacer/transform/lookup_ids.rb

@@ -16,8 +16,8 @@ module Pacer
 
   module Transform
     module LookupIds
-      import com.tinkerpop.gremlin.pipes.transform.IdVertexPipe
-      import com.tinkerpop.gremlin.pipes.transform.IdEdgePipe
+      import com.tinkerpop.pipes.transform.IdVertexPipe
+      import com.tinkerpop.pipes.transform.IdEdgePipe
 
       def attach_pipe(end_pipe)
         fail ClientError, 'Can not look up elements without the graph' unless graph

data/lib/pacer/version.rb

@@ -1,14 +1,13 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "1.4.2"
+    VERSION = "1.5.1"
 
     JAR = "pacer-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
 
     START_TIME = Time.now
 
-    BLUEPRINTS_VERSION = "2.3.0"
-    PIPES_VERSION = "2.3.0"
-    GREMLIN_VERSION = "2.3.0"
+    BLUEPRINTS_VERSION = "2.6.0-SNAPSHOT"
+    PIPES_VERSION = "2.5.0"
   end
 end

data/lib/pacer/wrappers/edge_wrapper.rb

@@ -87,7 +87,9 @@ module Pacer::Wrappers
     # standard ruby console representation of an instantiated object.
     # @return [String]
     def inspect
-      "#<E[#{element_id}]:#{display_name}>"
+      graph.read_transaction do
+        "#<E[#{element_id}]:#{display_name}>"
+      end
     end
 
     # Returns the display name of the edge.

data/lib/pacer/wrappers/element_wrapper.rb

@@ -122,15 +122,17 @@ module Pacer::Wrappers
     # @param [#to_s] key the property name
     # @param [Object] value the value to set the property to
     def []=(key, value)
-      value = graph.encode_property(value)
+      begin
+        value = graph.encode_property(value)
+      rescue Exception => e
+        throw Pacer::ClientError.new "Unable to serialize #{ key }: #{ value.class }"
+      end
       key = key.to_s
       if value
         element.setProperty(key, value)
       else
         element.removeProperty(key)
       end
-    rescue Exception => e
-      throw Pacer::ClientError.new "Unable to serialize #{ key }: #{ value.class }"
     end
 
     # Specialize result to return self for elements.

data/lib/pacer/wrappers/vertex_wrapper.rb

@@ -75,7 +75,11 @@ module Pacer::Wrappers
     # @yield [v] Optional block yields the vertex with the extensions added.
     # @return nil or the result of the block or the extended vertex
     def as(*exts)
-      if as?(*exts)
+      if exts.length == 1 and not exts.first.is_a?(Module) and not exts.first.is_a?(Class) and exts.first
+        # NB: oops, I defined route#as to be the same as route#section. If the signature is
+        #     matching the section method, then defer to it.
+        section *exts
+      elsif as?(*exts)
         exts_to_add = extensions_missing(exts)
         extended = exts_to_add.empty? ? self : add_extensions(exts_to_add)
         if block_given?
@@ -113,7 +117,9 @@ module Pacer::Wrappers
     # standard ruby console representation of an instantiated object.
     # @return [String]
     def inspect
-      "#<#{ ["V[#{element_id}]", display_name].compact.join(' ') }>"
+      graph.read_transaction do
+        "#<#{ ["V[#{element_id}]", display_name].compact.join(' ') }>"
+      end
     end
 
     # Returns the display name of the vertex.

data/pom.xml

@@ -7,10 +7,9 @@
     <artifactId>pacer</artifactId>
     <!-- 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.4.2</gem.version>
-      <pipes.version>2.3.0</pipes.version>
-      <gremlin.version>2.3.0</gremlin.version>
+      <blueprints.version>2.6.0-SNAPSHOT</blueprints.version>
+      <gem.version>1.5.1</gem.version>
+      <pipes.version>2.5.0</pipes.version>
     </properties>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <version>${gem.version}</version>
@@ -41,34 +40,8 @@
             <artifactId>pipes</artifactId>
             <version>${pipes.version}</version>
         </dependency>
-        <!-- MOAR GRAPH TRAVERSAL SUPPORT -->
-        <dependency>
-            <groupId>com.tinkerpop.gremlin</groupId>
-            <artifactId>gremlin-java</artifactId>
-            <version>${gremlin.version}</version>
-        </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>tinkerpop-repository</id>
-            <name>TinkerPop Maven2 Repository</name>
-            <url>http://tinkerpop.com/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>tinkerpop-repository</id>
-            <name>TinkerPop Maven2 Repository</name>
-            <url>ftp://ftp.tinkerpop.com:21/public/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <build>
         <directory>${basedir}/target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>

data/spec/pacer/blueprints/neo4j2_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module Neo2Spec
+  class Person < Pacer::Wrappers::VertexWrapper
+    def self.route_conditions(graph)
+      { type: 'person' }
+    end
+  end
+
+  class Frog < Pacer::Wrappers::VertexWrapper
+    def self.route_conditions(graph)
+      { frog: 'yes' }
+    end
+  end
+
+  Run.neo4j2 :read_only do
+    use_pacer_graphml_data :read_only
+
+    describe '#vertex' do
+      it 'should not raise an exception for invalid key type' do
+        graph.vertex('bad id').should be_nil
+      end
+    end
+
+    describe '#edge' do
+      it 'should not raise an exception for invalid key type' do
+        graph.edge('bad id').should be_nil
+      end
+    end
+
+    describe 'indexed' do
+      before do
+        # TODO FIXME: why do the presence of these key indices break lots of
+        # subsequent tests if they are on graph rather than graph2?
+        graph2.create_key_index :type, :vertex
+        graph2.create_key_index :name, :vertex
+      end
+
+      describe Person do
+        subject { graph2.v(Person) }
+
+        # sanity checks
+        it { should be_a Pacer::Filter::LuceneFilter }
+        its(:query) { should == 'type:"person"' }
+        # This doesn't work because neo indices are out of sync before the transaction finalizes
+        #its(:count) { should == 2 }
+
+        its(:wrapper) { should == Person }
+      end
+
+      describe Frog do
+        subject { graph2.v(Frog) }
+
+        # sanity checks
+        it { should_not be_a Pacer::Filter::LuceneFilter }
+        its(:count) { should == 0 }
+
+        its(:wrapper) { should == Frog }
+      end
+    end
+  end
+end