pacer-neo4j2 2.1.7-java → 2.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463b795cdce64d8fa56bc6f923d2b263fed3c3a2
-  data.tar.gz: 04a74ceeedb0e38febf1d318b09f9aa918911565
+  metadata.gz: 22883bee14e477a41b513053efb2cbb7790be9e7
+  data.tar.gz: 3ed4d43d44acf83e7d47fe1d504efb309118b8fa
 SHA512:
-  metadata.gz: 75ee63640fcf0ba0a232891f7b817ab8a1960bbde40a9ce31c065b94c99c5f4040da97fda1d40b4e3a52b8fb456fbcad02c3159d331c168c899b0dea43b925cd
-  data.tar.gz: 8a25d2b6e989a7d308dc3430f6d44b306bb744ce4cd86eecc4a9f148abb257834f8c07ccb60b3402b46190599cb4875283b6d2e5508a85acf1ca95cf5aedf2b7
+  metadata.gz: 6fedbb5766bb7650c1e5f2e6723cad33e1e40f420c106b2a5a9a5f77c6334eab9e629059336940fd3f785857bc6715a6dd4959c41d80947042d9031c82d3f7c0
+  data.tar.gz: 0bd752ccec90e8a8510189ce4c3f6c47037ae6e296c99de6407da9fbf686125d56f60d28d12921b2b2682dd6a6491696c30e7498bbdf05b585535539cba2f9a9

data/Jarfile

@@ -1,2 +1,3 @@
-jar "com.tinkerpop.blueprints:blueprints-neo4j2-graph:2.6.0"
-jar "org.neo4j:neo4j:2.1.6"
+repository "https://jcenter.bintray.com"
+jar "com.xnlogic.blueprints:xn-blueprints-neo4j2-graph:2.6.1"
+jar "org.neo4j:neo4j:2.2.1"

data/lib/pacer-neo4j2.rb

@@ -1,4 +1,4 @@
-require 'pacer' unless defined? Pacer
+require 'pacer'
 
 lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 $:.unshift lib_path unless $:.any? { |path| path == lib_path }
@@ -42,27 +42,29 @@ module Pacer
     # `graph.setCheckElementsInTransaction(false)` to disable the
     # feature.
     #
-    # It is recommended that *in production* the `allow_auto_tx` and
-    # `allow_auto_read_tx` options be set to `false` to prevent hard-to-debug
-    # errors caused by Blueprints' automatically starting transactions which it
-    # never automatically commits or rolls back. When working in the console,
-    # however, reenabling automatic read transactons is generally recommended,
-    # together with periodic use of `rollback_implicit_transaction`
-    def neo4j2(path_or_graph, args = nil)
+    # It is recommended that *in production* the `allow_auto_tx` option be set
+    # to `false` to prevent hard-to-debug errors caused by Blueprints'
+    # automatically starting transactions which it never automatically commits
+    # or rolls back. You can also set `allow_auto_read_tx` in the same way.
+    # When working in the console, enabling automatic read transactons is
+    # generally recommended, together with periodic use of
+    # `rollback_implicit_transaction`
+    #
+    def neo4j2(path_or_graph, args = nil, graph_class = Pacer::Neo4j2::BlueprintsGraph)
       if path_or_graph.is_a? String
         path = File.expand_path(path_or_graph)
         open = proc do
           raw_graph = Pacer.open_graphs[path]
           if raw_graph
-            graph = Pacer::Neo4j2::BlueprintsGraph.new(raw_graph)
+            graph = graph_class.new(raw_graph)
           else
             if args
-              graph = Pacer::Neo4j2::BlueprintsGraph.new(path, args.to_hash_map)
+              graph = graph_class.new(path, args.to_hash_map)
             else
-              graph = Pacer::Neo4j2::BlueprintsGraph.new(path)
+              graph = graph_class.new(path)
             end
             graph.allow_auto_tx = false
-            graph.allow_auto_read_tx = false
+            graph.allow_auto_read_tx = true
             Pacer.open_graphs[path] = graph.raw_graph
             graph.setCheckElementsInTransaction true
           end
