pacer-neo4j 2.1.2-java → 2.1.4-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7190dda6385c119ecea1c959a2778eebf00da79c
+  data.tar.gz: 93c2c9f4ebe74afa68cfaa98ed3e00ed5a7ea123
+SHA512:
+  metadata.gz: a0849277cbe979a44d5a8e17ca7c00b0e928042059b1a21a116e2232de98749b3d96727be379b2cf56355ed0d94a26ca5f8328074a4a6dff867169b78a33ed90
+  data.tar.gz: 07db1630318fa5320ec0e241d40f84b83d69f1680134a253d572868eebc01a7a14563973e4f561f8be7f562340ec8bc743b7885634c86f9bcb53c7b1b717c675

data/lib/pacer-neo4j/blueprints_graph.rb

@@ -2,22 +2,16 @@ module Pacer
   module Neo4j
     class BlueprintsGraph < com.tinkerpop.blueprints.impls.neo4j.Neo4jGraph
       attr_accessor :allow_auto_tx
-      attr_reader :tx_depth
 
-      def initialize(*args)
-        super
-        @tx_depth = 0
-      end
-
-      def transaction
-        @tx_depth += 1
-        yield
-      ensure
-        @tx_depth -= 1
+      # Threadlocal tx_depth is set in Pacer's graph_transaction_mixin.rb
+      def tx_depth
+        graphs = Thread.current[:graphs] ||= {}
+        tgi = graphs[object_id] ||= {}
+        tgi[:tx_depth] || 0
       end
 
       def autoStartTransaction
-        if tx_depth != 0 or allow_auto_tx
+        if allow_auto_tx or tx_depth != 0
           super
         else
           raise Pacer::TransactionError, "Can't mutate the graph outside a transaction block"

data/lib/pacer-neo4j/graph.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Pacer
   module Neo4j
     class Graph < PacerGraph
@@ -23,12 +25,6 @@ module Pacer
         blueprints_graph.allow_auto_tx
       end
 
-      def transaction(*args, &block)
-        blueprints_graph.transaction do
-          super
-        end
-      end
-
       def cypher(query)
         [query].to_route(element_type: :string, graph: self).cypher
       end
@@ -42,6 +38,48 @@ module Pacer
         end
       end
 
+      # When a Neo4J graph is restarted, the ids of any elements that were deleted
+      # will be reused. Running this code immediately after starting the graph
+      # prevents Neo4J from reusing those IDs.
+      def prevent_id_reuse!
+        {
+          edges: prevent_edge_id_reuse!,
+          vertices: prevent_vertex_id_reuse!
+        }
+      end
+
+      # This works by simply creating IDs until the ID of a new element is greater than
+      # either the max existing ID, or the min_new_id argument.
+      def prevent_vertex_id_reuse!(min_new_id = nil)
+        min_new_id ||= v.element_ids.max
+        g = blueprints_graph
+        n = 0
+        transaction do |_, rollback|
+          begin
+            n += 1
+            v = g.addVertex(nil)
+          end while v.getId < min_new_id
+          rollback.call
+        end
+        n
+      end
+
+      def prevent_edge_id_reuse!(min_new_id = nil)
+        min_new_id ||= e.element_ids.max
+        g = blueprints_graph
+        n = 0
+        transaction do |_, rollback|
+          v1 = g.addVertex nil
+          v2 = g.addVertex nil
+          begin
+            n += 1
+            e = g.addEdge(nil, v1, v2, "temp")
+          end while e.getId < min_new_id
+          rollback.call
+        end
+        n
+      end
+
       def neo_graph
         blueprints_graph.raw_graph
       end
@@ -86,22 +124,38 @@ module Pacer
         filters.properties.select { |k, v| key_indices(type).include?(k) and not v.nil? }
       end
 
