removed reference to ODatabaseDocumentTx an replaced with ODatabaseD…

…ocument/ODatabaseDocumentInternal where possible.

core/src/main/java/com/orientechnologies/orient/core/cache/OCommandCacheHook.java

@@ -19,6 +19,7 @@
  */
 package com.orientechnologies.orient.core.cache;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.hook.ORecordHookAbstract;
 import com.orientechnologies.orient.core.record.ORecord;
@@ -30,10 +31,10 @@
  */
 public class OCommandCacheHook extends ORecordHookAbstract {
 
-  private final OCommandCache       cmdCache;
-  private final ODatabaseDocumentTx database;
+  private final OCommandCache     cmdCache;
+  private final ODatabaseDocument database;
 
-  public OCommandCacheHook(final ODatabaseDocumentTx iDatabase) {
+  public OCommandCacheHook(final ODatabaseDocument iDatabase) {
     database = iDatabase;
     cmdCache = iDatabase.getMetadata().getCommandCache().isEnabled() ? iDatabase.getMetadata().getCommandCache() : null;
   }

core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseDocumentInternal.java

@@ -23,6 +23,12 @@
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.record.OCurrentStorageComponentsFactory;
 import com.orientechnologies.orient.core.db.record.ridbag.sbtree.OSBTreeCollectionManager;
+import com.orientechnologies.orient.core.exception.ORecordNotFoundException;
+import com.orientechnologies.orient.core.id.ORID;
+import com.orientechnologies.orient.core.id.ORecordId;
+import com.orientechnologies.orient.core.metadata.OMetadata;
+import com.orientechnologies.orient.core.metadata.OMetadataDefault;
+import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.serialization.serializer.binary.OBinarySerializerFactory;
 import com.orientechnologies.orient.core.serialization.serializer.record.ORecordSerializer;
@@ -53,4 +59,11 @@ public interface ODatabaseDocumentInternal extends ODatabaseDocument, ODatabaseI
 
   int assignAndCheckCluster(ORecord record, String iClusterName);
 
+  <RET extends ORecord> RET loadIfVersionIsNotLatest(final ORID rid, final int recordVersion, String fetchPlan, boolean ignoreCache)
+      throws ORecordNotFoundException;
+
+  void reloadUser();
+
+  @Override
+  OMetadataInternal getMetadata();
 }

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

@@ -24,6 +24,7 @@
 
 import com.orientechnologies.common.io.OIOUtils;
 import com.orientechnologies.orient.core.command.OCommandOutputListener;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.serialization.serializer.OStringSerializerHelper;
 
@@ -34,7 +35,7 @@
  */
 public abstract class ODatabaseTool implements Runnable {
   protected OCommandOutputListener output;
-  protected ODatabaseDocumentTx    database;
+  protected ODatabaseDocument      database;
   protected boolean verbose = false;
 
   protected abstract void parseSetting(final String option, final List<String> items);
@@ -67,7 +68,7 @@ public ODatabaseTool setOutputListener(final OCommandOutputListener iListener) {
     return this;
   }
 
-  public ODatabaseTool setDatabase(final ODatabaseDocumentTx iDatabase) {
+  public ODatabaseTool setDatabase(final ODatabaseDocument iDatabase) {
     database = iDatabase;
     return this;
   }

core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java

@@ -318,7 +318,7 @@ public void recreateIndexes() {
       document.copyTo(doc);
 
       // USE A NEW DB INSTANCE
-      final ODatabaseDocumentTx newDb = new ODatabaseDocumentTx(db.getURL());
+      final ODatabaseDocumentInternal newDb = new ODatabaseDocumentTx(db.getURL());
 
       Runnable recreateIndexesTask = new RecreateIndexesTask(newDb, doc);
 
@@ -492,12 +492,12 @@ public void removeClassPropertyIndex(final OIndex<?> idx) {
   }
 
   private class RecreateIndexesTask implements Runnable {
-    private final ODatabaseDocumentTx newDb;
-    private final ODocument           doc;
-    private int                       ok;
-    private int                       errors;
+    private final ODatabaseDocumentInternal newDb;
+    private final ODocument                 doc;
+    private       int                       ok;
+    private       int                       errors;
 
-    public RecreateIndexesTask(ODatabaseDocumentTx newDb, ODocument doc) {
+    public RecreateIndexesTask(ODatabaseDocumentInternal newDb, ODocument doc) {
       this.newDb = newDb;
       this.doc = doc;
     }

core/src/main/java/com/orientechnologies/orient/core/iterator/ORecordIteratorCluster.java

@@ -36,19 +36,19 @@
 public class ORecordIteratorCluster<REC extends ORecord> extends OIdentifiableIterator<REC> {
   private ORecord currentRecord;
 
-  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentTx iLowLevelDatabase,
+  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentInternal iLowLevelDatabase,
       final int iClusterId) {
     this(iDatabase, iLowLevelDatabase, iClusterId, ORID.CLUSTER_POS_INVALID, ORID.CLUSTER_POS_INVALID, false,
         OStorage.LOCKING_STRATEGY.DEFAULT);
   }
 
-  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentTx iLowLevelDatabase,
+  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentInternal iLowLevelDatabase,
       final int iClusterId, final long firstClusterEntry, final long lastClusterEntry) {
     this(iDatabase, iLowLevelDatabase, iClusterId, firstClusterEntry, lastClusterEntry, false, OStorage.LOCKING_STRATEGY.NONE);
   }
 
   @Deprecated
-  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentTx iLowLevelDatabase,
+  public ORecordIteratorCluster(final ODatabaseDocumentInternal iDatabase, final ODatabaseDocumentInternal iLowLevelDatabase,
       final int iClusterId, final long firstClusterEntry, final long lastClusterEntry, final boolean iterateThroughTombstones,
       final OStorage.LOCKING_STRATEGY iLockingStrategy) {
     super(iDatabase, iLowLevelDatabase, iterateThroughTombstones, iLockingStrategy);

core/src/main/java/com/orientechnologies/orient/core/query/live/OLiveQueryHook.java

@@ -25,6 +25,7 @@
 import com.orientechnologies.orient.core.command.OCommandRequestText;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.db.ODatabase;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseInternal;
 import com.orientechnologies.orient.core.db.ODatabaseListener;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
@@ -62,7 +63,7 @@ public void close() {
     }
   }
 
-  public OLiveQueryHook(ODatabaseDocumentTx db) {
+  public OLiveQueryHook(ODatabaseDocumentInternal db) {
     super(db);
     getOpsReference(db);
     db.registerListener(this);

core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java

@@ -2703,7 +2703,7 @@ private void removeCollectionChangeListener(ODocumentEntry entry, Object fieldVa
     }
   }
 
-  protected void checkClass(ODatabaseDocumentTx database) {
+  protected void checkClass(ODatabaseDocumentInternal database) {
     if (_className == null)
       fetchClassName();
 

core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocumentInternal.java

@@ -20,6 +20,7 @@
 
 package com.orientechnologies.orient.core.record.impl;
 
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.db.record.ORecordElement;
 import com.orientechnologies.orient.core.metadata.schema.OGlobalProperty;
@@ -75,7 +76,7 @@ public static void clearTrackData(final ODocument document) {
     document.clearTrackData();
   }
 
-  public static void checkClass(ODocument doc, ODatabaseDocumentTx database) {
+  public static void checkClass(ODocument doc, ODatabaseDocumentInternal database) {
     doc.checkClass(database);
 
   }

core/src/main/java/com/orientechnologies/orient/core/record/impl/ORecordFlat.java

@@ -19,6 +19,7 @@
  */
 package com.orientechnologies.orient.core.record.impl;
 
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
@@ -40,7 +41,7 @@ public class ORecordFlat extends ORecordAbstract implements ORecordStringable {
   public static final  byte RECORD_TYPE      = 'f';
   protected String value;
 
-  public ORecordFlat(ODatabaseDocumentTx iDatabase) {
+  public ORecordFlat(ODatabaseDocumentInternal iDatabase) {
     this();
     ODatabaseRecordThreadLocal.INSTANCE.set(iDatabase);
   }

core/src/main/java/com/orientechnologies/orient/core/schedule/OScheduledEvent.java

@@ -22,6 +22,7 @@
 import com.orientechnologies.orient.core.command.script.OCommandScriptException;
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.exception.ORecordNotFoundException;
 import com.orientechnologies.orient.core.id.ORecordId;
@@ -54,7 +55,7 @@ public class OScheduledEvent extends ODocumentWrapper {
   public static final String  PROP_STARTTIME = "starttime";
   public static final String  PROP_EXEC_ID   = "nextExecId";
 
-  private ODatabaseDocumentTx db;
+  private ODatabaseDocument db;
 
   private OFunction           function;
   private boolean             isRunning      = false;
@@ -137,7 +138,7 @@ public <RET extends ODocumentWrapper> RET save() {
     if (db == null)
       bindDb();
     else
-      ODatabaseRecordThreadLocal.INSTANCE.set(db);
+      db.activateOnCurrentThread();
 
     return super.save();
   }
@@ -195,7 +196,7 @@ private Object executeFunction() {
     Object result = null;
     try {
       if (db != null)
-        ODatabaseRecordThreadLocal.INSTANCE.set(db);
+        db.activateOnCurrentThread();
 
       boolean executeEvent = false;
       for (int retry = 0; retry < 10; ++retry) {

core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/binary/ORecordSerializerBinaryDebug.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 
 import com.orientechnologies.common.exception.OSystemException;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.metadata.schema.OGlobalProperty;
@@ -12,7 +13,7 @@
 
 public class ORecordSerializerBinaryDebug extends ORecordSerializerBinaryV0 {
 
-  public ORecordSerializationDebug deserializeDebug(final byte[] iSource, ODatabaseDocumentTx db) {
+  public ORecordSerializationDebug deserializeDebug(final byte[] iSource, ODatabaseDocumentInternal db) {
     ORecordSerializationDebug debugInfo = new ORecordSerializationDebug();
     OImmutableSchema schema = ((OMetadataInternal) db.getMetadata()).getImmutableSchemaSnapshot();
     BytesContainer bytes = new BytesContainer(iSource);

core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLCreateLink.java

@@ -23,6 +23,7 @@
 import com.orientechnologies.orient.core.command.OCommandRequest;
 import com.orientechnologies.orient.core.command.OCommandRequestText;
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.db.record.ORecordLazyList;
@@ -174,11 +175,11 @@ public Object execute(final Map<Object, Object> iArgs) {
       throw new OCommandExecutionException("Cannot execute the command because it has not been parsed yet");
 
     final ODatabaseDocumentInternal database = getDatabase();
-    if (!(database.getDatabaseOwner() instanceof ODatabaseDocumentTx))
+    if (!(database.getDatabaseOwner() instanceof ODatabaseDocument))
       throw new OCommandSQLParsingException("This command supports only the database type ODatabaseDocumentTx and type '"
           + database.getClass() + "' was found");
 
-    final ODatabaseDocumentTx db = (ODatabaseDocumentTx) database.getDatabaseOwner();
+    final ODatabaseDocument db = (ODatabaseDocument) database.getDatabaseOwner();
 
     final OClass sourceClass = database.getMetadata().getSchema().getClass(sourceClassName);
     if (sourceClass == null)

core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java

@@ -1664,7 +1664,7 @@ private boolean parallelExec(final Iterator<? extends OIdentifiable> iTarget) {
     return res;
   }
 
-  protected void storageScan(final ODatabaseDocumentTx localDatabase, final OCommandContext iContext, final String iClusterName,
+  protected void storageScan(final ODatabaseDocumentInternal localDatabase, final OCommandContext iContext, final String iClusterName,
       final int current, final boolean[] results) {
 
     final int clusterId = localDatabase.getClusterIdByName(iClusterName);
@@ -1728,7 +1728,7 @@ private boolean execParallelWithPool(final ORecordIteratorClusters iTarget, fina
         @Override
         public void run() {
           try {
-            ODatabaseDocumentTx localDatabase = null;
+            ODatabaseDocumentInternal localDatabase = null;
             try {
               exceptions[current] = null;
               results[current] = true;

core/src/main/java/com/orientechnologies/orient/core/sql/query/OSQLNonBlockingQuery.java

@@ -247,7 +247,7 @@ public <RET> RET execute(final Object... iArgs) {
 
     if (database instanceof ODatabaseDocumentTx) {
       ODatabaseDocumentInternal currentThreadLocal = ODatabaseRecordThreadLocal.INSTANCE.getIfDefined();
-      final ODatabaseDocumentTx db = ((ODatabaseDocumentTx) database).copy();
+      final ODatabaseDocumentInternal db = ((ODatabaseDocumentTx) database).copy();
       if (currentThreadLocal != null) {
         currentThreadLocal.activateOnCurrentThread();
       } else {

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedAbstractPlugin.java

@@ -577,7 +577,7 @@ public ODistributedResponse sendRequest(final String iDatabaseName, final Collec
    */
   @Override
   public Serializable executeOnLocalNode(final ODistributedRequestId reqId, final ORemoteTask task,
-      final ODatabaseDocumentTx database) {
+      final ODatabaseDocumentInternal database) {
     if (database != null && !(database.getStorage() instanceof ODistributedStorage))
       throw new ODistributedException("Distributed storage was not installed for database '" + database.getName()
           + "'. Implementation found: " + database.getStorage().getClass().getName());

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedOutput.java

@@ -22,6 +22,7 @@
 import com.orientechnologies.common.io.OFileUtils;
 import com.orientechnologies.common.log.OAnsiCode;
 import com.orientechnologies.orient.console.OTableFormatter;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
@@ -197,7 +198,7 @@ public void onMessage(final String text, final Object... args) {
     return buffer.toString();
   }
 
-  public static String formatClasses(final ODistributedConfiguration cfg, final ODatabaseDocumentTx db) {
+  public static String formatClasses(final ODistributedConfiguration cfg, final ODatabaseDocument db) {
     final StringBuilder buffer = new StringBuilder();
 
     final OTableFormatter table = new OTableFormatter(new OTableFormatter.OTableOutput() {

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedTransactionManager.java

@@ -25,9 +25,11 @@
 import com.orientechnologies.common.util.OPair;
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.OExecutionThreadLocal;
 import com.orientechnologies.orient.core.db.OScenarioThreadLocal;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.db.record.OPlaceholder;
 import com.orientechnologies.orient.core.db.record.ORecordOperation;

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedTxContextImpl.java

@@ -19,6 +19,7 @@
  */
 package com.orientechnologies.orient.server.distributed.impl;
 
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.server.distributed.*;
@@ -67,7 +68,7 @@ public synchronized void commit() {
         "Distributed transaction %s: committing transaction", reqId);
   }
 
-  public synchronized void fix(final ODatabaseDocumentTx database, final List<ORemoteTask> fixTasks) {
+  public synchronized void fix(final ODatabaseDocumentInternal database, final List<ORemoteTask> fixTasks) {
     ODistributedServerLog.debug(this, db.getManager().getLocalNodeName(), null, ODistributedServerLog.DIRECTION.NONE,
         "Distributed transaction %s: fixing transaction (db=%s tasks=%d)", reqId, db.getDatabaseName(), fixTasks.size());
 
@@ -85,7 +86,7 @@ public synchronized void fix(final ODatabaseDocumentTx database, final List<ORem
     }
   }
 
-  public synchronized int rollback(final ODatabaseDocumentTx database) {
+  public synchronized int rollback(final ODatabaseDocumentInternal database) {
     ODistributedServerLog.debug(this, db.getManager().getLocalNodeName(), null, ODistributedServerLog.DIRECTION.NONE,
         "Distributed transaction %s: rolling back transaction (%d ops)", reqId, undoTasks.size());
 

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/OIncrementalServerSync.java

@@ -21,6 +21,7 @@
 
 import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.orient.core.Orient;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.OScenarioThreadLocal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.exception.ORecordNotFoundException;
@@ -68,7 +69,7 @@ public class OIncrementalServerSync {
    * <li>Binary presentation of the record, only if record is not deleted - length of content is provided in above entity</li>
    * </ol>
    */
-  public void importDelta(final OServer serverInstance, final ODatabaseDocumentTx db, final FileInputStream in, final String iNode)
+  public void importDelta(final OServer serverInstance, final ODatabaseDocumentInternal db, final FileInputStream in, final String iNode)
       throws IOException {
     final String nodeName = serverInstance.getDistributedManager().getLocalNodeName();
 

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/OSynchronizedTaskWrapper.java

@@ -20,6 +20,7 @@
 package com.orientechnologies.orient.server.distributed.impl;
 
 import com.orientechnologies.orient.core.command.OCommandDistributedReplicateRequest;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.server.OServer;
 import com.orientechnologies.orient.server.distributed.ODistributedRequestId;
@@ -64,7 +65,7 @@ public OCommandDistributedReplicateRequest.QUORUM_TYPE getQuorumType() {
 
   @Override
   public Object execute(ODistributedRequestId requestId, OServer iServer, ODistributedServerManager iManager,
-      ODatabaseDocumentTx database) throws Exception {
+      ODatabaseDocumentInternal database) throws Exception {
     try {
       if (task != null)
         return task.execute(requestId, iServer, iManager, database);

distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OCompletedTxTask.java

@@ -21,6 +21,7 @@
 
 import com.orientechnologies.orient.core.command.OCommandDistributedReplicateRequest;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.server.OServer;
@@ -64,7 +65,7 @@ public void addFixTask(final ORemoteTask fixTask) {
 
   @Override
   public Object execute(final ODistributedRequestId msgId, final OServer iServer, ODistributedServerManager iManager,
-      final ODatabaseDocumentTx database) throws Exception {
+      final ODatabaseDocumentInternal database) throws Exception {
     ODistributedServerLog.debug(this, iManager.getLocalNodeName(), getNodeSource(), DIRECTION.IN,
         "%s transaction db=%s originalReqId=%s...", (success ? "Committing" : fixTasks.isEmpty() ? "Rolling back" : "Fixing"),
         database.getName(), requestId, requestId);