first implementation of backward compatible database delegate

orientechnologies · Oct 6, 2016 · 8f2cc03 · 8f2cc03
1 parent 9111304
commit 8f2cc03
Show file tree

Hide file tree

Showing 15 changed files with 4,569 additions and 3,569 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseDocumentInternal.java b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseDocumentInternal.java
@@ -36,6 +36,8 @@
 import com.orientechnologies.orient.core.storage.ORecordCallback;
 import com.orientechnologies.orient.core.storage.OStorage;
 
+import java.util.Set;
+
 public interface ODatabaseDocumentInternal extends ODatabaseDocument, ODatabaseInternal<ORecord> {
 
   /**
@@ -89,6 +91,8 @@ void executeDeleteRecord(OIdentifiable record, final int iVersion, final boolean
 
   ODatabaseDocumentInternal copy();
 
+  Set<ORecord> executeReadRecords(final Set<ORecordId> iRids, final boolean ignoreCache);
+
   void checkIfActive();
 
   void callOnOpenListeners();

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/OEmbeddedDBFactory.java b/core/src/main/java/com/orientechnologies/orient/core/db/OEmbeddedDBFactory.java
@@ -151,7 +151,7 @@ public synchronized void create(String name, String user, String password, Datab
         config = solveConfig(config);
         OAbstractPaginatedStorage storage;
         if (type == DatabaseType.MEMORY) {
-          storage = (OAbstractPaginatedStorage) memory.createStorage(buildName(name), new HashMap<>());
+          storage = (OAbstractPaginatedStorage) memory.createStorage(name, new HashMap<>());
         } else {
           storage = (OAbstractPaginatedStorage) disk.createStorage(buildName(name), new HashMap<>());
         }
@@ -196,24 +196,6 @@ private void internalCreate(OrientDBConfig config, OAbstractPaginatedStorage sto
     }
   }
 
-  private void internalCreate(OrientDBConfig config, OAbstractPaginatedStorage storage) {
-    storage.create(config.getConfigurations());
-    ORecordSerializer serializer = ORecordSerializerFactory.instance().getDefaultRecordSerializer();
-    if (serializer.toString().equals("ORecordDocument2csv"))
-      throw new ODatabaseException("Impossible to create the database with ORecordDocument2csv serializer");
-    storage.getConfiguration().setRecordSerializer(serializer.toString());
-    storage.getConfiguration().setRecordSerializerVersion(serializer.getCurrentVersion());
-    // since 2.1 newly created databases use strict SQL validation by default
-    storage.getConfiguration().setProperty(OStatement.CUSTOM_STRICT_SQL, "true");
-
-    storage.getConfiguration().update();
-
-    try (final ODatabaseDocumentEmbedded embedded = new ODatabaseDocumentEmbedded(storage)) {
-      embedded.setSerializer(serializer);
-      embedded.internalCreate(config);
-    }
-  }
-
   @Override
   public synchronized boolean exists(String name, String user, String password) {
     if (!storages.containsKey(name)) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/OPartitionedDatabasePool.java b/core/src/main/java/com/orientechnologies/orient/core/db/OPartitionedDatabasePool.java
@@ -91,6 +91,7 @@ public class OPartitionedDatabasePool extends OOrientListenerAbstract implements
   private volatile boolean closed     = false;
   private          boolean autoCreate = false;
 
+
   public OPartitionedDatabasePool(String url, String userName, String password) {
     this(url, userName, password, Runtime.getRuntime().availableProcessors(), -1);
   }
@@ -412,7 +413,7 @@ private final class DatabaseDocumentTxPooled extends ODatabaseDocumentTx {
     private PoolPartition partition;
 
     private DatabaseDocumentTxPooled(String iURL) {
-      super(iURL, true, false);
+      super(iURL);
     }
 
     @Override

diff --git a/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java b/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java
@@ -44,7 +44,7 @@
 /**
  * Created by tglman on 27/06/16.
  */
-public class ODatabaseDocumentEmbedded extends ODatabaseDocumentTx {
+public class ODatabaseDocumentEmbedded extends ODatabaseDocumentTxOrig {
 
   private OrientDBConfig config;
 

diff --git a/.../src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentRemote.java b/.../src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentRemote.java
@@ -42,7 +42,7 @@
 /**
  * Created by tglman on 30/06/16.
  */
-public class ODatabaseDocumentRemote extends ODatabaseDocumentTx {
+public class ODatabaseDocumentRemote extends ODatabaseDocumentTxOrig {
 
   private OrientDBConfig config;