refactor: removed deprecated APIs not used anymore

tglman · tglman · commit fba3b2b16a1f · 2025-02-06T14:05:42.000Z
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -1177,11 +1177,7 @@ public List<ORecordOperation> commit(final OTransactionInternal iTx) {
     unstickToSession();
     final OCommit38Request request =
         new OCommit38Request(
-            iTx.getId(),
-            true,
-            iTx.isUsingLog(),
-            iTx.getRecordOperations(),
-            iTx.getIndexOperations());
+            iTx.getId(), true, true, iTx.getRecordOperations(), iTx.getIndexOperations());
 
     final OCommit37Response response = networkOperationNoRetry(request, "Error on commit");
     for (OCommit37Response.OCreatedRecordResponse created : response.getCreated()) {
@@ -1915,7 +1911,7 @@ public void beginTransaction(
         new OBeginTransaction38Request(
             transaction.getId(),
             true,
-            transaction.isUsingLog(),
+            true,
             transaction.getRecordOperations(),
             transaction.getIndexOperations());
     OBeginTransactionResponse response =
@@ -1931,7 +1927,7 @@ public void reBeginTransaction(
     ORebeginTransaction38Request request =
         new ORebeginTransaction38Request(
             transaction.getId(),
-            transaction.isUsingLog(),
+            true,
             transaction.getRecordOperations(),
             transaction.getIndexOperations());
     OBeginTransactionResponse response =
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentAbstract.java
@@ -809,7 +809,8 @@ public void rawBegin(final OTransaction iTx) {
   /** {@inheritDoc} */
   public <RET extends ORecord> RET load(
       final ORecord iRecord, final String iFetchPlan, final boolean iIgnoreCache) {
-    return (RET)getTransaction().loadRecord(iRecord.getIdentity(), iRecord, iFetchPlan, iIgnoreCache);
+    return (RET)
+        getTransaction().loadRecord(iRecord.getIdentity(), iRecord, iFetchPlan, iIgnoreCache);
   }
 
   @Override
diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransaction.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransaction.java
@@ -77,9 +77,6 @@ enum ISOLATION_LEVEL {
 
   ODatabaseDocument getDatabase();
 
-  @Deprecated
-  void clearRecordEntries();
-
   ORecord loadRecord(ORID iRid, ORecord iRecord, String iFetchPlan, boolean ignoreCache);
 
   ORecord reloadRecord(ORID iRid, ORecord iRecord, String iFetchPlan, boolean ignoreCache);
@@ -93,9 +90,6 @@ ORecord loadRecordIfVersionIsNotLatest(
 
   TXSTATUS getStatus();
 
-  @Deprecated
-  Iterable<? extends ORecordOperation> getCurrentRecordEntries();
-
   Iterable<? extends ORecordOperation> getRecordOperations();
 
   List<ORecordOperation> getNewRecordEntriesByClass(OClass iClass, boolean iPolymorphic);
@@ -108,26 +102,6 @@ ORecord loadRecordIfVersionIsNotLatest(
 
   ODocument getIndexChanges();
 
-  @Deprecated
-  void clearIndexEntries();
-
-  boolean isUsingLog();
-
-  /**
-   * If you set this flag to false, you are unable to
-   *
-   * <ol>
-   *   <li>Rollback data changes in case of exception
-   *   <li>Restore data in case of server crash
-   * </ol>
-   *
-   * <p>So you practically unable to work in multithreaded environment and keep data consistent.
-   *
-   * @deprecated This option has no effect
-   */
-  @Deprecated
-  void setUsingLog(boolean useLog);
-
   void close();
 
   /**
diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionInternal.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionInternal.java
@@ -72,10 +72,6 @@ public interface OTransactionInternal extends OTransaction {
    */
   void updateIdentityAfterCommit(ORID oldRID, ORID rid);
 
-  /** Retrieve if log is enabled for the transaction */
-  @Deprecated
-  boolean isUsingLog();
-
   /**
    * Extract a single change from a specified record id.
    *
diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionNoTx.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionNoTx.java
@@ -194,10 +194,6 @@ public void deleteRecord(final ORecord iRecord) {
     }
   }
 
-  public Collection<ORecordOperation> getCurrentRecordEntries() {
-    return null;
-  }
-
   public Collection<ORecordOperation> getRecordOperations() {
     return null;
   }
@@ -211,8 +207,6 @@ public List<ORecordOperation> getNewRecordEntriesByClusterIds(final int[] iIds)
     return null;
   }
 
-  public void clearRecordEntries() {}
-
   public int getRecordEntriesSize() {
     return 0;
   }
@@ -225,10 +219,6 @@ public ORecordOperation getRecordEntry(final ORID rid) {
     return null;
   }
 
-  public boolean isUsingLog() {
-    return false;
-  }
-
   @Override
   public void setCustomData(String iName, Object iValue) {}
 
@@ -237,8 +227,6 @@ public Object getCustomData(String iName) {
     return null;
   }
 
-  public void setUsingLog(final boolean useLog) {}
-
   public ODocument getIndexChanges() {
     return null;
   }
@@ -269,8 +257,6 @@ public void addChangedDocument(ODocument document) {
     // do nothing
   }
 
-  public void clearIndexEntries() {}
-
   public OTransactionIndexChanges getIndexChanges(final String iName) {
     return null;
   }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionOptimistic.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionOptimistic.java
@@ -57,7 +57,6 @@ public class OTransactionOptimistic extends OTransactionRealAbstract {
   private static final AtomicInteger txSerial = new AtomicInteger();
   protected boolean changed = true;
   private boolean alreadyCleared = false;
-  private boolean usingLog = true;
   private int txStartCounter;
   private boolean sentToServer = false;
 
@@ -452,14 +451,6 @@ public String toString() {
         + ']';
   }
 
-  public boolean isUsingLog() {
-    return usingLog;
-  }
-
-  public void setUsingLog(final boolean useLog) {
-    this.usingLog = useLog;
-  }
-
   public void setStatus(final TXSTATUS iStatus) {
     status = iStatus;
   }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionRealAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionRealAbstract.java
@@ -111,19 +111,13 @@ public int getId() {
     return id;
   }
 
-  public void clearRecordEntries() {}
-
   public void restore() {}
 
   @Override
   public int getEntryCount() {
     return allEntries.size();
   }
 
-  public Collection<ORecordOperation> getCurrentRecordEntries() {
-    return allEntries.values();
-  }
-
   public Collection<ORecordOperation> getRecordOperations() {
     return allEntries.values();
   }
@@ -201,11 +195,6 @@ public List<ORecordOperation> getNewRecordEntriesByClusterIds(final int[] iIds)
     return result;
   }
 
-  public void clearIndexEntries() {
-    indexEntries.clear();
-    recordIndexOperations.clear();
-  }
-
   public List<String> getInvolvedIndexes() {
     List<String> list = null;
     for (String indexName : indexEntries.keySet()) {
diff --git a/core/src/test/java/com/orientechnologies/orient/core/tx/TransactionChangesDetectionTest.java b/core/src/test/java/com/orientechnologies/orient/core/tx/TransactionChangesDetectionTest.java
@@ -44,7 +44,6 @@ public void testTransactionChangeTrackingCompleted() {
     database.save(new ODocument("test"));
     assertTrue(currentTx.isChanged());
     assertFalse(currentTx.isAlreadyCleared());
-    assertTrue(currentTx.isUsingLog());
     assertEquals(1, currentTx.getEntryCount());
     assertEquals(OTransaction.TXSTATUS.BEGUN, currentTx.getStatus());
 
diff --git a/etl/src/main/java/com/orientechnologies/orient/etl/loader/OETLOrientDBLoader.java b/etl/src/main/java/com/orientechnologies/orient/etl/loader/OETLOrientDBLoader.java
@@ -94,7 +94,6 @@ public void load(ODatabaseDocument db, final Object input, OCommandContext conte
     if (tx) {
       if (!db.getTransaction().isActive()) {
         db.begin();
-        db.getTransaction().setUsingLog(txUseLog);
       }
     }
 
@@ -145,7 +144,6 @@ public void load(ODatabaseDocument db, final Object input, OCommandContext conte
           debug("committing document batch %d", progress.get());
           db.commit();
           db.begin();
-          db.getTransaction().setUsingLog(txUseLog);
           batchCounter.set(0);
         }
       }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/OConnectionBinaryExecutor.java b/server/src/main/java/com/orientechnologies/orient/server/OConnectionBinaryExecutor.java
@@ -687,7 +687,6 @@ public OBinaryResponse executeCommit(final OCommitRequest request) {
         new OTransactionOptimisticProxy(
             connection.getDatabase(),
             request.getTxId(),
-            request.isUsingLong(),
             request.getOperations(),
             request.getIndexChanges(),
             connection.getData().protocolVersion,
@@ -1388,7 +1387,6 @@ public OBinaryResponse executeBeginTransaction(OBeginTransactionRequest request)
         new OTransactionOptimisticServer(
             connection.getDatabase(),
             request.getTxId(),
-            request.isUsingLog(),
             request.getOperations(),
             request.getIndexChanges());
     try {
@@ -1408,7 +1406,6 @@ public OBinaryResponse executeBeginTransaction38(OBeginTransaction38Request requ
         new OTransactionOptimisticServer(
             connection.getDatabase(),
             request.getTxId(),
-            request.isUsingLog(),
             request.getOperations(),
             request.getIndexChanges());
     try {
@@ -1429,11 +1426,7 @@ public OBinaryResponse executeCommit37(OCommit37Request request) {
     if (request.isHasContent()) {
       tx =
           new OTransactionOptimisticServer(
-              database,
-              request.getTxId(),
-              request.isUsingLog(),
-              request.getOperations(),
-              request.getIndexChanges());
+              database, request.getTxId(), request.getOperations(), request.getIndexChanges());
       try {
         database.rawBegin(tx);
       } catch (final ORecordNotFoundException e) {
@@ -1492,11 +1485,7 @@ public OBinaryResponse executeCommit38(OCommit38Request request) {
     if (request.isHasContent()) {
       tx =
           new OTransactionOptimisticServer(
-              database,
-              request.getTxId(),
-              request.isUsingLog(),
-              request.getOperations(),
-              request.getIndexChanges());
+              database, request.getTxId(), request.getOperations(), request.getIndexChanges());
       try {
         database.rawBegin(tx);
       } catch (final ORecordNotFoundException e) {
diff --git a/server/src/main/java/com/orientechnologies/orient/server/tx/OTransactionOptimisticProxy.java b/server/src/main/java/com/orientechnologies/orient/server/tx/OTransactionOptimisticProxy.java
@@ -57,14 +57,12 @@ public class OTransactionOptimisticProxy extends OTransactionOptimistic {
   public OTransactionOptimisticProxy(
       ODatabaseDocumentInternal database,
       int txId,
-      boolean usingLong,
       List<ORecordOperationRequest> operations,
       ODocument indexChanges,
       short protocolVersion,
       ORecordSerializer serializer) {
     super(database);
     clientTxId = id;
-    setUsingLog(usingLong);
     this.operations = operations;
     this.indexChanges = indexChanges;
     this.protocolVersion = protocolVersion;
diff --git a/server/src/main/java/com/orientechnologies/orient/server/tx/OTransactionOptimisticServer.java b/server/src/main/java/com/orientechnologies/orient/server/tx/OTransactionOptimisticServer.java
@@ -43,7 +43,6 @@ public class OTransactionOptimisticServer extends OTransactionOptimistic {
   public OTransactionOptimisticServer(
       ODatabaseDocumentInternal database,
       int txId,
-      boolean usingLong,
       List<ORecordOperationRequest> operations,
       List<IndexChange> indexChanges) {
     super(database);
@@ -52,7 +51,6 @@ public OTransactionOptimisticServer(
           ((OTransactionRealAbstract) database.getTransaction()).getNewObjectCounter();
     }
     clientTxId = txId;
-    this.setUsingLog(usingLong);
     this.operations = operations;
     this.indexChanges = indexChanges;
     if (database.getTransaction().isActive()) {

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,8 @@ public void rawBegin(final OTransaction iTx) {`
`809`	`809`	`/** {@inheritDoc} */`
`810`	`810`	`public <RET extends ORecord> RET load(`
`811`	`811`	`final ORecord iRecord, final String iFetchPlan, final boolean iIgnoreCache) {`
`812`		`- return (RET)getTransaction().loadRecord(iRecord.getIdentity(), iRecord, iFetchPlan, iIgnoreCache);`
	`812`	`+ return (RET)`
	`813`	`+ getTransaction().loadRecord(iRecord.getIdentity(), iRecord, iFetchPlan, iIgnoreCache);`
`813`	`814`	`}`
`814`	`815`
`815`	`816`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,6 @@ public void deleteRecord(final ORecord iRecord) {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- public Collection<ORecordOperation> getCurrentRecordEntries() {`
`198`		`- return null;`
`199`		`- }`
`200`		`-`
`201`	`197`	`public Collection<ORecordOperation> getRecordOperations() {`
`202`	`198`	`return null;`
`203`	`199`	`}`
`@@ -211,8 +207,6 @@ public List<ORecordOperation> getNewRecordEntriesByClusterIds(final int[] iIds)`
`211`	`207`	`return null;`
`212`	`208`	`}`
`213`	`209`
`214`		`- public void clearRecordEntries() {}`
`215`		`-`
`216`	`210`	`public int getRecordEntriesSize() {`
`217`	`211`	`return 0;`
`218`	`212`	`}`
`@@ -225,10 +219,6 @@ public ORecordOperation getRecordEntry(final ORID rid) {`
`225`	`219`	`return null;`
`226`	`220`	`}`
`227`	`221`
`228`		`- public boolean isUsingLog() {`
`229`		`- return false;`
`230`		`- }`
`231`		`-`
`232`	`222`	`@Override`
`233`	`223`	`public void setCustomData(String iName, Object iValue) {}`
`234`	`224`
`@@ -237,8 +227,6 @@ public Object getCustomData(String iName) {`
`237`	`227`	`return null;`
`238`	`228`	`}`
`239`	`229`
`240`		`- public void setUsingLog(final boolean useLog) {}`
`241`		`-`
`242`	`230`	`public ODocument getIndexChanges() {`
`243`	`231`	`return null;`
`244`	`232`	`}`
`@@ -269,8 +257,6 @@ public void addChangedDocument(ODocument document) {`
`269`	`257`	`// do nothing`
`270`	`258`	`}`
`271`	`259`
`272`		`- public void clearIndexEntries() {}`
`273`		`-`
`274`	`260`	`public OTransactionIndexChanges getIndexChanges(final String iName) {`
`275`	`261`	`return null;`
`276`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ public void load(ODatabaseDocument db, final Object input, OCommandContext conte`
`94`	`94`	`if (tx) {`
`95`	`95`	`if (!db.getTransaction().isActive()) {`
`96`	`96`	`db.begin();`
`97`		`- db.getTransaction().setUsingLog(txUseLog);`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`@@ -145,7 +144,6 @@ public void load(ODatabaseDocument db, final Object input, OCommandContext conte`
`145`	`144`	`debug("committing document batch %d", progress.get());`
`146`	`145`	`db.commit();`
`147`	`146`	`db.begin();`
`148`		`- db.getTransaction().setUsingLog(txUseLog);`
`149`	`147`	`batchCounter.set(0);`
`150`	`148`	`}`
`151`	`149`	`}`