Import database: new -merge params to avoid deleting existent classes/clusters

lvca · lvca · commit c21dea35b2d5 · 2013-11-13T11:01:59.000+01:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImport.java b/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImport.java
@@ -98,6 +98,7 @@ public class ODatabaseImport extends ODatabaseImpExpAbstract {
   private OIndex<OIdentifiable>      exportImportHashTable;
 
   private boolean                    preserveClusterIDs     = true;
+  private boolean                    merge                  = false;
 
   private Set<String>                indexesToRebuild       = new HashSet<String>();
 
@@ -141,6 +142,8 @@ protected void parseSetting(final String option, final List<String> items) {
       deleteRIDMapping = Boolean.parseBoolean(items.get(0));
     else if (option.equalsIgnoreCase("-preserveClusterIDs"))
       preserveClusterIDs = Boolean.parseBoolean(items.get(0));
+    else if (option.equalsIgnoreCase("-merge"))
+      merge = Boolean.parseBoolean(items.get(0));
     else
       super.parseSetting(option, items);
   }
@@ -160,12 +163,13 @@ public ODatabaseImport importDatabase() {
 
       database.setStatus(STATUS.IMPORTING);
 
-      for (OIndex index : database.getMetadata().getIndexManager().getIndexes()) {
+      for (OIndex<?> index : database.getMetadata().getIndexManager().getIndexes()) {
         if (index.isAutomatic())
           indexesToRebuild.add(index.getName().toLowerCase());
       }
 
-      removeDefaultNonSecurityClasses();
+      if (!merge)
+        removeDefaultNonSecurityClasses();
 
       String tag;
       while (jsonReader.hasNext() && jsonReader.lastChar() != '}') {
@@ -214,7 +218,7 @@ else if (tag.equals("manualIndexes"))
   }
 
   private void removeDefaultNonSecurityClasses() {
-    listener.onMessage("\nRemoving all default non security classes");
+    listener.onMessage("\nNon merge mode (-merge=false): removing all default non security classes");
 
     OSchema schema = database.getMetadata().getSchema();
     Collection<OClass> classes = schema.getClasses();
@@ -233,18 +237,20 @@ private void removeDefaultNonSecurityClasses() {
       }
     }
 
+    int removedClasses = 0;
     for (String className : classesSortedByInheritance) {
       if (!className.equalsIgnoreCase(ORole.CLASS_NAME) && !className.equalsIgnoreCase(OUser.CLASS_NAME)
           && !className.equalsIgnoreCase(OSecurityShared.IDENTITY_CLASSNAME)) {
         schema.dropClass(className);
-        listener.onMessage("\nClass " + className + " was removed.");
+        removedClasses++;
+        listener.onMessage("\n- Class " + className + " was removed.");
       }
     }
 
     schema.save();
     schema.reload();
 
-    listener.onMessage("\nRemoving all default non security classes ... DONE.");
+    listener.onMessage("\nRemoved " + removedClasses + " classes.");
   }
 
   private void importInfo() throws IOException, ParseException {
diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
@@ -1522,7 +1522,7 @@ public void importDatabase(@ConsoleParameter(name = "options", description = "Im
       throws IOException {
     checkForDatabase();
 
-    message("\nImporting database " + text + "...");
+    message("\nImporting " + text + "...");
 
     final List<String> items = OStringSerializerHelper.smartSplit(text, ' ');
     final String fileName = items.size() <= 0 || (items.get(1)).charAt(0) == '-' ? null : items.get(1);
