neo4j 2.2.1-java → 2.2.3-java

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 2.2.3 / 2012-12-28
+* Support for HA cluster with neo4j 1.9.X, #228, #99, #223
+* Make sure the Identity map is cleared after an exception, #214
+* Relationship other_node should return wrapped node, #226
+* Automatically convert DateTimes to UTC, (neo4j-wrapper #7)
+* get_or_create should return a wrapped node (neo4j-wrapper #8)
+* Make it work with Neo4j 1.7.1 (neo4j-core, #19)
+
+== 2.2.2 - skipped
+
 == 2.2.1 / 2012-12-18
 * Fix for JRuby 1.7.1 and Equal #225
 * Fix for create nodes and relationship using Cypher (neo4j-core #17)

data/config/neo4j/config.yml

@@ -24,79 +24,75 @@ lucene: { fulltext: { provider: lucene,
                        type: exact}
 }
 
-# If migrations should be run in a new thread
-# If set to true it you can use the database while it is migrating.
-migration_thread: false
-
-# If online backup should be available, if it is the Online JAR file will be loaded,
-# 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'
-
-# 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
+## If online backup should be available, if it is the Online JAR file will be loaded,
+## 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'
+#
+## 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

data/lib/neo4j/rails/ha_console/railtie.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../ha_console', __FILE__)
-
 module Neo4j
 
   module Rails
@@ -9,11 +7,18 @@ module Neo4j
       # Include this in your config/application.rb in order to run a rails console
       # It avoids the Neo4j limitation of only having one process accessing the database by using HA clustering/neo4j-enterprise
       class Railtie < Object::Rails::Railtie
+
         config.before_configuration do
-          Neo4j::Rails::HaConsole.config_machine
-          Neo4j::Rails::HaConsole.start_zookeeper
-          config.neo4j.storage_path = Neo4j::Rails::HaConsole.storage_path
-          puts "HA: #{Neo4j.config['ha.db']}, server_id: #{Neo4j.config['ha.server_id']}, master: #{Neo4j.ha_master?}, storage_path=#{config.neo4j.storage_path}"
+          server_id = ((defined? IRB) || (defined? Pry)) ? 2 : 1
+          config.neo4j['enable_ha'] = true
+          config.neo4j['ha.server_id'] = server_id
+          config.neo4j['ha.server'] = "localhost:600#{server_id}"
+          config.neo4j['ha.pull_interval'] = '500ms'
+          config.neo4j['ha.discovery.enabled'] = false
+          config.neo4j['ha.initial_hosts'] = [1,2,3].map{|id| "localhost:500#{id}"}.join(',')
+          config.neo4j['ha.cluster_server'] = "localhost:500#{server_id}"
+          config.neo4j.storage_path = File.expand_path("db/ha_neo_#{server_id}", Object::Rails.root)
+          puts "Config HA cluster, ha.server_id: #{config.neo4j['ha.server_id']}, db: #{config.neo4j.storage_path}"
         end
       end
     end

data/lib/neo4j/rails/rack_middleware.rb

@@ -32,6 +32,7 @@ module Neo4j
         status, headers, body = @app.call(env)
         [status, headers, Body.new(body, enabled)]
       ensure
+        IdentityMap.clear
         Neo4j::Rails::Model.close_lucene_connections
         Neo4j.threadlocal_ref_node = Neo4j.default_ref_node
       end

data/lib/neo4j/rails/relationship_persistence.rb

@@ -41,11 +41,12 @@ module Neo4j
 
       # @see http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Relationship#other_node-instance_method
       def other_node(node)
-        if persisted?
-          _java_rel._other_node(node._java_entity)
-        else
-          @_start_node == node ? @_end_node : @_start_node
-        end
+        n = if persisted?
+              _java_rel._other_node(node._java_entity)
+            else
+              @_start_node == node ? @_end_node : @_start_node
+            end
+        n && n.wrapper
       end
 
       # Returns the start node which can be unpersisted

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 end

data/neo4j.gemspec

@@ -32,5 +32,5 @@ It comes included with the Apache Lucene document database.
   s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
   s.add_dependency("railties", ">= 3.0.0", "< 3.3")
-  s.add_dependency("neo4j-wrapper", '2.2.1')
+  s.add_dependency("neo4j-wrapper", '2.2.3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -81,13 +81,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
     none: false
   prerelease: false
   type: :runtime
@@ -149,7 +149,6 @@ files:
 - lib/neo4j/rails/column.rb
 - lib/neo4j/rails/compositions.rb
 - lib/neo4j/rails/finders.rb
-- lib/neo4j/rails/ha_console.rb
 - lib/neo4j/rails/has_n.rb
 - lib/neo4j/rails/identity.rb
 - lib/neo4j/rails/model.rb
@@ -167,13 +166,7 @@ files:
 - lib/neo4j/rails/transaction.rb
 - lib/neo4j/rails/tx_methods.rb
 - lib/neo4j/rails/validations.rb
-- lib/neo4j/rails/ha_console/ha_console.rb
 - lib/neo4j/rails/ha_console/railtie.rb
-- lib/neo4j/rails/ha_console/zookeeper/clean.sh
-- lib/neo4j/rails/ha_console/zookeeper/start_zookeeper.sh
-- lib/neo4j/rails/ha_console/zookeeper/zookeeper.rb
-- lib/neo4j/rails/ha_console/zookeeper/conf/server1.cfg
-- lib/neo4j/rails/ha_console/zookeeper/data/zookeeper1/myid
 - lib/neo4j/rails/relationships/node_dsl.rb
 - lib/neo4j/rails/relationships/relationships.rb
 - lib/neo4j/rails/relationships/rels_dsl.rb

data/lib/neo4j/rails/ha_console/ha_console.rb

@@ -1,68 +0,0 @@
-require 'neo4j-enterprise'
-require 'fileutils'
-require 'tmpdir'
-
-module Neo4j
-
-  module Rails
-
-    # Configures Neo4j HA and Zookeeper in order to be used from a rails console
-    # @see Railtie
-    module HaConsole
-      class << self
-        def machine_id
-          (defined? IRB) ? 2 : 1
-        end
-
-        def proj_root
-          Object::Rails.root
-        end
-
-        def storage_path(id = machine_id)
-          File.expand_path("db/ha_neo_#{id}", proj_root)
-        end
-
-        def config_machine(id = machine_id)
-          puts "config_machine #{id}"
-          # override this default config with this machine configuration
-          Neo4j.config['ha.db'] = true
-          Neo4j.config['ha.server_id'] = id
-          Neo4j.config['ha.server'] = "localhost:600#{machine_id}"
-          Neo4j.config['ha.pull_interval'] = "2"
-          Neo4j.config[:storage_path] = storage_path(id)
-
-          copy_config unless File.exist?(config_dir)
-          require "#{config_dir}/zookeeper"
-        end
-
-        def config_dir
-          File.expand_path("neo4j_ha_console/zookeeper", Dir.tmpdir)
-        end
-
-        def copy_config
-          source_dir = File.expand_path("zookeeper", File.dirname(__FILE__))
-          system("mkdir -p #{File.expand_path("..", config_dir)}")
-          system("cp -r #{source_dir} #{config_dir}")
-        end
-
-        def zookeeper_running?
-          Zookeeper.pid_file?
-        end
-
-        def start_zookeeper
-          Zookeeper.start unless zookeeper_running?
-        end
-
-        def shutdown_zookeeper
-          if zookeeper_running?
-            Zookeeper.shutdown
-          else
-            puts "Can't shutdown zookeeper - no PID file found for zookeeper process at #{Zookeeper.pid_file}"
-          end
-        end
-
-      end
-    end
-  end
-end
-

data/lib/neo4j/rails/ha_console/zookeeper/clean.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -rf db
-rm -rf data/zookeeper1/version-2

data/lib/neo4j/rails/ha_console/zookeeper/conf/server1.cfg

@@ -1,11 +0,0 @@
-#server1.cfg
-tickTime=2000
-initLimit=10
-syncLimit=5
- 
-dataDir=data/zookeeper1
-clientPort=2181
- 
-server.1=localhost:2888:3888
-#server.2=localhost:2889:3889
-#server.3=localhost:2890:3890

data/lib/neo4j/rails/ha_console/zookeeper/data/zookeeper1/myid

@@ -1 +0,0 @@
-1

data/lib/neo4j/rails/ha_console/zookeeper/start_zookeeper.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Only follow symlinks if readlink supports it
-if readlink -f "$0" > /dev/null 2>&1
-then
-  ZOOBIN=`readlink -f "$0"`
-else
-  ZOOBIN="$0"
-fi
-
-ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
-
-ZOOBINDIR=`dirname "$ZOOBIN"`
-JARDIR=`cd "${ZOOBINDIR}/lib"; pwd`
-
-CLASSPATH=$JARDIR/log4j-1.2.16.jar:$JARDIR/zookeeper-3.3.2.jar
-java -cp "$CLASSPATH" $ZOOMAIN conf/server1.cfg

data/lib/neo4j/rails/ha_console/zookeeper/zookeeper.rb

@@ -1,62 +0,0 @@
-module Neo4j
-  module Rails
-    module HaConsole
-      module Zookeeper
-        class << self
-          def shutdown
-            return unless pid_file?
-            file = File.open(pid_file, "rb")
-            pid = file.read.to_s.chomp
-            IO.popen("pkill -TERM -P #{pid}")
-            puts "Zookeeper: shutdown #{pid}"
-            system("rm -f #{pid_file}")
-          end
-
-          def clean
-            dir = File.expand_path("data/zookeeper1/version-2", File.dirname(__FILE__))
-            puts "Zookeeper: clean #{dir}"
-            system("rm -rf #{dir}")
-          end
-
-          def pid_file
-            File.expand_path("zookeeper.pid", File.dirname(__FILE__)).to_s
-          end
-
-          def pid_file?
-            x = File.exist?(pid_file)
-            puts "Zookeeper: pid file #{x} at #{pid_file}"
-            x
-          end
-
-          def lib_dir
-            File.expand_path("lib", File.dirname(__FILE__))
-          end
-
-          def copy_jars
-            puts "Zookeeper: Copy JARs"
-            files = $CLASSPATH.find_all{|x| x =~ /\.jar$/}.collect{|y| y.sub('file:', '')}
-            zookeeper = files.find{|f| f =~ /\/zookeeper/}
-            raise "zookeper JAR not found in a GEM, did you forget to include neo4j-enterprise in your Gemfile (development)" unless zookeeper
-
-            log4j = files.find{|f| f =~ /\/log4j/}
-            raise "log4j not found in a GEM, did you forget to include neo4j-enterprise in your Gemfile (development)" unless log4j
-
-
-            system("mkdir -p #{lib_dir}")
-            FileUtils.cp(zookeeper, lib_dir)
-            FileUtils.cp(log4j, lib_dir)
-          end
-
-          def start
-            puts "Zookeeper: start, check jars?"
-            copy_jars unless File.exist?(lib_dir)
-            zookeeper_exec = File.expand_path("start_zookeeper.sh", File.dirname(__FILE__)).to_s
-            Dir.chdir(File.dirname(__FILE__))
-            pipe = IO.popen(zookeeper_exec)
-            File.open(pid_file, 'w') { |f| f.write(pipe.pid) }
-          end
-        end
-      end
-    end
-  end
-end