@@ -75,7 +77,7 @@ module Pacer
         Neo4j2::Graph.new(Pacer::YamlEncoder, open, shutdown)
       else
         # Don't register the new graph so that it won't be automatically closed.
-        Neo4j2::Graph.new Pacer::YamlEncoder, proc { Pacer::Neo4j2::BlueprintsGraph.new(path_or_graph) }
+        Neo4j2::Graph.new Pacer::YamlEncoder, proc { graph_class.new(path_or_graph) }
       end
     end
 

data/lib/pacer-neo4j2/blueprints_graph.rb

@@ -1,6 +1,9 @@
 module Pacer
   module Neo4j2
-    class BlueprintsGraph < com.tinkerpop.blueprints.impls.neo4j2.Neo4j2Graph
+    import com.tinkerpop.blueprints.impls.neo4j2.Neo4j2Graph
+    import com.tinkerpop.blueprints.impls.neo4j2.Neo4j2HaGraph
+
+    module TxDepth
       attr_accessor :allow_auto_tx, :allow_auto_read_tx
 
       # Threadlocal tx_depth is set in Pacer's graph_transaction_mixin.rb
@@ -21,6 +24,32 @@ module Pacer
           depth
         end
       end
+    end
+
+
+    class BlueprintsGraph < Neo4j2Graph
+      include TxDepth
+
+      def autoStartTransaction(for_write)
+        if for_write
+          if allow_auto_tx or tx_depth != 0
+            super
+          else
+            raise Pacer::TransactionError, "Can't mutate the graph outside a transaction block"
+          end
+        else
+          if allow_auto_read_tx or read_tx_depth != 0
+            super
+          else
+            raise Pacer::TransactionError, "Can't read the graph outside a transaction or read_transaction block"
+          end
+        end
+      end
+    end
+
+
+    class BlueprintsHaGraph < Neo4j2HaGraph
+      include TxDepth
 
       def autoStartTransaction(for_write)
         if for_write

data/lib/pacer-neo4j2/lucene_filter.rb

@@ -11,17 +11,19 @@ module Pacer
       private
 
       def choose_index(opts)
-        et = opts[:element_type]
-        idx = opts[:index]
-        case idx
-        when String, Symbol
-          index(idx, et).index.raw_index
-        when Pacer::Wrappers::IndexWrapper
-          idx.index.raw_index
-        when com.tinkerpop.blueprints.Index
-          idx.raw_index
-        else
-          lucene_auto_index(et)
+        read_transaction do
+          et = opts[:element_type]
+          idx = opts[:index]
+          case idx
+          when String, Symbol
+            index(idx, et).index.raw_index
+          when Pacer::Wrappers::IndexWrapper
+            idx.index.raw_index
+          when com.tinkerpop.blueprints.Index
+            idx.raw_index
+          else
+            lucene_auto_index(et)
+          end
         end
       end
     end
@@ -94,7 +96,9 @@ module Pacer
       end
 
       def query_result
-        index.query build_query
+        graph.read_transaction do
+          index.query build_query
+        end
       end
 
       def source_iterator
@@ -105,7 +109,9 @@ module Pacer
       end
 
       def inspect_string
-        "#{ inspect_class_name }(#{ query }) ~ #{ query_result.count }"
+        graph.read_transaction do
+          "#{ inspect_class_name }(#{ query }) ~ #{ query_result.count }"
+        end
       end
     end
   end

data/lib/pacer-neo4j2/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   module Neo4j2
-    VERSION = "2.1.7"
+    VERSION = "2.2.1"
     PACER_REQ = ">= 2.0.6"
   end
 end

data/pacer-neo4j2.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.add_dependency 'pacer', Pacer::Neo4j2::PACER_REQ
-  s.add_dependency "lock_jar", "~> 0.10.2"
 
   s.add_development_dependency 'xn_gem_release_tasks'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-neo4j2
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.2.1
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -24,20 +24,6 @@ dependencies:
         version: 2.0.6
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: lock_jar
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: xn_gem_release_tasks
   version_requirements: !ruby/object:Gem::Requirement
@@ -102,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pacer-neo4j2
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Neo4J jars and related code for Pacer