IGNITE-21835 MVCC removal: final cleanup

docs/_docs/setup.adoc

@@ -326,7 +326,7 @@ Example of the output:
 ignite.sh -systemProps
 IGNITE_AFFINITY_HISTORY_SIZE                                    - [Integer] Maximum size for affinity assignment history. Default is 25.
 IGNITE_ALLOW_ATOMIC_OPS_IN_TX                                   - [Boolean] Allows atomic operations inside transactions. Default is true.
-IGNITE_ALLOW_DML_INSIDE_TRANSACTION                             - [Boolean] When set to true, Ignite will allow executing DML operation (MERGE|INSERT|UPDATE|DELETE) within transactions for non MVCC mode. Default is false.
+IGNITE_ALLOW_DML_INSIDE_TRANSACTION                             - [Boolean] When set to true, Ignite will allow executing DML operation (MERGE|INSERT|UPDATE|DELETE) within transactions. Default is false.
 IGNITE_ALLOW_START_CACHES_IN_PARALLEL                           - [Boolean] Allows to start multiple caches in parallel. Default is true.
 ...
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/DhtLockFuture.java → modules/calcite/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionCalciteSelfTest.java

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.processors.cache.distributed.dht;
+package org.apache.ignite.internal.processors.cache;
 
-import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.QueryEngineConfiguration;
 
-/**
- * Marker interface.
- */
-public interface DhtLockFuture<T> extends IgniteInternalFuture<T> {
-    /**
-     * @param error Error.
-     */
-    public void onError(Throwable error);
+/** */
+public class DdlTransactionCalciteSelfTest extends DdlTransactionSelfTestBase {
+    /** {@inheritDoc} */
+    @Override protected QueryEngineConfiguration getQueryEngineConfiguration() {
+        return new CalciteQueryEngineConfiguration()
+            .setDefault(true);
+    }
 }

modules/calcite/src/test/java/org/apache/ignite/testsuites/IntegrationTestSuite.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.testsuites;
 
+import org.apache.ignite.internal.processors.cache.DdlTransactionCalciteSelfTest;
 import org.apache.ignite.internal.processors.query.calcite.CalciteQueryProcessorTest;
 import org.apache.ignite.internal.processors.query.calcite.CancelTest;
 import org.apache.ignite.internal.processors.query.calcite.DateTimeTest;
@@ -133,6 +134,7 @@
     JoinRehashIntegrationTest.class,
     IndexWithSameNameCalciteTest.class,
     AuthorizationIntegrationTest.class,
+    DdlTransactionCalciteSelfTest.class,
 })
 public class IntegrationTestSuite {
 }

modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java

@@ -1554,12 +1554,12 @@ public final class IgniteSystemProperties {
 
     /**
      * When set to {@code true}, Ignite will allow execute DML operation (MERGE|INSERT|UPDATE|DELETE)
-     * within transaction for non MVCC mode.
+     * within transaction.
      *
      * Default is {@code false}.
      */
     @SystemProperty("When set to true, Ignite will allow executing DML operation " +
-        "(MERGE|INSERT|UPDATE|DELETE) within transactions for non MVCC mode")
+        "(MERGE|INSERT|UPDATE|DELETE) within transactions")
     public static final String IGNITE_ALLOW_DML_INSIDE_TRANSACTION = "IGNITE_ALLOW_DML_INSIDE_TRANSACTION";
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/IgniteFeatures.java