+      def lucene_set(k, v)
+        statements = v.map { |x| "#{k}:#{lucene_value(x)}" }
+        "(#{ statements.join(' OR ') })"
+      end
+
+      def lucene_range(k, v)
+        if v.min and v.max
+          encoded = encode_property(v.min)
+          if encoded.is_a? JDate
+            "#{k}:[#{lucene_value v.min} TO #{lucene_value v.max}]"
+          else
+            "#{k}:[#{lucene_value v.min} TO #{lucene_value v.max}]"
+          end
+        end
+      end
+
       def build_query(type, filters)
         indexed = index_properties type, filters
         if indexed.any?
           indexed.map do |k, v|
             k = k.to_s.gsub '/', '\\/'
             if v.is_a? Range
-              encoded = encode_property(v.min)
-              if encoded.is_a? JDate
-                "#{k}:[#{lucene_value v.min} TO #{lucene_value v.max}]"
-              else
-                "#{k}:{#{lucene_value v.min} TO #{lucene_value v.max}}"
-              end
+              lucene_range(k, v)
+            elsif v.class.name == 'RangeSet'
+              s = v.ranges.map { |r| lucene_range(k, r) }.join " OR "
+              "(#{s})"
+            elsif v.is_a? Set
+              lucene_set(k, v)
             else
               "#{k}:#{lucene_value v}"
             end
-          end.join " AND "
+          end.compact.join " AND "
         else
           nil
         end
@@ -113,7 +167,7 @@ module Pacer
           f = SimpleDateFormat.new 'yyyyMMddHHmmssSSS'
           f.format s
         elsif s
-          if s.is_a? String and s =~ /[\t :"']/
+          if s.is_a? String
             s.inspect
           else s
             s

data/lib/pacer-neo4j/tx_data_wrapper.rb

@@ -93,7 +93,8 @@ module Pacer
           deleted_v: deleted_v_ids,
           created_e: created_e_ids,
           deleted_e: deleted_e_ids,
-          changes: changes }
+          changed_v: changed_v,
+          changed_e: changed_e }
       end
     end
   end

data/lib/pacer-neo4j/version.rb

@@ -1,10 +1,10 @@
 module Pacer
   module Neo4j
-    VERSION = "2.1.2"
+    VERSION = "2.1.4"
     JAR = "pacer-neo4j-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
-    BLUEPRINTS_VERSION = "2.1.0"
-    PIPES_VERSION = "2.1.0"
+    BLUEPRINTS_VERSION = "2.3.0"
+    PIPES_VERSION = "2.3.0"
     PACER_REQ = ">= 1.1.2"
   end
 end

data/pom.xml

@@ -7,9 +7,9 @@
     <artifactId>pacer-neo4j</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
-      <blueprints.version>2.1.0</blueprints.version>
-      <gem.version>2.1.2</gem.version>
-      <pipes.version>2.1.0</pipes.version>
+      <blueprints.version>2.3.0</blueprints.version>
+      <gem.version>2.1.4</gem.version>
+      <pipes.version>2.3.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>
@@ -32,11 +32,13 @@
             <artifactId>blueprints-neo4j-graph</artifactId>
             <version>${blueprints.version}</version>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.tinkerpop.blueprints</groupId>
             <artifactId>blueprints-neo4jbatch-graph</artifactId>
             <version>${blueprints.version}</version>
         </dependency>
+        -->
     </dependencies>
 
     <repositories>

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: pacer-neo4j
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 2.1.2
+  version: 2.1.4
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
-    none: false
   prerelease: false
   type: :runtime
 description: Neo4J jars and related code for Pacer
@@ -59,32 +56,29 @@ files:
 - pacer-neo4j.gemspec
 - pom.xml
 - pom/standalone.xml
-- lib/pacer-neo4j-2.1.2-standalone.jar
+- lib/pacer-neo4j-2.1.4-standalone.jar
 homepage: http://neo4j.org
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: pacer-neo4j
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Neo4J jars and related code for Pacer
 test_files: []
 has_rdoc: