neo4j-core 2.2.2-java → 2.2.3-java

data/Gemfile

@@ -2,8 +2,8 @@ source :gemcutter
 
 gemspec
 
-gem 'neo4j-advanced',  '>= 1.8.M05', '< 1.9', :require => false
-gem 'neo4j-enterprise', '>= 1.8.M05', '< 1.9', :require => false
+gem 'neo4j-advanced',  '>= 1.8.1', '< 2.0', :require => false
+gem 'neo4j-enterprise', '>= 1.8.1', '< 2.0', :require => false
 
 group 'development' do
   gem 'pry'

data/config/neo4j/config.yml

@@ -32,71 +32,65 @@ migration_thread: false
 # Notice it must be either 'true' or 'false' as string
 enable_online_backup: 'false'
 
-#use the clustered Neo4j GraphDatabase (org.neo4j.kernel.HighlyAvailableGraphDatabase)
-ha.db: false
-
-# Example of HA Configuration, see http://wiki.neo4j.org/content/High_Availability_Cluster
-# This is only used when ha.db is set to true
-ha.server_id: 2
-ha.server: 'localhost:6002'
-ha.coordinators: 'localhost:2181,localhost:2182,localhost:2183'
+#use the clustered Neo4j GraphDatabase (org.neo4j.kernel.ha.HighlyAvailableGraphDatabase)
+#enable_ha: true
 
 # if enabled you can use the bin/neo4j-shell command to access the database
-enable_remote_shell: "port=9332"
-
-#===Memory mapped I/O settings===
-
-#Each file in the Neo store can use memory mapped I/O for reading/writing.
-#Best performance is achived if the full file can be memory mapped but if
-#there isn't enough memory for that Neo will try and make the best use of
-#the memory it gets (regions of the file that get accessed often will more
-#likley be memory mapped).
-
-#For high traversal speed it is important to have the nodestore.db and
-#relationshipstore.db files.
-
-neostore.nodestore.db.mapped_memory: 25M
-neostore.relationshipstore.db.mapped_memory: 50M
-neostore.propertystore.db.mapped_memory: 90M
-neostore.propertystore.db.index.mapped_memory: 1M
-neostore.propertystore.db.index.keys.mapped_memory: 1M
-neostore.propertystore.db.strings.mapped_memory: 130M
-neostore.propertystore.db.arrays.mapped_memory: 130M
-
-
-#: ": ": "Cache settings: ": ": "
-
-#use adaptive caches YES|NO. Let Neo try make best use of available heap.
-use_adaptive_cache: YES
-
-#heap usage/max heap size ratio. Neo will increase caches while ratio
-#is less and decrease if greater. Default 0.77 seems to be a good over
-#all ratio of heap usage to avoid GC trashing. Larger heaps may allow for
-#a higher ratio while tiny heaps may need even less.
-adaptive_cache_heap_ratio: 0.77
-
-#how aggressive Neo will decrease caches once heap ratio reached
-adaptive_cache_manager_decrease_ratio: 1.15
-
-#how aggresive Neo will increase caches if ratio isn't yet reached
-adaptive_cache_manager_increase_ratio: 1.1
-
-#if no requests are made to Neo this is the amount of time in ms Neo will wait
-#before it checks the heap usage and adapts the caches if needed
-adaptive_cache_worker_sleep_time: 3000
-
-#minimum size (number of nodes) of node cache. If adaptive cache is in use
-#node cache will not be decreased under this value
-min_node_cache_size: 0
-
-#minimum size (number of relationships) of relationship cache. If adaptive
-#cache is in use relationship cache will not be decreased under this value
-min_relationship_cache_size: 0
-
-#maximum size (number of nodes) of node cache. If adaptive cache is not in
-#use the node cache will not be increased above this value
-max_node_cache_size: 1500
-
-#maximum size (number of relationship) of node cache. If adaptive cache is
-#not in use the relationship cache will not be increased above this value
-max_relationship_cache_size: 3500
+# enable_remote_shell: "port=9332"
+
+##===Memory mapped I/O settings===
+#
+##Each file in the Neo store can use memory mapped I/O for reading/writing.
+##Best performance is achived if the full file can be memory mapped but if
+##there isn't enough memory for that Neo will try and make the best use of
+##the memory it gets (regions of the file that get accessed often will more
+##likley be memory mapped).
+#
+##For high traversal speed it is important to have the nodestore.db and
+##relationshipstore.db files.
+#
+#neostore.nodestore.db.mapped_memory: 25M
+#neostore.relationshipstore.db.mapped_memory: 50M
+#neostore.propertystore.db.mapped_memory: 90M
+#neostore.propertystore.db.index.mapped_memory: 1M
+#neostore.propertystore.db.index.keys.mapped_memory: 1M
+#neostore.propertystore.db.strings.mapped_memory: 130M
+#neostore.propertystore.db.arrays.mapped_memory: 130M
+#
+#
+##: ": ": "Cache settings: ": ": "
+#
+##use adaptive caches YES|NO. Let Neo try make best use of available heap.
+#use_adaptive_cache: YES
+#
+##heap usage/max heap size ratio. Neo will increase caches while ratio
+##is less and decrease if greater. Default 0.77 seems to be a good over
+##all ratio of heap usage to avoid GC trashing. Larger heaps may allow for
+##a higher ratio while tiny heaps may need even less.
+#adaptive_cache_heap_ratio: 0.77
+#
+##how aggressive Neo will decrease caches once heap ratio reached
+#adaptive_cache_manager_decrease_ratio: 1.15
+#
+##how aggresive Neo will increase caches if ratio isn't yet reached
+#adaptive_cache_manager_increase_ratio: 1.1
+#
+##if no requests are made to Neo this is the amount of time in ms Neo will wait
+##before it checks the heap usage and adapts the caches if needed
+#adaptive_cache_worker_sleep_time: 3000
+#
+##minimum size (number of nodes) of node cache. If adaptive cache is in use
+##node cache will not be decreased under this value
+#min_node_cache_size: 0
+#
+##minimum size (number of relationships) of relationship cache. If adaptive
+##cache is in use relationship cache will not be decreased under this value
+#min_relationship_cache_size: 0
+#
+##maximum size (number of nodes) of node cache. If adaptive cache is not in
+##use the node cache will not be increased above this value
+#max_node_cache_size: 1500
+#
+##maximum size (number of relationship) of node cache. If adaptive cache is
+##not in use the relationship cache will not be increased above this value
+#max_relationship_cache_size: 3500

data/lib/neo4j-core/database.rb

@@ -43,7 +43,7 @@ module Neo4j
       end
 
       def self.ha_enabled?
-        Neo4j::Config['ha.db']
+        !!Neo4j::Config[:enable_ha]
       end
 
 
@@ -182,7 +182,11 @@ module Neo4j
         Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.server_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
         # Modify the public base classes for the HA Node and Relationships
         # (instead of private Java::OrgNeo4jKernel::HighlyAvailableGraphDatabase::LookupNode)
-        @graph = Java::OrgNeo4jKernel::HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
+        builder = Java::OrgNeo4jGraphdbFactory::HighlyAvailableGraphDatabaseFactory.new()
+        builder = builder.newHighlyAvailableDatabaseBuilder(@storage_path)
+        builder = builder.setConfig(Neo4j.config.to_java_map)
+        @graph = builder.newGraphDatabase()
+        #@graph = Java::OrgNeo4jKernelHa::HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
         @graph.register_transaction_event_handler(@event_handler)
         @lucene = @graph.index
         @event_handler.neo4j_started(self)

data/lib/neo4j-core/index/unique_factory.rb

@@ -22,12 +22,16 @@ module Neo4j
         end
 
         # Get the indexed entity, creating it (exactly once) if no indexed entity exists.
-        # There must be an index on the key
+        # There must be an index on the key.
+        # Must *not* be called inside a transaction.
         # @param [Symbol] key the key to find the entity under in the index.
         # @param [String, Fixnum, Float] value  the value the key is mapped to for the entity in the index.
         # @param [Hash] props optional properties that the entity will have if created
         # @yield optional, make it possible to initialize the created node in a block