@@ -126,9 +126,6 @@ public enum IgniteFeatures {
     /** Force rebuild, list or request indexes rebuild status from control script. */
     INDEXES_MANIPULATIONS_FROM_CONTROL_SCRIPT(42),
 
-    /** Optimization of recovery protocol for cluster which doesn't contain MVCC caches. */
-    MVCC_TX_RECOVERY_PROTOCOL_V2(44),
-
     /** Pk index keys are applied in correct order. */
     SPECIFIED_SEQ_PK_KEYS(45),
 

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java

@@ -490,7 +490,6 @@ private IgniteCheckedException updateIndex(
      * @param pageMemory Page memory to work with.
      * @param removeId Global remove id.
      * @param reuseList Reuse list where free pages should be stored.
-     * @param mvccEnabled Whether mvcc is enabled.
      * @throws IgniteCheckedException If failed.
      */
     public void destroyOrphanIndex(
@@ -500,8 +499,7 @@ public void destroyOrphanIndex(
         int grpId,
         PageMemory pageMemory,
         GridAtomicLong removeId,
-        ReuseList reuseList,
-        boolean mvccEnabled) throws IgniteCheckedException {
+        ReuseList reuseList) throws IgniteCheckedException {
 
         assert ctx.cache().context().database().checkpointLockIsHeldByThread();
 

modules/core/src/main/java/org/apache/ignite/internal/cdc/WalRecordsConsumer.java

@@ -32,7 +32,7 @@
 import org.apache.ignite.internal.pagemem.wal.record.DataEntry;
 import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
 import org.apache.ignite.internal.pagemem.wal.record.TimeStampRecord;
-import org.apache.ignite.internal.pagemem.wal.record.UnwrappedDataEntry;
+import org.apache.ignite.internal.pagemem.wal.record.UnwrapDataEntry;
 import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
 import org.apache.ignite.internal.processors.cache.GridCacheOperation;
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
@@ -91,7 +91,7 @@ public class WalRecordsConsumer<K, V> {
 
     /** Event transformer. */
     static final IgniteClosure<DataEntry, CdcEvent> CDC_EVENT_TRANSFORMER = e -> {
-        UnwrappedDataEntry ue = (UnwrappedDataEntry)e;
+        UnwrapDataEntry ue = (UnwrapDataEntry)e;
 
         return new CdcEventImpl(
             ue.unwrappedKey(),

modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java

@@ -25,7 +25,6 @@
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor;
 import org.apache.ignite.internal.processors.cache.GridCacheSharedManager;
-import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMetrics;
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageReadWriteManager;
 import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport;
 
@@ -43,18 +42,6 @@ public interface IgnitePageStoreManager extends GridCacheSharedManager, IgniteCh
      */
     public void finishRecover() throws IgniteCheckedException;
 
-    /**
-     * Initializes disk store structures.
-     *
-     * @param cacheId Cache id.
-     * @param partitions Partitions count.
-     * @param cacheName Cache name.
-     * @param pageMetrics Page metrics.
-     * @throws IgniteCheckedException If failed.
-     */
-    public void initialize(int cacheId, int partitions, String cacheName, PageMetrics pageMetrics)
-        throws IgniteCheckedException;
-
     /**
      * Callback called when a cache is starting.
      *

modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/LazyDataEntry.java

@@ -31,7 +31,7 @@
  * Represents Data Entry ({@link #key}, {@link #val value}) pair update {@link #op operation}. <br>
  * This Data entry was not converted to key, value pair during record deserialization.
  */
-public class LazyDataEntry extends DataEntry implements MarshalledDataEntry {
+public class LazyDataEntry extends DataEntry {
     /** */
     private GridCacheSharedContext cctx;
 
@@ -126,23 +126,23 @@ public LazyDataEntry(
         return val;
     }
 
-    /** {@inheritDoc} */
-    @Override public byte getKeyType() {
+    /** @return Data Entry Key type code. See {@link CacheObject} for built-in value type codes */
+    public byte getKeyType() {
         return keyType;
     }
 
-    /** {@inheritDoc} */
-    @Override public byte[] getKeyBytes() {
+    /** @return Key value bytes. */
+    public byte[] getKeyBytes() {
         return keyBytes;
     }
 
-    /** {@inheritDoc} */
-    @Override public byte getValType() {
+    /** @return Data Entry Value type code. See {@link CacheObject} for built-in value type codes */
+    public byte getValType() {
         return valType;
     }
 
-    /** {@inheritDoc} */
-    @Override public byte[] getValBytes() {
+    /** @return Value value bytes. */
+    public byte[] getValBytes() {
         return valBytes;
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/UnwrapDataEntry.java

@@ -29,7 +29,7 @@
 /**
  * Data Entry for automatic unwrapping key and value from Data Entry
  */
-public class UnwrapDataEntry extends DataEntry implements UnwrappedDataEntry {
+public class UnwrapDataEntry extends DataEntry {
     /** Cache object value context. Context is used for unwrapping objects. */
     private final CacheObjectValueContext cacheObjValCtx;
 
@@ -68,8 +68,13 @@ public UnwrapDataEntry(
         this.keepBinary = keepBinary;
     }
 
-    /** {@inheritDoc} */
-    @Override public Object unwrappedKey() {
+    /**
+     * Unwraps key from cache key object into primitive boxed type or source class. If client classes were used in
+     * key, call of this method requires classes to be available in classpath.
+     *
+     * @return Key which was placed into cache. Or null if failed to convert.
+     */
+    public Object unwrappedKey() {
         try {
             return unwrapKey(key, keepBinary, cacheObjValCtx);
         }
@@ -81,8 +86,13 @@ public UnwrapDataEntry(
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public Object unwrappedValue() {
+    /**
+     * Unwraps value from cache value object into primitive boxed type or source class. If client classes were
+     * used in key, call of this method requires classes to be available in classpath.
+     *
+     * @return Value which was placed into cache. Or null for delete operation or for failure.
+     */
+    public Object unwrappedValue() {
         try {
             return unwrapValue(val, keepBinary, cacheObjValCtx);
         }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java

@@ -42,13 +42,6 @@ public CacheEntryInfoCollection() {
         // No-op
     }
 
-    /**
-     * @param infos List of cache entry info.
-     */
-    public CacheEntryInfoCollection(List<GridCacheEntryInfo> infos) {
-        this.infos = infos;
-    }
-
     /**
      *
      */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java

@@ -1028,24 +1028,6 @@ public void onPartitionCounterUpdate(int cacheId,
         }
     }
 
-    /**
-     * @return {@code True} if there is at least one cache with registered CQ exists in this group.
-     */
-    public boolean hasContinuousQueryCaches() {
-        List<GridCacheContext<?, ?>> contQryCaches;
-
-        listenerLock.readLock().lock();
-
-        try {
-            contQryCaches = this.contQryCaches;
-
-            return !F.isEmpty(contQryCaches);
-        }
-        finally {
-            listenerLock.readLock().unlock();
-        }
-    }
-
     /**
      * @throws IgniteCheckedException If failed.
      */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java

@@ -116,15 +116,6 @@ public CacheInvokeEntry(KeyCacheObject keyObj,
         op = hadVal ? Operation.UPDATE : Operation.CREATE;
     }
 
-    /**
-     * Entry processor operation.
-     *
-     * @return Operation.
-     */
-    public Operation op() {
-        return op;
-    }
-
     /**
      * @return Return origin value, before modification.
      */
@@ -167,7 +158,7 @@ public GridCacheEntryEx entry() {
     /**
      *
      */
-    public static enum Operation {
+    private static enum Operation {
         /** */
         NONE,