neo4j 2.0.0.alpha.9-java → 2.0.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. data/CHANGELOG +12 -0
  2. data/bin/neo4j-upgrade +2 -2
  3. data/lib/db/index/lucene-store.db +0 -0
  4. data/lib/db/index/lucene.log.1 +0 -0
  5. data/lib/db/messages.log +349 -74
  6. data/lib/db/neostore +0 -0
  7. data/lib/db/neostore.nodestore.db +0 -0
  8. data/lib/db/neostore.propertystore.db +0 -0
  9. data/lib/db/neostore.propertystore.db.index +0 -0
  10. data/lib/db/neostore.propertystore.db.index.keys +0 -0
  11. data/lib/db/neostore.propertystore.db.index.keys.id +0 -0
  12. data/lib/db/neostore.propertystore.db.strings +0 -0
  13. data/lib/db/neostore.propertystore.db.strings.id +0 -0
  14. data/lib/db/neostore.relationshipstore.db +0 -0
  15. data/lib/db/neostore.relationshiptypestore.db +0 -0
  16. data/lib/db/neostore.relationshiptypestore.db.id +0 -0
  17. data/lib/db/neostore.relationshiptypestore.db.names +0 -0
  18. data/lib/db/neostore.relationshiptypestore.db.names.id +0 -0
  19. data/lib/db/nioneo_logical.log.1 +0 -0
  20. data/lib/db/nioneo_logical.log.active +0 -0
  21. data/lib/db/tm_tx_log.1 +0 -0
  22. data/lib/neo4j.rb +1 -1
  23. data/lib/neo4j/tasks/neo4j.rb +2 -0
  24. data/lib/{tasks → neo4j/tasks}/upgrade_v2/lib/upgrade_v2.rb +35 -30
  25. data/lib/{tasks → neo4j/tasks}/upgrade_v2/upgrade_v2.rake +2 -0
  26. data/lib/neo4j/version.rb +1 -1
  27. data/neo4j.gemspec +1 -1
  28. metadata +11 -19
  29. data/lib/db/index.db +0 -0
  30. data/lib/db/index/lucene/node/Person_fulltext/_0.fdt +0 -0
  31. data/lib/db/index/lucene/node/Person_fulltext/_0.fdx +0 -0
  32. data/lib/db/index/lucene/node/Person_fulltext/_0.fnm +0 -1
  33. data/lib/db/index/lucene/node/Person_fulltext/_0.frq +0 -1
  34. data/lib/db/index/lucene/node/Person_fulltext/_0.nrm +0 -1
  35. data/lib/db/index/lucene/node/Person_fulltext/_0.prx +0 -0
  36. data/lib/db/index/lucene/node/Person_fulltext/_0.tii +0 -0
  37. data/lib/db/index/lucene/node/Person_fulltext/_0.tis +0 -0
  38. data/lib/db/index/lucene/node/Person_fulltext/segments.gen +0 -0
  39. data/lib/db/index/lucene/node/Person_fulltext/segments_1 +0 -0