+        # @raise an exception if a transaction is running
         def get_or_create(key, value, props=nil, &init_block)
+          raise "Transaction already running, can't use get_or_create" if Neo4j.db.graph.respond_to?(:transactionRunning) && Neo4j.db.graph.transactionRunning
+
           tx = Neo4j::Transaction.new
           result = @index.get(key.to_s, value).get_single
           return result if result
@@ -44,7 +48,7 @@ module Neo4j
           tx.success
           result
         ensure
-          tx.finish
+          tx && tx.finish
         end
 
       end

data/lib/neo4j-core/traversal/evaluator.rb

@@ -15,7 +15,7 @@ module Neo4j
         #  evaluate(Path path,  BranchState<STATE> state)
         #  Evaluates a Path and returns an Evaluation containing information about whether or not to include it in the traversal result, i.e return it from the Traverser.
         def evaluate(path, state)
-          ret = @eval_block.call(path, state)
+          ret = @eval_block.call(path)
           case ret
             when :exclude_and_continue then
               Java::OrgNeo4jGraphdbTraversal::Evaluation::EXCLUDE_AND_CONTINUE

data/lib/neo4j-core/traversal/filter_predicate.rb

@@ -21,7 +21,7 @@ module Neo4j
           end
           # find the first filter which returns false
           # if not found then we will accept this path
-          if @procs.find { |p| !p.call(path, state) }.nil?
+          if @procs.find { |p| !p.call(path) }.nil?
             Java::OrgNeo4jGraphdbTraversal::Evaluation::INCLUDE_AND_CONTINUE
           else
             Java::OrgNeo4jGraphdbTraversal::Evaluation::EXCLUDE_AND_CONTINUE

data/lib/neo4j-core/traversal/prune_evaluator.rb

@@ -14,7 +14,7 @@ module Neo4j
         # for the state parameter see - http://api.neo4j.org/1.8.1/org/neo4j/graphdb/traversal/BranchState.html
         def evaluate(path, state)
           return Java::OrgNeo4jGraphdbTraversal::Evaluation::EXCLUDE_AND_CONTINUE if path.length == 0
-          if @proc.call(path, state)
+          if @proc.call(path)
             Java::OrgNeo4jGraphdbTraversal::Evaluation::INCLUDE_AND_PRUNE
           else
             Java::OrgNeo4jGraphdbTraversal::Evaluation::INCLUDE_AND_CONTINUE

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "2.2.2"
+    VERSION = "2.2.3"
   end
 end

data/lib/neo4j/config.rb

@@ -11,6 +11,7 @@ module Neo4j
   # == Configurations keys
   #
   #   storage_path   where the database is stored
+  #   enable_ha      if ha cluster should be enabled (requires neo4j-enterprise gem)
   #   timestamps     if timestamps should be used when saving the model (Neo4j::Rails::Model)
   #   lucene         lucene configuration for fulltext and exact indices
   #   enable_rules   if false the _all relationship to all instances will not be created and custom rules will not be available. (Neo4j::NodeMixin and Neo4j::Rails::Model)

data/lib/neo4j/neo4j.rb

@@ -239,7 +239,7 @@ module Neo4j
     # Only available using the neo4j-enterprise gem.
     # @return [Boolean] true if the Neo4j database is the HA master
     def ha_master?
-      Neo4j.management(Java::OrgNeo4jManagement::HighAvailability).isMaster
+      db.graph && db.graph.isMaster()
     end
 
     # @return [Enumerable] all nodes in the database

data/neo4j-core.gemspec

@@ -27,6 +27,6 @@ It comes included with the Apache Lucene document database.
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Neo4j::Core", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
-  s.add_dependency("neo4j-community", '>= 1.8.M05', '< 1.9')
+  s.add_dependency("neo4j-community", '>= 1.8.1', '< 1.9')
   s.add_dependency("neo4j-cypher", '~> 1.0.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease:
 platform: java
 authors:
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.M05
+        version: 1.8.1
     - - !binary |-
         PA==
       - !ruby/object:Gem::Version
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.M05
+        version: 1.8.1
     - - !binary |-
         PA==
       - !ruby/object:Gem::Version