neo4j 1.2.6-java → 1.3.0-java

data/CHANGELOG

@@ -1,3 +1,19 @@
+ == 1.3.0 / 2011-12-06
+* Added neo4j-upgrade script to rename lucene index files and upgrade to 1.5 [#197]
+* Expose Neo4j::NodeMixin#index_types returning available indices (useful for Cypher queries) [#194]
+* The to_other method is now available also in the Neo4j::Rails API [#193]
+* Expose rel_type method for Neo4j::Rails::Relationship [#196]
+* Support for breadth and depth first traversals [#198]
+* Support for cypher query [#197]
+* Fix for rule node concurrency issue (pull #78, Vivek Prahlad)
+* Bugfix for the uniqueness validation for properties with quotes (pull #76, Vivek Prahlad)
+* More performance tweaks (pull #75, #77, Vivek Prahlad)
+* Fixing add_index for properties other than type string (pull #74, Deepak N)
+* Significant performance boost for creating large numbers of models in a transaction (pull #73, Vivek Prahlad)
+* Upgrade to neo4j 1.5 jars (pull #72, Vivek Prahlad)
+* Fix for assigning nil values to incoming has_one relation (pull #70, Deepak N)
+* Support for revert and fixes for Neo4j::Rails::Versioning (pull #71, Vivek Prahlad)
+
  == 1.2.6 / 2011-11-02
 * Generators can now generate relationships as well [#195]
 * Better will_paginate support for Neo4j::Rails::Model [#194]

data/README.rdoc

@@ -12,7 +12,9 @@ It uses two powerful and mature Java libraries:
 === Documentation
 
 * {Guides and API}[http://neo4j.rubyforge.org/guides/index.html]
+* {RDoc}[http://neo4j.rubyforge.org]
 * {Blog: Neo4j and Rails 3}[http://blog.jayway.com/2011/03/02/neo4j-rb-1-0-0-and-rails-3/]
+* {Kvitter Example Application}[https://github.com/andreasronge/kvitter/]
 
 === Why Neo4j.rb or a Graph Database ?
 
@@ -107,6 +109,15 @@ To run it with Tomcat instead of WEBrick
   gem install trinidad
   trinidad
 
+=== Architecture
+
+As you seen above, neo4j.rb consists of a three layers API:
+
+* Layer 1. For interacting with the basic building blocks of the graph database (node, properties and relationship), see Neo4j::Node and Neo4j::Relationship classes.
+* Layer 2. A binding API to Ruby objects, see Neo4j::NodeMixin and Neo4j::RelationshipMixin modules.
+* Layer 3. An implementation of the Rails Active Model and a subset of the Active Record API, see Neo4j::Rails::Model class.
+
+Notice that you can always access the lower layers if you want to do some more advanced. You can even access the Java API directly.
 
 === Presentation Materials and other URLs
 * {Presentation: RailsConf 2011}[http://andreasronge.github.com/neo4j-railsconf.pdf]

data/bin/neo4j-upgrade

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'neo4j'
+
+if ARGV.length == 0
+  puts <<TEXT
+A tool for upgrading the neo4j database to #{Neo4j::VERSION}.
+Make sure you shutdown the database cleanly before running this script.
+More info:  http://neo4j.rubyforge.org/guides/configuration.html#upgrade-to-a-new-neo4j-version
+
+Usage   : neo4j-upgrade <location of database>
+Example : neo4j-upgrade db/neo4j-development
+
+TEXT
+exit
+end
+
+def error(msg)
+  puts msg
+  exit
+end
+
+def rename_index(folder, file)
+  new_file = File.join(folder, file.gsub(/-/, '_'))
+  old_file = File.join(folder, file)
+  puts "moved index '#{old_file}' to '#{new_file}'"
+  FileUtils.move(old_file, new_file)
+end
+
+def upgrade(path)
+  Dir.entries(path).each do |file|
+    rename_index(path, file) if file =~ /(-exact)|(-fulltext)$/
+  end
+end
+
+root = ARGV[0]
+error("Can't find database at location #{root}") unless File.exist?(root)
+error("Expected location #{root} to be a folder") unless File.directory?(root)
+
+# Upgrade
+puts "upgrade database to Neo4j.rb version #{Neo4j::VERSION}, this might take a while ...."
+Neo4j::Config[:storage_path] = root
+Neo4j::Config[:allow_store_upgrade] = 'true'
+Neo4j.start
+puts "Neo4j database at #{root} upgraded to #{Neo4j::VERSION}, now shutdown"
+Neo4j.shutdown
+puts "Rename lucene index files"
+
+nodes_path = File.join(root, "index", "lucene", "node")
+if File.exist?(nodes_path)
+  upgrade(nodes_path)
+else
+  puts("Can't find lucene index at location #{nodes_path}")
+end
+
+
+nodes_path = File.join(root, "index", "lucene", "node")
+if File.exist?(nodes_path)
+  upgrade(nodes_path)
+else
+  puts("No lucene index for nodes found at location #{nodes_path}, continue")
+end
+
+nodes_path = File.join(root, "index", "lucene", "relationship")
+if File.exist?(nodes_path)
+  upgrade(nodes_path)
+else
+  puts("No lucene index for relationship found at location #{nodes_path}")
+end
+
+puts "Upgraded database done at '#{root}'"

data/lib/neo4j.rb

@@ -20,43 +20,42 @@ require 'neo4j/core_ext/class/inheritable_attributes'
 
 require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/core/lucene-core-3.1.0.jar'
-require 'neo4j/jars/core/neo4j-lucene-index-1.4.1.jar'
-require 'neo4j/jars/core/neo4j-kernel-1.4.1.jar'
-require 'neo4j/jars/ha/neo4j-management-1.4.1.jar'
-require 'neo4j/jars/ha/neo4j-jmx-1.4.1.jar'
+require 'neo4j/jars/core/neo4j-cypher-1.5.jar'
+require 'neo4j/jars/core/neo4j-kernel-1.5.jar'
+require 'neo4j/jars/core/neo4j-lucene-index-1.5.jar'
+require 'neo4j/jars/core/neo4j-jmx-1.5.jar'
+require 'neo4j/jars/core/neo4j-udc-1.5.jar'
+require 'neo4j/jars/core/org.apache.servicemix.bundles.jline-0.9.94_1.jar'
+require 'neo4j/jars/core/scala-library-2.9.0-1.jar'
+require 'neo4j/jars/core/server-api-1.5.jar'
+require 'neo4j/jars/ha/neo4j-management-1.5.jar'
 
 module Neo4j
 
   def self.load_local_jars
-    # This is a temporary fix since the HA does not yet work with this JAR
-    # It will be solved in a future version of the Java Neo4j library.
     if Neo4j.config[:online_backup_enabled]
       Neo4j.load_online_backup
-    else
-      # backup and HA does not work with this JAR FILE
-      require 'neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar'
     end
   end
 
   def self.load_shell_jars
-    require 'neo4j/jars/ha/neo4j-shell-1.4.1.jar'
+    require 'neo4j/jars/core/neo4j-shell-1.5.jar'
   end
 
   def self.load_online_backup
-    require 'neo4j/jars/ha/neo4j-com-1.4.1.jar'
-    require 'neo4j/jars/core/neo4j-backup-1.4.1.jar'
-    require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.5.jar'
+    require 'neo4j/jars/ha/neo4j-backup-1.5.jar'
+    require 'neo4j/jars/ha/org.apache.servicemix.bundles.netty-3.2.5.Final_1.jar'
     Neo4j.send(:const_set, :OnlineBackup, org.neo4j.backup.OnlineBackup)
   end
 
   def self.load_ha_jars
-    require 'neo4j/jars/core/neo4j-backup-1.4.1.jar'
+    require 'neo4j/jars/ha/neo4j-backup-1.5.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.5.jar'
+    require 'neo4j/jars/ha/neo4j-ha-1.5.jar'
     require 'neo4j/jars/ha/log4j-1.2.16.jar'
-    require 'neo4j/jars/ha/neo4j-ha-1.4.1.jar'
-    require 'neo4j/jars/ha/neo4j-com-1.4.1.jar'
-    require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
-    require 'neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar'
-    # require 'neo4j/jars/ha/org.apache.servicemix.bundles.lucene-3.0.1_2.jar' # TODO IS THIS NEEDED ?
+    require 'neo4j/jars/ha/org.apache.servicemix.bundles.netty-3.2.5.Final_1.jar'
+    require 'neo4j/jars/ha/slf4j-api-1.6.1.jar'
     require 'neo4j/jars/ha/zookeeper-3.3.2.jar'
   end
 end

data/lib/neo4j/algo/algo.rb

@@ -1,6 +1,7 @@
 # external neo4j dependencies
 require 'neo4j/to_java'
-require 'neo4j/jars/core/neo4j-graph-algo-1.4.1.jar'
+require 'neo4j/jars/core/neo4j-graph-algo-1.5.jar'
+require 'neo4j/jars/core/neo4j-graph-matching-1.5.jar'
 
 module Neo4j
 

data/lib/neo4j/database.rb

@@ -13,6 +13,8 @@ module Neo4j
   class Database
     attr_reader :graph, :lucene, :event_handler, :storage_path
 
+    alias_method :index, :lucene # needed by cypher
+
     def initialize()
       @event_handler = EventHandler.new
     end
@@ -62,6 +64,16 @@ module Neo4j
       @event_handler.neo4j_started(self)
     end
 
+    # needed by cypher
+    def getNodeById(id) #:nodoc:
+      Neo4j::Node.load(id)
+    end
+
+    # needed by cypher
+    def getRelationshipById(id) #:nodoc:
+      Neo4j::Relationship.load(id)
+    end
+
     def start_ha_graph_db
       Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.machine_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
       Neo4j.load_ha_jars # those jars are only needed for the HighlyAvailableGraphDatabase

data/lib/neo4j/event_handler.rb

@@ -71,6 +71,9 @@ module Neo4j
   # * <tt>old_value</tt> :: old value of the property
   # * <tt>new_value</tt> :: new value of the property
   #
+  # ==== classes_changed(class_change_map)
+  # * <tt>class_change_map</tt> :: a hash with class names as keys, and class changes as values. See Neo4j::ClassChanges
+  #
   # == Usage
   #
   #   class MyListener
@@ -99,25 +102,37 @@ module Neo4j
     end
 
     def before_commit(data)
-      created_node_identity_map = node_identity_map(data.created_nodes)
-      deleted_node_identity_map = node_identity_map(data.deleted_nodes)
+      class_change_map = java.util.HashMap.new
+      created_node_identity_map = iterate_created_nodes(data.created_nodes, class_change_map)
+      deleted_node_identity_map = deleted_node_identity_map(data.deleted_nodes)
       deleted_relationship_set = relationship_set(data.deleted_relationships)
       removed_node_properties_map = property_map(data.removed_node_properties)
       removed_relationship_properties_map = property_map(data.removed_relationship_properties)
+      add_deleted_nodes(data, class_change_map, removed_node_properties_map)
       empty_map = java.util.HashMap.new
-      data.created_nodes.each{|node| node_created(node)}
-      data.assigned_node_properties.each { |tx_data| property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, tx_data.value) }
+      data.assigned_node_properties.each { |tx_data| property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, tx_data.value) unless tx_data.key == '_classname'}
       data.removed_node_properties.each { |tx_data| property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, nil) unless deleted_node_identity_map.containsKey(tx_data.entity.getId) }
       data.deleted_nodes.each { |node| node_deleted(node, removed_node_properties_map.get(node.getId)||empty_map, deleted_relationship_set, deleted_node_identity_map)}
       data.created_relationships.each {|rel| relationship_created(rel, created_node_identity_map)}
       data.deleted_relationships.each {|rel| relationship_deleted(rel, removed_relationship_properties_map.get(rel.getId)||empty_map, deleted_relationship_set, deleted_node_identity_map)}
       data.assigned_relationship_properties.each { |tx_data| rel_property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, tx_data.value) }
       data.removed_relationship_properties.each {|tx_data| rel_property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, nil) unless deleted_relationship_set.contains_rel?(tx_data.entity) }
+      classes_changed(class_change_map)
     end
 
-    def node_identity_map(nodes)
+    def iterate_created_nodes(nodes, class_change_map)
       identity_map = java.util.HashMap.new(nodes.size)
-      nodes.each{|node| identity_map.put(node.neo_id,node)}#using put due to a performance regression in JRuby 1.6.4
+      nodes.each do |node|
+        identity_map.put(node.neo_id,node) #using put due to a performance regression in JRuby 1.6.4
+        instance_created(node, class_change_map)
+        node_created(node)
+      end
+      identity_map
+    end
+
+    def deleted_node_identity_map(nodes)
+      identity_map = java.util.HashMap.new(nodes.size)
+      nodes.each{|node| identity_map.put(node.neo_id,node)} #using put due to a performance regression in JRuby 1.6.4
       identity_map
     end
 
@@ -192,5 +207,52 @@ module Neo4j
     def rel_property_changed(rel, key, old_value, new_value)
       @listeners.each {|li| li.on_rel_property_changed(rel, key, old_value, new_value) if li.respond_to?(:on_rel_property_changed)}
     end
+
+    def add_deleted_nodes(data, class_change_map, removed_node_properties_map)
+      data.deleted_nodes.each{|node| instance_deleted(node, removed_node_properties_map, class_change_map)}
+    end
+
+    def instance_created(node, class_change_map)
+      classname = node[:_classname]
+      class_change(classname, class_change_map).add(node) if classname
+    end
+
+    def instance_deleted(node, removed_node_properties_map, class_change_map)
+      properties = removed_node_properties_map.get(node.getId)
+      if properties
+        classname = properties.get("_classname")
+        class_change(classname, class_change_map).delete(node) if classname
+      end
+    end
+
+    def class_change(classname, class_change_map)
+      class_change_map.put(classname, ClassChanges.new) if class_change_map.get(classname).nil?
+      class_change_map.get(classname)
+    end
+
+    def classes_changed(changed_class_map)
+      @listeners.each {|li| li.classes_changed(changed_class_map) if li.respond_to?(:classes_changed)}
+    end
+  end
+
+  class ClassChanges
+    attr_accessor :added, :deleted
+
+    def initialize
+      self.added = []
+      self.deleted = []
+    end
+
+    def add(node)
+      self.added << node
+    end
+
+    def delete(node)
+      self.deleted << node
+    end
+
+    def net_change
+      self.added.size - self.deleted.size
+    end
   end
-end
+end

data/lib/neo4j/has_list/class_methods.rb

@@ -3,7 +3,7 @@ module Neo4j::HasList
       def has_list(name, params = {})
         module_eval(%Q{
                 def #{name}
-                  Neo4j::HasList::Mapping.new(self, '#{name}')
+                  Neo4j::HasList::Mapping.new(self.class, self, '#{name}')
                 end}, __FILE__, __LINE__)
       end
   end

data/lib/neo4j/has_list/mapping.rb

@@ -35,10 +35,11 @@ module Neo4j
       include Enumerable
       include ToJava
       include WillPaginate::Finders::Base
-      
 
-      def initialize(node, name)
-        @time_line = org.neo4j.index.timeline.Timeline.new(name, node._java_node, true, Neo4j.started_db.graph)
+
+      def initialize(indexer_for, node, name)
+        @index = Neo4j.started_db.lucene.for_nodes("#{indexer_for.to_s.gsub('::', '_')}_#{name}-timeline", Neo4j::Config[:lucene][:exact])
+        @time_line = org.neo4j.index.lucene.LuceneTimeline.new(Neo4j.started_db.graph, @index)
         @node      = node
         @name      = name
         self.size = 0 unless size
@@ -57,38 +58,38 @@ module Neo4j
 
       # returns the first node with index n
       def [](n)
-        @time_line.getAllNodesBetween(n-1, n+1).first
+        @time_line.getBetween(n, n).first
       end
 
       # returns all nodes with the given index n
       def all(n)
-        @time_line.getAllNodesBetween(n-1, n+1)
+        @time_line.getBetween(n, n)
       end
 
       # returns the first node in the list or nil
       def first
-        @time_line.first_node
+        @time_line.getFirst()
       end
 
       # returns the last node in the list or nil
       def last
-        @time_line.last_node
+        @time_line.getLast
       end
 
       # adds a node to the list with the given index n
       def []=(n, other_node)
-        @time_line.add_node(other_node, n)
+        @time_line.add(other_node, n)
         self.size = self.size + 1
       end
 
       # returns all the nodes between the given Range
       def between(range)
-        @time_line.getAllNodesBetween(range.first-1, range.end+1)
+        @time_line.getBetween(range.first, range.end)
       end
 
       # removes one node from the list and decrases the size of the list,
       def remove(node)
-        @time_line.remove_node(node)
+        @index.remove(node, "timestamp")
         self.size = self.size - 1
       end
 
@@ -104,7 +105,7 @@ module Neo4j
       #  person.feeds.each {|node| node}
       #
       def each
-        @time_line.all_nodes.iterator.each do |node|
+        @time_line.getBetween(java.lang.Long::MIN_VALUE,java.lang.Long::MAX_VALUE).iterator.each do |node|
           if @raw then
             yield node
           else
@@ -135,19 +136,15 @@ module Neo4j
       end
 
       def <<(other)
-        @time_line.add_node(other, size)
+        @time_line.add(other._java_node, size)
         self.size = self.size + 1
         self
       end
 
-
       private
       def size=(size)
         @node["_list_size_#{@name}"] = size
       end
-
-
     end
-
   end
 end

data/lib/neo4j/index/class_methods.rb

@@ -53,13 +53,19 @@ module Neo4j
       #
       #  Person.index_names[:fulltext] => 'my_location'
       #  Person.index_names[:exact] => 'Foo_Person-exact' # default Location
-      #  Notice in versions <= 1.0.0.beta.29 the default location was 'Foo::Person-exact'
-      #  which does not work on Windows [lighthouse ticket #147]
+      #
+      # The index can be prefixed, see Neo4j#threadlocal_ref_node= and multi dendency.
       #
       # :singleton-method: index_names
 
 
-      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :delete_index_type, :rm_field_type, :add_index, :rm_index, :index_type_for, :index_names
+      ##
+      # Returns a hash of which indexes has been defined and the type of index (:exact or :fulltext)
+      #
+      # :singleton-method: index_types
+
+
+      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :delete_index_type, :rm_field_type, :add_index, :rm_index, :index_type_for, :index_names, :index_types
 
       # Sets which indexer should be used for the given node class.
       # You can share an indexer between several different classes.