From 14ef92fb3a2185b4b37e15ee41415320e75ee300 Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Wed, 16 Jan 2019 15:39:03 +0100
Subject: [PATCH] Update to 3.5.1

---
 pom.xml                                     | 23 +++++++++++++++++++--
 src/main/java/org/neo4j/tool/StoreCopy.java | 17 ++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index a759735..39e949b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>store-util</artifactId>
-    <version>3.4.5</version>
+    <version>3.5.1</version>
     <packaging>jar</packaging>
 
     <name>store-util</name>
@@ -30,9 +30,18 @@
     <profiles>
         <profile>
             <id>enterprise</id>
+
+
+            <repositories>
+                <repository>
+                    <id>neo4j-enterprise</id>
+                    <url>http://m2.neo4j.com/enterprise</url>
+                </repository>
+            </repositories>
+
             <dependencies>
                 <dependency>
-                    <groupId>org.neo4j</groupId>
+                    <groupId>com.neo4j</groupId>
                     <artifactId>neo4j-enterprise</artifactId>
                     <version>${neo4j.version}</version>
                 </dependency>
@@ -54,6 +63,16 @@
             <artifactId>neo4j-io</artifactId>
             <version>${neo4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-common</artifactId>
+            <version>${neo4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j</artifactId>
+            <version>${neo4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-kernel</artifactId>
diff --git a/src/main/java/org/neo4j/tool/StoreCopy.java b/src/main/java/org/neo4j/tool/StoreCopy.java
index f2610f6..8dcd8b6 100644
--- a/src/main/java/org/neo4j/tool/StoreCopy.java
+++ b/src/main/java/org/neo4j/tool/StoreCopy.java
@@ -1,9 +1,9 @@
 package org.neo4j.tool;
 
-import org.neo4j.collection.primitive.Primitive;
-import org.neo4j.collection.primitive.PrimitiveLongLongMap;
+import org.eclipse.collections.api.map.primitive.LongLongMap;
+import org.eclipse.collections.api.map.primitive.MutableLongLongMap;
+import org.eclipse.collections.impl.map.mutable.primitive.LongLongHashMap;
 import org.neo4j.graphdb.*;
-import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.MapUtil;
@@ -15,6 +15,7 @@
 import org.neo4j.unsafe.batchinsert.*;
 import org.neo4j.unsafe.batchinsert.internal.*;
 import org.neo4j.values.storable.Value;
+import org.neo4j.graphdb.factory.*;
 
 import java.io.*;
 import java.lang.reflect.Field;
@@ -78,7 +79,7 @@ private static void copyStore(String sourceDir, String targetDir, Set<String> ig
 
         logs = new PrintWriter(new FileWriter(new File(target, "store-copy.log")));
 
-        PrimitiveLongLongMap copiedNodeIds = copyNodes(sourceDb, targetDb, ignoreProperties, ignoreLabels, deleteNodesWithLabels, highestIds.first(),flusher, stableNodeIds);
+        LongLongMap copiedNodeIds = copyNodes(sourceDb, targetDb, ignoreProperties, ignoreLabels, deleteNodesWithLabels, highestIds.first(),flusher, stableNodeIds);
         copyRelationships(sourceDb, targetDb, ignoreRelTypes, ignoreProperties, copiedNodeIds, highestIds.other(), flusher);
         targetDb.shutdown();
         try {
@@ -136,7 +137,7 @@ private static void copyIndex(File source, File target) throws IOException {
         }
     }
 
-    private static void copyRelationships(BatchInserter sourceDb, BatchInserter targetDb, Set<String> ignoreRelTypes, Set<String> ignoreProperties, PrimitiveLongLongMap copiedNodeIds, long highestRelId, Flusher flusher) {
+    private static void copyRelationships(BatchInserter sourceDb, BatchInserter targetDb, Set<String> ignoreRelTypes, Set<String> ignoreProperties, LongLongMap copiedNodeIds, long highestRelId, Flusher flusher) {
         long time = System.currentTimeMillis();
         long relId = 0;
         long notFound = 0;
@@ -198,7 +199,7 @@ private static void flushCache(BatchInserter sourceDb, long node) {
         }
     }
 
-    private static boolean createRelationship(BatchInserter targetDb, BatchInserter sourceDb, BatchRelationship rel, Set<String> ignoreProperties, PrimitiveLongLongMap copiedNodeIds) {
+    private static boolean createRelationship(BatchInserter targetDb, BatchInserter sourceDb, BatchRelationship rel, Set<String> ignoreProperties, LongLongMap copiedNodeIds) {
         long startNodeId = copiedNodeIds.get(rel.getStartNode());
         long endNodeId = copiedNodeIds.get(rel.getEndNode());
         if (startNodeId == -1L || endNodeId == -1L) return false;
@@ -214,8 +215,8 @@ private static boolean createRelationship(BatchInserter targetDb, BatchInserter
         }
     }
 
-    private static PrimitiveLongLongMap copyNodes(BatchInserter sourceDb, BatchInserter targetDb, Set<String> ignoreProperties, Set<String> ignoreLabels, Set<String> deleteNodesWithLabels, long highestNodeId, Flusher flusher, boolean stableNodeIds) {
-        PrimitiveLongLongMap copiedNodes = Primitive.offHeapLongLongMap();
+    private static LongLongMap copyNodes(BatchInserter sourceDb, BatchInserter targetDb, Set<String> ignoreProperties, Set<String> ignoreLabels, Set<String> deleteNodesWithLabels, long highestNodeId, Flusher flusher, boolean stableNodeIds) {
+        MutableLongLongMap copiedNodes = stableNodeIds ? new LongLongHashMap() : new LongLongHashMap((int)highestNodeId);
         long time = System.currentTimeMillis();
         long node = 0;
         long notFound = 0;