fix:corrected issue for preserving cluster ids when importing with preserve rids

Author: tglman

core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImport.java

@@ -1041,7 +1041,7 @@ private long importClusters() throws ParseException, IOException {
         // CREATE IT
         if (!preserveClusterIDs) createdClusterId = database.addCluster(name);
         else if (getDatabase().getClusterNameById(clusterIdFromJson) == null) {
-          createdClusterId = database.addCluster(name, clusterIdFromJson, null);
+          createdClusterId = database.addCluster(name, clusterIdFromJson);
           assert createdClusterId == clusterIdFromJson;
         } else {
           createdClusterId = database.addCluster(name);
@@ -1055,7 +1055,7 @@ else if (getDatabase().getClusterNameById(clusterIdFromJson) == null) {
           if (database.countClusterElements(createdClusterId - 1) == 0) {
             listener.onMessage("Found previous version: migrating old clusters...");
             database.dropCluster(name);
-            database.addCluster("temp_" + createdClusterId, null);
+            database.addCluster("temp_" + createdClusterId);
             createdClusterId = database.addCluster(name);
           } else
             throw new OConfigurationException(
@@ -1078,7 +1078,7 @@ else if (getDatabase().getClusterNameById(clusterIdFromJson) == null) {
             ((OClassEmbedded) clazz).removeClusterId(createdClusterId, true);
 
           database.dropCluster(createdClusterId);
-          createdClusterId = database.addCluster(name, clusterIdFromJson, null);
+          createdClusterId = database.addCluster(name, clusterIdFromJson);
         }
       }
       clusterToClusterMapping.put(clusterIdFromJson, createdClusterId);

core/src/test/java/com/orientechnologies/orient/core/db/tool/ODatabaseImportTest.java

@@ -8,6 +8,7 @@
 import com.orientechnologies.orient.core.db.ODatabaseSession;
 import com.orientechnologies.orient.core.db.OrientDB;
 import com.orientechnologies.orient.core.id.ORID;
+import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.record.ORecord;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -162,4 +163,71 @@ public void onMessage(String iText) {}
     orientDB.drop(databaseName);
     orientDB.close();
   }
+
+  @Test
+  public void importPreserveClusterIdWithRids() throws IOException {
+    final String databaseName = "testClusters";
+    final String exportDbUrl =
+        "embedded:target/export_"
+            + ODatabaseImportTest.class.getSimpleName()
+            + "_preserveRidsClusters";
+    final OrientDB orientDB =
+        OCreateDatabaseUtil.createDatabase(
+            databaseName, exportDbUrl, OCreateDatabaseUtil.TYPE_PLOCAL);
+    ORID toCheck;
+    final ByteArrayOutputStream output = new ByteArrayOutputStream();
+    try (final ODatabaseSession db =
+        orientDB.open(databaseName, "admin", OCreateDatabaseUtil.NEW_ADMIN_PASSWORD)) {
+      OClass cl = db.createClass("SimpleClass");
+      // Create gaps in the id of the clusters to make sure that it not pass just by chance
+      int[] prev = cl.getClusterIds();
+      int id = db.addCluster("simpleNewCluster");
+      int id1 = db.addCluster("simpleNewCluster1");
+      cl.addClusterId(id);
+      cl.addClusterId(id1);
+      for (int pid : prev) {
+        cl.removeClusterId(pid);
+        db.dropCluster(pid);
+      }
+      db.save(db.newElement("SimpleClass"));
+      ORID toDelete = db.save(db.newElement("SimpleClass")).getIdentity();
+      toCheck = db.save(db.newElement("SimpleClass")).getIdentity();
+      db.delete(toDelete);
+
+      final ODatabaseExport export =
+          new ODatabaseExport(
+              (ODatabaseDocumentInternal) db,
+              output,
+              new OCommandOutputListener() {
+                @Override
+                public void onMessage(String iText) {}
+              });
+      export.exportDatabase();
+    }
+
+    final String importDbUrl =
+        "embedded:target/import_"
+            + ODatabaseImportTest.class.getSimpleName()
+            + "_preserveRidsClusters";
+    OCreateDatabaseUtil.createDatabase(databaseName, importDbUrl, OCreateDatabaseUtil.TYPE_PLOCAL);
+
+    try (final ODatabaseSession db =
+        orientDB.open(databaseName, "admin", OCreateDatabaseUtil.NEW_ADMIN_PASSWORD)) {
+      final ODatabaseImport importer =
+          new ODatabaseImport(
+              (ODatabaseDocumentInternal) db,
+              new ByteArrayInputStream(output.toByteArray()),
+              new OCommandOutputListener() {
+                @Override
+                public void onMessage(String iText) {}
+              });
+      importer.setPreserveRids(true);
+      importer.importDatabase();
+      ORecord read = db.load(toCheck);
+      assertNotNull(read);
+      Assert.assertEquals(read.getIdentity(), toCheck);
+    }
+    orientDB.drop(databaseName);
+    orientDB.close();
+  }
 }