data/CHANGELOG CHANGED
@@ -1,3 +1,15 @@
1
+ == 2.0.0 / 2012-05-07
2
+ (same as rc2)
3
+
4
+ == 2.0.0.rc2 / 2012-05-04
5
+ * Enable Identity Map by default
6
+ * Added versioning for Neo4j::Core
7
+
8
+ == 2.0.0.rc1 / 2012-05-03
9
+ * Fix of rake task to upgrade to 2.0
10
+ * Various Cypher DSL improvements, core(#3,#4,#5), #196
11
+ * Added Neo4j::VERSION
12
+
1
13
  == 2.0.0.alpha.9 / 2012-04-27
2
14
  * Fix for rails scaffold generator
3
15
 
@@ -7,7 +7,7 @@ if ARGV.length == 0
7
7
  puts <<TEXT
8
8
  A tool for upgrading the neo4j database to #{Neo4j::VERSION}.
9
9
  Make sure you shutdown the database cleanly before running this script.
10
- More info: http://neo4j.rubyforge.org/guides/configuration.html#upgrade-to-a-new-neo4j-version
10
+ More info: https://github.com/andreasronge/neo4j/wiki
11
11
 
12
12
  Usage : neo4j-upgrade <location of database>
13
13
  Example : neo4j-upgrade db/neo4j-development
@@ -69,4 +69,4 @@ else
69
69
  puts("No lucene index for relationship found at location #{nodes_path}")
70
70
  end
71
71
 
72
- puts "Upgraded database done at '#{root}'"
72
+ puts "Upgraded database done at '#{root}'"
Binary file
Binary file
@@ -1,11 +1,11 @@
1
- 2012-04-25 06:42:58.885+0000: WARNING! Deprecated configuration options used. See manual for details
2
- 2012-04-25 06:42:58.888+0000: enable_online_backup has been replaced with online_backup_enabled and online_backup_port
3
- 2012-04-25 06:42:58.947+0000: Creating new db @ /home/andreas/projects/neo4j/lib/db/neostore
4
- 2012-04-25 06:42:59.281+0000: Opened [/home/andreas/projects/neo4j/lib/db/nioneo_logical.log.1] clean empty log, version=0, lastTxId=1
5
- 2012-04-25 06:42:59.296+0000: TM new log: tm_tx_log.1
6
- 2012-04-25 06:42:59.333+0000: Opened [/home/andreas/projects/neo4j/lib/db/index/lucene.log.1] clean empty log, version=0, lastTxId=1
7
- 2012-04-25 06:42:59.340+0000: --- STARTUP diagnostics START ---
8
- 2012-04-25 06:42:59.341+0000: Neo4j Kernel properties:
1
+ 2012-05-03 09:31:57.644+0000: WARNING! Deprecated configuration options used. See manual for details
2
+ 2012-05-03 09:31:57.647+0000: enable_online_backup has been replaced with online_backup_enabled and online_backup_port
3
+ 2012-05-03 09:31:57.706+0000: Creating new db @ /home/andreas/projects/neo4j/lib/db/neostore
4
+ 2012-05-03 09:31:58.049+0000: Opened [/home/andreas/projects/neo4j/lib/db/nioneo_logical.log.1] clean empty log, version=0, lastTxId=1
5
+ 2012-05-03 09:31:58.063+0000: TM new log: tm_tx_log.1
6
+ 2012-05-03 09:31:58.335+0000: Opened [/home/andreas/projects/neo4j/lib/db/index/lucene.log.1] clean empty log, version=0, lastTxId=1
7
+ 2012-05-03 09:31:58.342+0000: --- STARTUP diagnostics START ---
8
+ 2012-05-03 09:31:58.343+0000: Neo4j Kernel properties:
9
9
  read_only=false
10
10
  neo4j.ext.udc.host=udc.neo4j.org
11
11
  logical_log=/home/andreas/projects/neo4j/lib/db/nioneo_logical.log
@@ -70,7 +70,7 @@
70
70
  remote_logging_enabled=false
71
71
  ha.server=localhost:6002
72
72
  neo4j.ext.udc.enabled=true
73
- 2012-04-25 06:42:59.345+0000: Diagnostics providers:
73
+ 2012-05-03 09:31:58.347+0000: Diagnostics providers:
74
74
  org.neo4j.kernel.configuration.Config
75
75
  org.neo4j.kernel.info.DiagnosticsManager
76
76
  SYSTEM_MEMORY
@@ -81,37 +81,36 @@
81
81
  LIBRARY_PATH
82
82
  SYSTEM_PROPERTIES
83
83
  LINUX_SCHEDULERS
84
- 2012-04-25 06:42:59.346+0000: System memory information:
84
+ 2012-05-03 09:31:58.348+0000: System memory information:
85
85
  Total Physical memory: 3.87 GB
86
- Free Physical memory: 1.99 GB
87
- Committed virtual memory: 907.15 MB
86
+ Free Physical memory: 278.78 MB
87
+ Committed virtual memory: 918.24 MB
88
88
  Total swap space: 4.88 GB
89
- Free swap space: 4.88 GB
90
- 2012-04-25 06:42:59.349+0000: JVM memory information:
91
- Free memory: 55.76 MB
92
- Total memory: 108.56 MB
89
+ Free swap space: 4.69 GB
90
+ 2012-05-03 09:31:58.350+0000: JVM memory information:
91
+ Free memory: 78.42 MB
92
+ Total memory: 169.81 MB
93
93
  Max memory: 444.50 MB
94
94
  Garbage Collector: PS Scavenge: [PS Eden Space, PS Survivor Space]
95
95
  Garbage Collector: PS MarkSweep: [PS Eden Space, PS Survivor Space, PS Old Gen, PS Perm Gen]
96
- Memory Pool: Code Cache (Non-heap memory): committed=2.63 MB, used=2.52 MB, max=48.00 MB, threshold=0.00 B
97
- Memory Pool: PS Eden Space (Heap memory): committed=62.00 MB, used=38.18 MB, max=154.00 MB, threshold=?
98
- Memory Pool: PS Survivor Space (Heap memory): committed=5.31 MB, used=5.30 MB, max=5.31 MB, threshold=?
99
- Memory Pool: PS Old Gen (Heap memory): committed=41.25 MB, used=9.33 MB, max=333.38 MB, threshold=0.00 B
100
- Memory Pool: PS Perm Gen (Non-heap memory): committed=25.81 MB, used=25.69 MB, max=166.00 MB, threshold=0.00 B
101
- 2012-04-25 06:42:59.357+0000: Operating system information:
96
+ Memory Pool: Code Cache (Non-heap memory): committed=3.00 MB, used=2.83 MB, max=48.00 MB, threshold=0.00 B
97
+ Memory Pool: PS Eden Space (Heap memory): committed=123.50 MB, used=77.10 MB, max=156.00 MB, threshold=?
98
+ Memory Pool: PS Survivor Space (Heap memory): committed=5.06 MB, used=5.04 MB, max=5.06 MB, threshold=?
99
+ Memory Pool: PS Old Gen (Heap memory): committed=41.25 MB, used=9.26 MB, max=333.38 MB, threshold=0.00 B
100
+ Memory Pool: PS Perm Gen (Non-heap memory): committed=25.81 MB, used=25.75 MB, max=166.00 MB, threshold=0.00 B
101
+ 2012-05-03 09:31:58.353+0000: Operating system information:
102
102
  Operating System: Linux; version: 3.0.0-17-generic; arch: amd64; cpus: 2
103
103
  Max number of file descriptors: 4096
104
104
  Number of open file descriptors: 58
105
- Process id: 2694@andreas-dell
105
+ Process id: 11050@andreas-dell
106
106
  Byte order: LITTLE_ENDIAN
107
- 2012-04-25 06:42:59.362+0000: JVM information:
107
+ 2012-05-03 09:31:58.357+0000: JVM information:
108
108
  VM Name: OpenJDK 64-Bit Server VM
109
109
  VM Vendor: Oracle Corporation
110
110
  VM Version: 21.0-b17
111
111
  JIT compiler: HotSpot 64-Bit Tiered Compilers
112
112
  VM Arguments: [-Djdk.home=, -Djruby.home=/home/andreas/.rvm/rubies/jruby-1.6.7, -Djruby.script=jruby, -Djruby.shell=/bin/sh, -Djffi.boot.library.path=/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/x86_64-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/i386-Linux, -Xmx500m, -Xss2048k, -Djruby.memory.max=500m, -Djruby.stack.max=2048k, -Xbootclasspath/a:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/jruby.jar]
113
- 2012-04-25 06:42:59.363+0000: Java classpath:
114
- [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7@global/gems/json-1.6.5-java/lib/json/ext/parser.jar
113
+ 2012-05-03 09:31:58.358+0000: Java classpath:
115
114
  [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunpkcs11.jar
116
115
  [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/plugin.jar
117
116
  [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
@@ -129,7 +128,6 @@
129
128
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/lucene-core-3.5.0.jar
130
129
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-cypher-1.7.jar
131
130
  [loader.2] file:/usr/lib/x86_64-linux-gnu/jni/libjava-access-bridge-jni.so.0.0.0
132
- [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7@global/gems/json-1.6.5-java/lib/json/ext/generator.jar
133
131
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/geronimo-jta_1.1_spec-1.1.1.jar
134
132
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/scala-library-2.9.0-1.jar
135
133
  [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunjce_provider.jar
@@ -138,7 +136,9 @@
138
136
  [loader.2] file:/usr/share/java/gnome-java-bridge.jar
139
137
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/server-api-1.7.jar
140
138
  [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar
139
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/json-1.6.1-java/lib/json/ext/generator.jar
141
140
  [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/pulse-java.jar
141
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/json-1.6.1-java/lib/json/ext/parser.jar
142
142
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-graph-matching-1.7.jar
143
143
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-shell-1.7.jar
144
144
  [bootstrap] /usr/lib/jvm/java-7-openjdk-common/jre/lib/resources.jar
@@ -146,7 +146,7 @@
146
146
  [classpath + loader.1] file:/home/andreas/projects/neo4j/lib/
147
147
  [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-lucene-index-1.7.jar
148
148
  [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/zipfs.jar
149
- 2012-04-25 06:42:59.367+0000: Library path:
149
+ 2012-05-03 09:31:58.359+0000: Library path:
150
150
  /usr/java/packages/lib/amd64
151
151
  /usr/lib/x86_64-linux-gnu/jni
152
152
  /lib/x86_64-linux-gnu
@@ -154,7 +154,7 @@
154
154
  /usr/lib/jni
155
155
  /lib
156
156
  /usr/lib
157
- 2012-04-25 06:42:59.367+0000: System.properties:
157
+ 2012-05-03 09:31:58.359+0000: System.properties:
158
158
  jruby.home = /home/andreas/.rvm/rubies/jruby-1.6.7
159
159
  sun.boot.library.path = /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64
160
160
  path.separator = :
@@ -184,7 +184,7 @@
184
184
  sun.cpu.endian = little
185
185
  sun.desktop = gnome
186
186
  sun.cpu.isalist =
187
- 2012-04-25 06:42:59.368+0000: Linux scheduler information:
187
+ 2012-05-03 09:31:58.360+0000: Linux scheduler information:
188
188
  none
189
189
  none
190
190
  none
@@ -211,18 +211,18 @@
211
211
  none
212
212
  noop deadline [cfq]
213
213
  noop deadline [cfq]
214
- 2012-04-25 06:42:59.372+0000: --- STARTUP diagnostics END ---
215
- 2012-04-25 06:42:59.446+0000: Extension org.neo4j.kernel.KernelExtension[kernel jmx] loaded ok
216
- 2012-04-25 06:42:59.712+0000: Extension org.neo4j.kernel.KernelExtension[shell] loaded ok
217
- 2012-04-25 06:42:59.714+0000: Extension org.neo4j.kernel.KernelExtension[kernel udc] loaded ok
218
- 2012-04-25 06:42:59.717+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions START ---
219
- 2012-04-25 06:42:59.717+0000: Graph Database: org.neo4j.kernel.EmbeddedGraphDatabase StoreId[time:1335336178947, id:-2172206710464518899, store version: 13561656364791302]
220
- 2012-04-25 06:42:59.717+0000: Kernel version: Neo4j - Graph Database Kernel 1.7
221
- 2012-04-25 06:42:59.717+0000: Neo4j component versions:
222
- 2012-04-25 06:42:59.718+0000: Neo4j - Graph Database Kernel 1.7
223
- 2012-04-25 06:42:59.718+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions END ---
224
- 2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS START ---
225
- 2012-04-25 06:42:59.720+0000: Store versions:
214
+ 2012-05-03 09:31:58.363+0000: --- STARTUP diagnostics END ---
215
+ 2012-05-03 09:31:58.423+0000: Extension org.neo4j.kernel.KernelExtension[kernel jmx] loaded ok
216
+ 2012-05-03 09:31:58.680+0000: Extension org.neo4j.kernel.KernelExtension[shell] loaded ok
217
+ 2012-05-03 09:31:58.683+0000: Extension org.neo4j.kernel.KernelExtension[kernel udc] loaded ok
218
+ 2012-05-03 09:31:58.685+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions START ---
219
+ 2012-05-03 09:31:58.685+0000: Graph Database: org.neo4j.kernel.EmbeddedGraphDatabase StoreId[time:1336037517706, id:6041337887935692899, store version: 13561656364791302]
220
+ 2012-05-03 09:31:58.685+0000: Kernel version: Neo4j - Graph Database Kernel 1.7
221
+ 2012-05-03 09:31:58.685+0000: Neo4j component versions:
222
+ 2012-05-03 09:31:58.686+0000: Neo4j - Graph Database Kernel 1.7
223
+ 2012-05-03 09:31:58.686+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions END ---
224
+ 2012-05-03 09:31:58.688+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS START ---
225
+ 2012-05-03 09:31:58.688+0000: Store versions:
226
226
  Store versions:
227
227
  NeoStore v0.A.0
228
228
  NodeStore v0.A.0
@@ -232,9 +232,9 @@
232
232
  PropertyIndexStore v0.A.0
233
233
  StringPropertyStore v0.A.0
234
234
  ArrayPropertyStore v0.A.0
235
- 2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS END ---
236
- 2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE START ---
237
- 2012-04-25 06:42:59.720+0000: Id usage:
235
+ 2012-05-03 09:31:58.688+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS END ---
236
+ 2012-05-03 09:31:58.688+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE START ---
237
+ 2012-05-03 09:31:58.689+0000: Id usage:
238
238
  Id usage:
239
239
  NodeStore: used=1 high=0
240
240
  RelationshipStore: used=0 high=-1
@@ -243,9 +243,9 @@
243
243
  PropertyIndexStore: used=0 high=-1
244
244
  StringPropertyStore: used=1 high=0
245
245
  ArrayPropertyStore: used=1 high=0
246
- 2012-04-25 06:42:59.721+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE END ---
247
- 2012-04-25 06:42:59.721+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles START ---
248
- 2012-04-25 06:42:59.721+0000: Storage files:
246
+ 2012-05-03 09:31:58.689+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE END ---
247
+ 2012-05-03 09:31:58.689+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles START ---
248
+ 2012-05-03 09:31:58.689+0000: Storage files:
249
249
  neostore.relationshiptypestore.db.names: 38.00 B
250
250
  neostore.id: 9.00 B
251
251
  neostore.relationshiptypestore.db.names.id: 9.00 B
@@ -260,7 +260,7 @@
260
260
  neostore.nodestore.db: 9.00 B
261
261
  neostore.propertystore.db.index.keys.id: 9.00 B
262
262
  neostore.propertystore.db.arrays.id: 9.00 B
263
- messages.log: 12.14 kB
263
+ messages.log: 12.13 kB
264
264
  neostore.relationshipstore.db.id: 9.00 B
265
265
  neostore.propertystore.db.arrays: 128.00 B
266
266
  neostore.relationshipstore.db: 0.00 B
@@ -277,28 +277,303 @@
277
277
  lock: 0.00 B
278
278
  active_tx_log: 11.00 B
279
279
  neostore.propertystore.db.index.keys: 38.00 B
280
- 2012-04-25 06:42:59.723+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles END ---
281
- 2012-04-25 06:42:59.725+0000: Started - database is now available
282
- 2012-04-25 06:42:59.725+0000: GC Monitor started.
283
- 2012-04-25 07:42:59.916+0000: GC Monitor: Application threads blocked for an additional 238ms [total block time: 0.238s]
284
- 2012-04-25 09:43:00.185+0000: GC Monitor: Application threads blocked for an additional 123ms [total block time: 0.361s]
285
- 2012-04-25 13:16:52.462+0000: GC Monitor: Application threads blocked for an additional 1977426ms [total block time: 1977.787s]
286
- 2012-04-25 13:17:15.740+0000: GC Monitor: Application threads blocked for an additional 609ms [total block time: 1978.396s]
287
- 2012-04-25 13:43:00.715+0000: GC Monitor: Application threads blocked for an additional 142ms [total block time: 1978.538s]
288
- 2012-04-25 14:43:01.047+0000: GC Monitor: Application threads blocked for an additional 248ms [total block time: 1978.786s]
289
- 2012-04-25 17:43:01.553+0000: GC Monitor: Application threads blocked for an additional 135ms [total block time: 1978.921s]
290
- 2012-04-26 06:37:25.006+0000: GC Monitor: Application threads blocked for an additional 44031287ms [total block time: 46010.207s]
291
- 2012-04-26 08:37:26.005+0000: GC Monitor: Application threads blocked for an additional 825ms [total block time: 46011.03s]
292
- 2012-04-26 09:37:26.201+0000: GC Monitor: Application threads blocked for an additional 112ms [total block time: 46011.145s]
293
- 2012-04-26 11:37:26.540+0000: GC Monitor: Application threads blocked for an additional 160ms [total block time: 46011.305s]
294
- 2012-04-26 13:37:26.871+0000: GC Monitor: Application threads blocked for an additional 152ms [total block time: 46011.457s]
295
- 2012-04-26 15:37:27.191+0000: GC Monitor: Application threads blocked for an additional 115ms [total block time: 46011.57s]
296
- 2012-04-26 16:37:27.342+0000: GC Monitor: Application threads blocked for an additional 105ms [total block time: 46011.676s]
297
- 2012-04-26 18:37:27.643+0000: GC Monitor: Application threads blocked for an additional 146ms [total block time: 46011.824s]
298
- 2012-04-26 19:10:15.054+0000: GC Monitor: Application threads blocked for an additional 927ms [total block time: 46012.754s]
299
- 2012-04-26 19:37:27.802+0000: GC Monitor: Application threads blocked for an additional 144ms [total block time: 46012.895s]
300
- 2012-04-26 19:42:40.923+0000: Stopping - database is now unavailable
301
- 2012-04-26 19:42:40.932+0000: TM shutting down
302
- 2012-04-26 19:42:40.963+0000: GC Monitor stopped.
303
- 2012-04-26 19:42:41.226+0000: Closed log /home/andreas/projects/neo4j/lib/db/index/lucene.log
304
- 2012-04-26 19:42:41.257+0000: Closed log /home/andreas/projects/neo4j/lib/db/nioneo_logical.log
280
+ 2012-05-03 09:31:58.692+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles END ---
281
+ 2012-05-03 09:31:58.693+0000: Started - database is now available
282
+ 2012-05-03 09:31:58.694+0000: GC Monitor started.
283
+ 2012-05-03 09:36:01.807+0000: Stopping - database is now unavailable
284
+ 2012-05-03 09:36:01.810+0000: TM shutting down
285
+ 2012-05-03 09:36:01.814+0000: Closed log /home/andreas/projects/neo4j/lib/db/index/lucene.log
286
+ 2012-05-03 09:36:01.833+0000: Closed log /home/andreas/projects/neo4j/lib/db/nioneo_logical.log
287
+ 2012-05-03 09:36:01.893+0000: GC Monitor stopped.
288
+ 2012-05-03 09:36:01.923+0000: NeoStore closed
289
+ 2012-05-03 09:36:01.924+0000: --- SHUTDOWN diagnostics START ---
290
+ 2012-05-03 09:36:01.924+0000: --- SHUTDOWN diagnostics END ---
291
+ 2012-05-03 12:35:32.210+0000: WARNING! Deprecated configuration options used. See manual for details
292
+ 2012-05-03 12:35:32.215+0000: enable_online_backup has been replaced with online_backup_enabled and online_backup_port
293
+ 2012-05-03 12:35:32.335+0000: Opened [/home/andreas/projects/neo4j/lib/db/nioneo_logical.log.1] clean empty log, version=0, lastTxId=1
294
+ 2012-05-03 12:35:32.374+0000: TM opening log: /home/andreas/projects/neo4j/lib/db/tm_tx_log.1
295
+ 2012-05-03 12:35:32.412+0000: Opened [/home/andreas/projects/neo4j/lib/db/index/lucene.log.1] clean empty log, version=0, lastTxId=1
296
+ 2012-05-03 12:35:32.419+0000: --- STARTUP diagnostics START ---
297
+ 2012-05-03 12:35:32.420+0000: Neo4j Kernel properties:
298
+ read_only=false
299
+ neo4j.ext.udc.host=udc.neo4j.org
300
+ logical_log=/home/andreas/projects/neo4j/lib/db/nioneo_logical.log
301
+ min_node_cache_size=0
302
+ intercept_committing_transactions=false
303
+ node_auto_indexing=false
304
+ remote_shell_name=shell
305
+ cache_type=soft
306
+ intercept_deserialized_transactions=false
307
+ ha.db=NO
308
+ use_adaptive_cache=YES
309
+ lucene_searcher_cache_size=2147483647
310
+ neo4j.ext.udc.interval=86400000
311
+ use_memory_mapped_buffers=true
312
+ ha.coordinators=localhost:2181,localhost:2182,localhost:2183
313
+ timestamps=YES
314
+ rebuild_idgenerators_fast=true
315
+ neostore.propertystore.db.index.keys.mapped_memory=1M
316
+ max_node_cache_size=1500
317
+ neostore.propertystore.db.strings.mapped_memory=130M
318
+ neostore.propertystore.db.arrays.mapped_memory=130M
319
+ gcr_cache_min_log_interval=60s
320
+ relationship_grab_size=100
321
+ relationship_auto_indexing=false
322
+ remote_shell_read_only=false
323
+ lucene_writer_cache_size=2147483647
324
+ storage_path=db
325
+ node_cache_array_fraction=1.0
326
+ allow_store_upgrade=false
327
+ execution_guard_enabled=false
328
+ relationship_cache_array_fraction=1.0
329
+ migration_thread=NO
330
+ remote_logging_host=127.0.0.1
331
+ store_dir=/home/andreas/projects/neo4j/lib/db
332
+ remote_logging_port=4560
333
+ enable_rules=YES
334
+ gc_monitor_threshold=200ms
335
+ load_kernel_extensions=true
336
+ array_block_size=120
337
+ neostore.relationshipstore.db.mapped_memory=50M
338
+ dump_configuration=false
339
+ gc_monitor_wait_time=100ms
340
+ neostore.nodestore.db.mapped_memory=25M
341
+ neo4j.ext.udc.first_delay=600000
342
+ remote_shell_enabled=true
343
+ min_relationship_cache_size=0
344
+ max_relationship_cache_size=3500
345
+ neo4j.ext.udc.reg=unreg
346
+ remote_shell_port=9332
347
+ adaptive_cache_heap_ratio=0.77
348
+ identity_map=NO
349
+ adaptive_cache_manager_decrease_ratio=1.15
350
+ ha.server_id=2
351
+ neo_store=/home/andreas/projects/neo4j/lib/db/neostore
352
+ adaptive_cache_worker_sleep_time=3000
353
+ neostore.propertystore.db.index.mapped_memory=1M
354
+ adaptive_cache_manager_increase_ratio=1.1
355
+ backup_slave=false
356
+ neostore.propertystore.db.mapped_memory=90M
357
+ string_block_size=120
358
+ grab_file_lock=true
359
+ remote_logging_enabled=false
360
+ ha.server=localhost:6002
361
+ neo4j.ext.udc.enabled=true
362
+ 2012-05-03 12:35:32.424+0000: Diagnostics providers:
363
+ org.neo4j.kernel.configuration.Config
364
+ org.neo4j.kernel.info.DiagnosticsManager
365
+ SYSTEM_MEMORY
366
+ JAVA_MEMORY
367
+ OPERATING_SYSTEM
368
+ JAVA_VIRTUAL_MACHINE
369
+ CLASSPATH
370
+ LIBRARY_PATH
371
+ SYSTEM_PROPERTIES
372
+ LINUX_SCHEDULERS
373
+ 2012-05-03 12:35:32.425+0000: System memory information:
374
+ Total Physical memory: 3.87 GB
375
+ Free Physical memory: 1.97 GB
376
+ Committed virtual memory: 918.62 MB
377
+ Total swap space: 4.88 GB
378
+ Free swap space: 3.19 GB
379
+ 2012-05-03 12:35:32.427+0000: JVM memory information:
380
+ Free memory: 85.02 MB
381
+ Total memory: 146.13 MB
382
+ Max memory: 444.50 MB
383
+ Garbage Collector: PS Scavenge: [PS Eden Space, PS Survivor Space]
384
+ Garbage Collector: PS MarkSweep: [PS Eden Space, PS Survivor Space, PS Old Gen, PS Perm Gen]
385
+ Memory Pool: Code Cache (Non-heap memory): committed=2.94 MB, used=2.81 MB, max=48.00 MB, threshold=0.00 B
386
+ Memory Pool: PS Eden Space (Heap memory): committed=99.25 MB, used=45.73 MB, max=155.38 MB, threshold=?
387
+ Memory Pool: PS Survivor Space (Heap memory): committed=5.63 MB, used=4.03 MB, max=5.63 MB, threshold=?
388
+ Memory Pool: PS Old Gen (Heap memory): committed=41.25 MB, used=11.35 MB, max=333.38 MB, threshold=0.00 B
389
+ Memory Pool: PS Perm Gen (Non-heap memory): committed=25.81 MB, used=25.75 MB, max=166.00 MB, threshold=0.00 B
390
+ 2012-05-03 12:35:32.434+0000: Operating system information:
391
+ Operating System: Linux; version: 3.0.0-17-generic; arch: amd64; cpus: 2
392
+ Max number of file descriptors: 4096
393
+ Number of open file descriptors: 59
394
+ Process id: 14573@andreas-dell
395
+ Byte order: LITTLE_ENDIAN
396
+ 2012-05-03 12:35:32.441+0000: JVM information:
397
+ VM Name: OpenJDK 64-Bit Server VM
398
+ VM Vendor: Oracle Corporation
399
+ VM Version: 21.0-b17
400
+ JIT compiler: HotSpot 64-Bit Tiered Compilers
401
+ VM Arguments: [-Djdk.home=, -Djruby.home=/home/andreas/.rvm/rubies/jruby-1.6.7, -Djruby.script=jruby, -Djruby.shell=/bin/sh, -Djffi.boot.library.path=/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/x86_64-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/i386-Linux, -Xmx500m, -Xss2048k, -Djruby.memory.max=500m, -Djruby.stack.max=2048k, -Xbootclasspath/a:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/jruby.jar]
402
+ 2012-05-03 12:35:32.442+0000: Java classpath:
403
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunpkcs11.jar
404
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/plugin.jar
405
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
406
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-kernel-1.7.jar
407
+ [bootstrap] /home/andreas/.rvm/rubies/jruby-1.6.7/lib/jruby.jar
408
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/charsets.jar
409
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/localedata.jar
410
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jsse.jar
411
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-udc-1.7.jar
412
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/sunrsasign.jar
413
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rhino.jar
414
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/dnsns.jar
415
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-graph-algo-1.7.jar
416
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/org.apache.servicemix.bundles.jline-0.9.94_1.jar
417
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/lucene-core-3.5.0.jar
418
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-cypher-1.7.jar
419
+ [loader.2] file:/usr/lib/x86_64-linux-gnu/jni/libjava-access-bridge-jni.so.0.0.0
420
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/geronimo-jta_1.1_spec-1.1.1.jar
421
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/scala-library-2.9.0-1.jar
422
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunjce_provider.jar
423
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/netx.jar
424
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/classes
425
+ [loader.2] file:/usr/share/java/gnome-java-bridge.jar
426
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/server-api-1.7.jar
427
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar
428
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/json-1.6.1-java/lib/json/ext/generator.jar
429
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/pulse-java.jar
430
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/json-1.6.1-java/lib/json/ext/parser.jar
431
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-graph-matching-1.7.jar
432
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-shell-1.7.jar
433
+ [bootstrap] /usr/lib/jvm/java-7-openjdk-common/jre/lib/resources.jar
434
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-jmx-1.7.jar
435
+ [classpath + loader.1] file:/home/andreas/projects/neo4j/lib/
436
+ [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-lucene-index-1.7.jar
437
+ [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/zipfs.jar
438
+ 2012-05-03 12:35:32.443+0000: Library path:
439
+ /usr/java/packages/lib/amd64
440
+ /usr/lib/x86_64-linux-gnu/jni
441
+ /lib/x86_64-linux-gnu
442
+ /usr/lib/x86_64-linux-gnu
443
+ /usr/lib/jni
444
+ /lib
445
+ /usr/lib
446
+ 2012-05-03 12:35:32.445+0000: System.properties:
447
+ jruby.home = /home/andreas/.rvm/rubies/jruby-1.6.7
448
+ sun.boot.library.path = /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64
449
+ path.separator = :
450
+ file.encoding.pkg = sun.io
451
+ user.country = US
452
+ sun.java.launcher = SUN_STANDARD
453
+ sun.os.patch.level = unknown
454
+ user.dir = /home/andreas/projects/neo4j/lib
455
+ jdk.home =
456
+ sun.jnu.encoding = UTF-8
457
+ jruby.memory.max = 500m
458
+ sun.management.compiler = HotSpot 64-Bit Tiered Compilers
459
+ jffi.boot.library.path = /home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/x86_64-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/i386-Linux
460
+ user.home = /home/andreas
461
+ user.timezone = Europe/Stockholm
462
+ file.encoding = UTF-8
463
+ jruby.stack.max = 2048k
464
+ jruby.script = jruby
465
+ user.name = andreas
466
+ jruby.shell = /bin/sh
467
+ sun.java.command = org/jruby/Main /home/andreas/.rvm/rubies/jruby-1.6.7/bin/irb
468
+ sun.arch.data.model = 64
469
+ user.language = en
470
+ awt.toolkit = sun.awt.X11.XToolkit
471
+ file.separator = /
472
+ sun.io.unicode.encoding = UnicodeLittle
473
+ sun.cpu.endian = little
474
+ sun.desktop = gnome
475
+ sun.cpu.isalist =
476
+ 2012-05-03 12:35:32.446+0000: Linux scheduler information:
477
+ none
478
+ none
479
+ none
480
+ none
481
+ none
482
+ none
483
+ none
484
+ none
485
+ none
486
+ none
487
+ none
488
+ none
489
+ none
490
+ none
491
+ none
492
+ none
493
+ none
494
+ none
495
+ none
496
+ none
497
+ none
498
+ none
499
+ none
500
+ none
501
+ noop deadline [cfq]
502
+ noop deadline [cfq]
503
+ 2012-05-03 12:35:32.449+0000: --- STARTUP diagnostics END ---
504
+ 2012-05-03 12:35:32.530+0000: Extension org.neo4j.kernel.KernelExtension[kernel jmx] loaded ok
505
+ 2012-05-03 12:35:32.818+0000: Extension org.neo4j.kernel.KernelExtension[shell] loaded ok
506
+ 2012-05-03 12:35:32.826+0000: Extension org.neo4j.kernel.KernelExtension[kernel udc] loaded ok
507
+ 2012-05-03 12:35:32.829+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions START ---
508
+ 2012-05-03 12:35:32.829+0000: Graph Database: org.neo4j.kernel.EmbeddedGraphDatabase StoreId[time:1336037517706, id:6041337887935692899, store version: 13561656364791302]
509
+ 2012-05-03 12:35:32.830+0000: Kernel version: Neo4j - Graph Database Kernel 1.7
510
+ 2012-05-03 12:35:32.830+0000: Neo4j component versions:
511
+ 2012-05-03 12:35:32.830+0000: Neo4j - Graph Database Kernel 1.7
512
+ 2012-05-03 12:35:32.830+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions END ---
513
+ 2012-05-03 12:35:32.832+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS START ---
514
+ 2012-05-03 12:35:32.833+0000: Store versions:
515
+ Store versions:
516
+ NeoStore v0.A.0
517
+ NodeStore v0.A.0
518
+ RelationshipStore v0.A.0
519
+ RelationshipTypeStore v0.A.0
520
+ PropertyStore v0.A.0
521
+ PropertyIndexStore v0.A.0
522
+ StringPropertyStore v0.A.0
523
+ ArrayPropertyStore v0.A.0
524
+ 2012-05-03 12:35:32.833+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS END ---
525
+ 2012-05-03 12:35:32.833+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE START ---
526
+ 2012-05-03 12:35:32.833+0000: Id usage:
527
+ Id usage:
528
+ NodeStore: used=1 high=0
529
+ RelationshipStore: used=0 high=-1
530
+ RelationshipTypeStore: used=0 high=-1
531
+ PropertyStore: used=0 high=-1
532
+ PropertyIndexStore: used=0 high=-1
533
+ StringPropertyStore: used=1 high=0
534
+ ArrayPropertyStore: used=1 high=0
535
+ 2012-05-03 12:35:32.833+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE END ---
536
+ 2012-05-03 12:35:32.833+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles START ---
537
+ 2012-05-03 12:35:32.833+0000: Storage files:
538
+ neostore.relationshiptypestore.db.names: 38.00 B
539
+ neostore.id: 9.00 B
540
+ neostore.relationshiptypestore.db.names.id: 9.00 B
541
+ neostore.nodestore.db.id: 9.00 B
542
+ nioneo_logical.log.1: 16.00 B
543
+ neostore.propertystore.db.index: 0.00 B
544
+ neostore.propertystore.db.strings.id: 9.00 B
545
+ nioneo_logical.log.active: 4.00 B
546
+ neostore.propertystore.db.strings: 128.00 B
547
+ neostore.relationshiptypestore.db.id: 9.00 B
548
+ neostore: 54.00 B
549
+ neostore.nodestore.db: 9.00 B
550
+ neostore.propertystore.db.index.keys.id: 9.00 B
551
+ neostore.propertystore.db.arrays.id: 9.00 B
552
+ messages.log: 26.29 kB
553
+ neostore.relationshipstore.db.id: 9.00 B
554
+ neostore.propertystore.db.arrays: 128.00 B
555
+ neostore.relationshipstore.db: 0.00 B
556
+ neostore.propertystore.db.index.id: 9.00 B
557
+ neostore.propertystore.db.id: 9.00 B
558
+ neostore.propertystore.db: 0.00 B
559
+ index:
560
+ lucene-store.db: 40.00 B
561
+ lucene.log.1: 16.00 B
562
+ lucene.log.active: 4.00 B
563
+ - Total: 60.00 B
564
+ tm_tx_log.1: 0.00 B
565
+ neostore.relationshiptypestore.db: 0.00 B
566
+ lock: 0.00 B
567
+ active_tx_log: 11.00 B
568
+ neostore.propertystore.db.index.keys: 38.00 B
569
+ 2012-05-03 12:35:32.836+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles END ---
570
+ 2012-05-03 12:35:32.838+0000: Started - database is now available
571
+ 2012-05-03 12:35:32.842+0000: GC Monitor started.
572
+ 2012-05-03 15:35:33.120+0000: GC Monitor: Application threads blocked for an additional 124ms [total block time: 0.124s]
573
+ 2012-05-03 16:35:33.241+0000: GC Monitor: Application threads blocked for an additional 111ms [total block time: 0.235s]
574
+ 2012-05-03 17:35:33.360+0000: GC Monitor: Application threads blocked for an additional 119ms [total block time: 0.354s]
575
+ 2012-05-03 19:35:33.600+0000: GC Monitor: Application threads blocked for an additional 103ms [total block time: 0.457s]
576
+ 2012-05-03 20:35:33.719+0000: GC Monitor: Application threads blocked for an additional 103ms [total block time: 0.56s]
577
+ 2012-05-03 20:59:24.476+0000: Stopping - database is now unavailable
578
+ 2012-05-03 20:59:24.553+0000: GC Monitor stopped.
579
+ 2012-05-03 20:59:24.644+0000: TM shutting down
Binary file
Binary file
Binary file
@@ -12,6 +12,7 @@ require 'active_support/core_ext/class/attribute'
12
12
 
13
13
  require 'active_model'
14
14
 
15
+ require 'neo4j/version'
15
16
  require 'neo4j-core'
16
17
  require 'neo4j-wrapper'
17
18
 
@@ -20,4 +21,3 @@ require 'neo4j/rails/rails'
20
21
  require 'neo4j/paginated'
21
22
 
22
23
  require 'orm_adapter/adapters/neo4j'
23
- Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake) && respond_to?(:namespace)
@@ -0,0 +1,2 @@
1
+ Dir["#{File.dirname(__FILE__)}/*/*.rake"].each { |f| load f }
2
+ #require File.join(File.dirname(__FILE__), "upgrade_v2", "upgrade_v2")
@@ -1,43 +1,38 @@
1
- # A script for renaming relationship
2
- # In Ne4j.rb version 2.0.0 the relationship declared with has_n(something).to(otherclass)
3
- # has changed. In order to change the relationship of an already existing database you can run this script.
4
- # Use the migrate_all! to automatically update all Neo4j::Rails::Model classes
5
- # For Neo4j::NodeMixin nodes you need to migrate each node using the migrate method (since there are no automatic way of finding all instances of an Neo4j::NodeMixin)
6
-
7
- $NEO4J_CLASSES = []
8
- $DOMAIN_CLASSES = []
9
-
10
1
  module Neo4j
11
- module Rails
12
- class Model
13
- class << self
14
- alias_method :_old_inherited, :inherited
15
-
16
- def inherited(c)
17
- _old_inherited(c)
18
- unless c == Neo4j::Rails::Model
19
- $NEO4J_CLASSES << c
20
- $DOMAIN_CLASSES << c if c.respond_to?(:ref_node_for_class)
21
- end
22
- end
23
- end
24
- end
25
- end
26
- end
27
-
28
- module Neo4j
29
- module UpgradeV2 #:nodoc:
2
+ # A script for renaming relationship
3
+ # In Neo4j.rb version 2.0.0 the relationship declared with has_n(something).to(otherclass)
4
+ # has changed. In order to change the relationship of an already existing database you can run this script.
5
+ # Uses the @NEO4J_CLASSES@ and @NEO4J_MULTI_TENANCY_CLASSES@ environment variables.
6
+ # Usage see the github wiki pages upgrade
7
+ module UpgradeV2
30
8
 
31
9
  class << self
32
10
 
33
11
  # The domain classes declared as global ref_nodes
34
12
  def default_domains_nodes
35
13
  domain_nodes = [Neo4j.default_ref_node]
36
- $DOMAIN_CLASSES.each{|clazz| domain_nodes += clazz._all.to_a}
14
+ multi_tenancy_classes.each{|clazz| domain_nodes += clazz._all.to_a}
37
15
  domain_nodes
38
16
  end
39
17
 
18
+ def neo4j_classes
19
+ if ENV['NEO4J_CLASSES']
20
+ ENV['NEO4J_CLASSES'].split(',').map(&:strip).map{|c| Neo4j::Wrapper.to_class(c)}
21
+ else
22
+ Neo4j::Rails::Model::OrmAdapter.model_classes
23
+ end
24
+ end
25
+
26
+ def multi_tenancy_classes
27
+ (ENV['NEO4J_MULTI_TENANCY_CLASSES'] && ENV['NEO4J_MULTI_TENANCY_CLASSES'].split(',').map(&:strip).map{|c| Neo4j::Wrapper.to_class(c)}) || []
28
+ end
29
+
40
30
  def migrate_all!(domains = default_domains_nodes)
31
+ $NEO4J_CLASSES ||= neo4j_classes
32
+
33
+ puts "Upgrading #{$NEO4J_CLASSES.join(', ')}"
34
+ puts "Number of domains (multitenancy) #{domains.size}"
35
+
41
36
  domains.each do |domain|
42
37
  puts "domain #{domain.props.inspect} (multitenancy) " if domain != Neo4j.default_ref_node
43
38
  ::Neo4j.threadlocal_ref_node = domain
@@ -46,9 +41,19 @@ module Neo4j
46
41
  end
47
42
 
48
43
  def migrate(clazz, nodes = clazz._all)
49
- puts "migrate #{clazz} ..."
44
+ puts "migrate 2.0 #{clazz} ..."
50
45
  source_class = clazz
51
46
 
47
+ rule_node = Neo4j::Wrapper::Rule::Rule.rule_node_for(clazz).rule_node
48
+
49
+ if rule_node.property?(:_count__all__classname)
50
+ puts "Rename size property on #{clazz}, #{rule_node[:_count__all__classname]}"
51
+ Neo4j::Transaction.run do
52
+ rule_node[:_size__all__classname] = rule_node[:_count__all__classname]
53
+ rule_node[:_count__all__classname] = nil
54
+ end
55
+ end
56
+
52
57
  clazz._decl_rels.keys.each do |rel_accessor|
53
58
  target_class = clazz._decl_rels[rel_accessor].target_class
54
59
  next unless target_class
@@ -1,3 +1,5 @@
1
+ puts "LOADING UPGRADE SCRIPT Neo4j"
2
+
1
3
  require File.join(File.dirname(__FILE__), "lib", "upgrade_v2")
2
4
 
3
5
  namespace(:neo4j) do
@@ -1,3 +1,3 @@
1
1
  module Neo4j
2
- VERSION = "2.0.0.alpha.9"
2
+ VERSION = "2.0.0"
3
3
  end
@@ -32,5 +32,5 @@ It comes included with the Apache Lucene document database.
32
32
  s.add_dependency('orm_adapter', ">= 0.0.3")
33
33
  s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
34
34
  s.add_dependency("railties", ">= 3.0.0", "< 3.3")
35
- s.add_dependency("neo4j-wrapper", '0.0.11')
35
+ s.add_dependency("neo4j-wrapper", '2.0.0')
36
36
  end
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: neo4j
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: 6
5
- version: 2.0.0.alpha.9
4
+ prerelease:
5
+ version: 2.0.0
6
6
  platform: java
7
7
  authors:
8
8
  - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-04-27 00:00:00 Z
13
+ date: 2012-05-07 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: orm_adapter
@@ -59,7 +59,7 @@ dependencies:
59
59
  requirements:
60
60
  - - "="
61
61
  - !ruby/object:Gem::Version
62
- version: 0.0.11
62
+ version: 2.0.0
63
63
  type: :runtime
64
64
  version_requirements: *id004
65
65
  description: |
@@ -90,12 +90,13 @@ files:
90
90
  - lib/generators/neo4j.rb
91
91
  - lib/generators/neo4j/model/model_generator.rb
92
92
  - lib/generators/neo4j/model/templates/model.erb
93
- - lib/tasks/upgrade_v2/upgrade_v2.rake
94
- - lib/tasks/upgrade_v2/lib/upgrade_v2.rb
95
93
  - lib/orm_adapter/adapters/neo4j.rb
96
94
  - lib/neo4j/paginated.rb
97
95
  - lib/neo4j/version.rb
98
96
  - lib/neo4j/type_converters/serialize_converter.rb
97
+ - lib/neo4j/tasks/neo4j.rb
98
+ - lib/neo4j/tasks/upgrade_v2/upgrade_v2.rake
99
+ - lib/neo4j/tasks/upgrade_v2/lib/upgrade_v2.rb
99
100
  - lib/neo4j/rails/attributes.rb
100
101
  - lib/neo4j/rails/rack_middleware.rb
101
102
  - lib/neo4j/rails/model.rb
@@ -130,6 +131,7 @@ files:
130
131
  - lib/db/neostore.id
131
132
  - lib/db/neostore.relationshiptypestore.db.names.id
132
133
  - lib/db/neostore.nodestore.db.id
134
+ - lib/db/nioneo_logical.log.1
133
135
  - lib/db/neostore.propertystore.db.index
134
136
  - lib/db/neostore.propertystore.db.strings.id
135
137
  - lib/db/nioneo_logical.log.active
@@ -145,7 +147,6 @@ files:
145
147
  - lib/db/neostore.relationshipstore.db
146
148
  - lib/db/neostore.propertystore.db.index.id
147
149
  - lib/db/neostore.propertystore.db.id
148
- - lib/db/index.db
149
150
  - lib/db/neostore.propertystore.db
150
151
  - lib/db/tm_tx_log.1
151
152
  - lib/db/neostore.relationshiptypestore.db
@@ -153,17 +154,8 @@ files:
153
154
  - lib/db/active_tx_log
154
155
  - lib/db/neostore.propertystore.db.index.keys
155
156
  - lib/db/index/lucene-store.db
157
+ - lib/db/index/lucene.log.1
156
158
  - lib/db/index/lucene.log.active
157
- - lib/db/index/lucene/node/Person_fulltext/_0.fdx
158
- - lib/db/index/lucene/node/Person_fulltext/segments.gen
159
- - lib/db/index/lucene/node/Person_fulltext/_0.frq
160
- - lib/db/index/lucene/node/Person_fulltext/_0.nrm
161
- - lib/db/index/lucene/node/Person_fulltext/_0.fdt
162
- - lib/db/index/lucene/node/Person_fulltext/_0.tis
163
- - lib/db/index/lucene/node/Person_fulltext/_0.tii
164
- - lib/db/index/lucene/node/Person_fulltext/segments_1
165
- - lib/db/index/lucene/node/Person_fulltext/_0.prx
166
- - lib/db/index/lucene/node/Person_fulltext/_0.fnm
167
159
  - config/locales/en.yml
168
160
  - config/neo4j/config.yml
169
161
  - README.rdoc
@@ -194,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
194
186
  required_rubygems_version: !ruby/object:Gem::Requirement
195
187
  none: false
196
188
  requirements:
197
- - - ">"
189
+ - - ">="
198
190
  - !ruby/object:Gem::Version
199
- version: 1.3.1
191
+ version: "0"
200
192
  requirements: []
201
193
 
202
194
  rubyforge_project: neo4j
Binary file
@@ -1 +0,0 @@
1
- ����_id_name_ename