This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 4fbe4d413ac IGNITE-21636 MVCC code cleanup and abbreviation fixes
(#11259)
4fbe4d413ac is described below
commit 4fbe4d413ac2bb40189ed4a4f0d6a32fe070a2c0
Author: Vladimir Steshin <[email protected]>
AuthorDate: Mon Mar 18 15:43:31 2024 +0300
IGNITE-21636 MVCC code cleanup and abbreviation fixes (#11259)
---
.../java/org/apache/ignite/dump/DumpConsumer.java | 3 +-
.../ignite/dump/DumpReaderConfiguration.java | 10 +++----
.../pagemem/wal/record/UnwrapDataEntry.java | 5 ++--
.../cache/ValidationOnNodeJoinUtils.java | 2 +-
.../cache/persistence/snapshot/dump/Dump.java | 28 +++++++++----------
.../cache/persistence/tree/io/PageIO.java | 14 ++++------
.../snapshot/dump/AbstractCacheDumpTest.java | 32 +++++++++++-----------
.../junits/common/GridCommonAbstractTest.java | 6 ++--
.../testsuites/IgniteLoggingSelfTestSuite.java | 1 -
.../processors/query/h2/GridCacheTwoStepQuery.java | 6 ----
.../internal/processors/query/h2/QueryParser.java | 7 +----
.../processors/query/h2/QueryParserResultDml.java | 6 ----
.../query/h2/sql/GridSqlQuerySplitter.java | 1 -
13 files changed, 49 insertions(+), 72 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
index aec3a02c997..d06ab32d36a 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
@@ -21,11 +21,10 @@ import java.util.Iterator;
import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.cdc.TypeMapping;
import org.apache.ignite.internal.processors.cache.StoredCacheData;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
import org.apache.ignite.lang.IgniteExperimental;
/**
- * Consumer of {@link Dump}.
+ * Consumer of a cache dump.
* This consumer will receive all {@link DumpEntry} stored in cache dump
during {@code IgniteDumpReader} application invocation.
* The lifecycle of the consumer is the following:
* <ul>
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index 619c532b1ff..aeb62fba05b 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -57,7 +57,7 @@ public class DumpReaderConfiguration {
private final boolean keepBinary;
/** Cache group names. */
- private String[] cacheGroupNames;
+ private final String[] cacheGrpNames;
/** Skip copies. */
private final boolean skipCopies;
@@ -80,7 +80,7 @@ public class DumpReaderConfiguration {
* @param timeout Timeout of dump reader invocation.
* @param failFast Stop processing partitions if consumer fail to process
one.
* @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
- * @param cacheGroupNames Cache group names.
+ * @param cacheGrpNames Cache group names.
* @param skipCopies Skip copies.
* @param encSpi Encryption SPI.
*/
@@ -91,7 +91,7 @@ public class DumpReaderConfiguration {
Duration timeout,
boolean failFast,
boolean keepBinary,
- String[] cacheGroupNames,
+ String[] cacheGrpNames,
boolean skipCopies,
EncryptionSpi encSpi
) {
@@ -101,7 +101,7 @@ public class DumpReaderConfiguration {
this.timeout = timeout;
this.failFast = failFast;
this.keepBinary = keepBinary;
- this.cacheGroupNames = cacheGroupNames;
+ this.cacheGrpNames = cacheGrpNames;
this.skipCopies = skipCopies;
this.encSpi = encSpi;
}
@@ -138,7 +138,7 @@ public class DumpReaderConfiguration {
/** @return Cache group names. */
public String[] cacheGroupNames() {
- return cacheGroupNames;
+ return cacheGrpNames;
}
/** @return Skip copies. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/UnwrapDataEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/UnwrapDataEntry.java
index f69f579084f..cba9f379286 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/UnwrapDataEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/UnwrapDataEntry.java
@@ -33,8 +33,8 @@ public class UnwrapDataEntry extends DataEntry implements
UnwrappedDataEntry {
/** Cache object value context. Context is used for unwrapping objects. */
private final CacheObjectValueContext cacheObjValCtx;
- /** Keep binary. This flag disables converting of non primitive types
(BinaryObjects). */
- private boolean keepBinary;
+ /** Keep binary. This flag disables converting of non-primitive types
(BinaryObjects). */
+ private final boolean keepBinary;
/**
* @param cacheId Cache ID.
@@ -103,6 +103,7 @@ public class UnwrapDataEntry extends DataEntry implements
UnwrappedDataEntry {
if (unwrapped instanceof BinaryObject) {
if (keepBinary)
return unwrapped;
+
unwrapped = ((BinaryObject)unwrapped).deserialize();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
index c596ca5608c..b17248166fa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
@@ -629,7 +629,7 @@ public class ValidationOnNodeJoinUtils {
) {
if (!node.isClient()) {
for (DynamicCacheDescriptor desc : map.values()) {
- CacheConfiguration cfg = desc.cacheConfiguration();
+ CacheConfiguration<?, ?> cfg = desc.cacheConfiguration();
if (cfg.getAffinity() instanceof RendezvousAffinityFunction) {
RendezvousAffinityFunction aff =
(RendezvousAffinityFunction)cfg.getAffinity();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
index 7c149118a42..f0e64a88e2a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
@@ -78,7 +78,7 @@ import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader
import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.startAllComponents;
/**
- * This class provides ability to work with saved cache dump.
+ * This class provides the ability to work with saved cache dump.
*/
public class Dump implements AutoCloseable {
/** Snapshot meta. */
@@ -200,7 +200,7 @@ public class Dump implements AutoCloseable {
/** @return List of snapshot metadata saved in {@link #dumpDir}. */
public List<SnapshotMetadata> metadata() throws IOException,
IgniteCheckedException {
- return metadata;
+ return Collections.unmodifiableList(metadata);
}
/** @return List of snapshot metadata saved in {@link #dumpDir}. */
@@ -228,13 +228,13 @@ public class Dump implements AutoCloseable {
/**
* @param node Node directory name.
- * @param group Group id.
+ * @param grp Group id.
* @return List of cache configs saved in dump for group.
*/
- public List<StoredCacheData> configs(String node, int group) {
+ public List<StoredCacheData> configs(String node, int grp) {
JdkMarshaller marsh =
MarshallerUtils.jdkMarshaller(cctx.igniteInstanceName());
- return
Arrays.stream(FilePageStoreManager.cacheDataFiles(dumpGroupDirectory(node,
group))).map(f -> {
+ return
Arrays.stream(FilePageStoreManager.cacheDataFiles(dumpGroupDirectory(node,
grp))).map(f -> {
try {
return readCacheData(f, marsh, cctx.config());
}
@@ -246,13 +246,13 @@ public class Dump implements AutoCloseable {
/**
* @param node Node directory name.
- * @param group Group id.
+ * @param grp Group id.
* @return Dump iterator.
*/
- public List<Integer> partitions(String node, int group) {
+ public List<Integer> partitions(String node, int grp) {
String suffix = comprParts ? DUMP_FILE_EXT + ZIP_SUFFIX :
DUMP_FILE_EXT;
- File[] parts = dumpGroupDirectory(node, group)
+ File[] parts = dumpGroupDirectory(node, grp)
.listFiles(f -> f.getName().startsWith(PART_FILE_PREFIX) &&
f.getName().endsWith(suffix));
if (parts == null)
@@ -265,10 +265,10 @@ public class Dump implements AutoCloseable {
/**
* @param node Node directory name.
- * @param group Group id.
+ * @param grp Group id.
* @return Dump iterator.
*/
- public DumpedPartitionIterator iterator(String node, int group, int part) {
+ public DumpedPartitionIterator iterator(String node, int grp, int part) {
FileIOFactory ioFactory = comprParts
? (file, modes) -> new ReadOnlyUnzipFileIO(file)
: (file, modes) -> new ReadOnlyBufferedFileIO(file);
@@ -276,7 +276,7 @@ public class Dump implements AutoCloseable {
FileIO dumpFile;
try {
- dumpFile = ioFactory.create(new File(dumpGroupDirectory(node,
group), dumpPartFileName(part, comprParts)));
+ dumpFile = ioFactory.create(new File(dumpGroupDirectory(node,
grp), dumpPartFileName(part, comprParts)));
}
catch (IOException e) {
throw new RuntimeException(e);
@@ -333,7 +333,7 @@ public class Dump implements AutoCloseable {
return;
try {
- next = serializer.read(dumpFile, group, part);
+ next = serializer.read(dumpFile, grp, part);
}
catch (IOException | IgniteCheckedException e) {
throw new IgniteException(e);
@@ -362,7 +362,7 @@ public class Dump implements AutoCloseable {
}
/** */
- private File dumpGroupDirectory(String node, int groupId) {
+ private File dumpGroupDirectory(String node, int grpId) {
File nodeDir = Paths.get(dumpDir.getAbsolutePath(), DFLT_STORE_DIR,
node).toFile();
assert nodeDir.exists() && nodeDir.isDirectory();
@@ -377,7 +377,7 @@ public class Dump implements AutoCloseable {
? f.getName().replaceFirst(CACHE_DIR_PREFIX, "")
: f.getName().replaceFirst(CACHE_GRP_DIR_PREFIX, "");
- return groupId == CU.cacheId(grpName);
+ return grpId == CU.cacheId(grpName);
});
if (grpDirs.length != 1)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
index 074783e332e..cb54be0a7ae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
@@ -111,10 +111,10 @@ public abstract class PageIO {
public static final short MAX_PAYLOAD_SIZE = 2048;
/** */
- private static List<IOVersions<? extends BPlusInnerIO<?>>> h2ExtraInnerIOs
= new ArrayList<>(MAX_PAYLOAD_SIZE);
+ private static final List<IOVersions<? extends BPlusInnerIO<?>>>
h2ExtraInnerIOs = new ArrayList<>(MAX_PAYLOAD_SIZE);
/** */
- private static List<IOVersions<? extends BPlusLeafIO<?>>> h2ExtraLeafIOs =
new ArrayList<>(MAX_PAYLOAD_SIZE);
+ private static final List<IOVersions<? extends BPlusLeafIO<?>>>
h2ExtraLeafIOs = new ArrayList<>(MAX_PAYLOAD_SIZE);
/** */
private static List<IOVersions<? extends BPlusInnerIO<?>>>
h2ExtraMvccInnerIOs = new ArrayList<>(MAX_PAYLOAD_SIZE);
@@ -632,12 +632,8 @@ public abstract class PageIO {
)
return true;
- if ((T_H2_EX_REF_INNER_START <= pageType && pageType <=
T_H2_EX_REF_INNER_END) ||
- (T_H2_EX_REF_MVCC_INNER_START <= pageType && pageType <=
T_H2_EX_REF_MVCC_INNER_END)
- )
- return true;
-
- return false;
+ return (T_H2_EX_REF_INNER_START <= pageType && pageType <=
T_H2_EX_REF_INNER_END) ||
+ (T_H2_EX_REF_MVCC_INNER_START <= pageType && pageType <=
T_H2_EX_REF_MVCC_INNER_END);
}
/** {@inheritDoc} */
@@ -841,7 +837,7 @@ public abstract class PageIO {
* @return Index page type.
*/
public static IndexPageType deriveIndexPageType(long pageAddr) {
- int pageIoType = PageIO.getType(pageAddr);
+ int pageIoType = getType(pageAddr);
switch (pageIoType) {
case T_DATA_REF_INNER:
case T_DATA_REF_MVCC_INNER:
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
index bdcfab73f25..678b2d9ab93 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
@@ -313,11 +313,11 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
void checkDump(
IgniteEx ign,
String name,
- String[] cacheGroupNames,
+ String[] cacheGrpNames,
Set<String> expectedFoundCaches,
int expectedDfltDumpSz,
int expectedGrpDumpSz,
- int expectedCount,
+ int expectedCnt,
boolean skipCopies,
boolean expectedComprParts
) throws Exception {
@@ -417,7 +417,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
assertEquals(expectedDfltDumpSz, dfltDumpSz);
assertEquals(expectedGrpDumpSz, grpDumpSz);
- IntStream.range(0, expectedCount).forEach(key ->
assertTrue(keys.contains(key)));
+ IntStream.range(0, expectedCnt).forEach(key ->
assertTrue(keys.contains(key)));
}
};
@@ -428,7 +428,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
DFLT_THREAD_CNT, DFLT_TIMEOUT,
true,
false,
- cacheGroupNames,
+ cacheGrpNames,
skipCopies,
null
),
@@ -556,14 +556,14 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
}
/** */
- void createDump(IgniteEx ign, String name, @Nullable Collection<String>
cacheGroupNames) {
- createDump(ign, name, cacheGroupNames, false);
+ void createDump(IgniteEx ign, String name, @Nullable Collection<String>
cacheGrpNames) {
+ createDump(ign, name, cacheGrpNames, false);
}
/** */
- void createDump(IgniteEx ign, String name, @Nullable Collection<String>
cacheGroupNames, boolean comprParts) {
+ void createDump(IgniteEx ign, String name, @Nullable Collection<String>
cacheGrpNames, boolean comprParts) {
ign.context().cache().context().snapshotMgr()
- .createSnapshot(name, null, cacheGroupNames, false, onlyPrimary,
true, comprParts, encrypted).get();
+ .createSnapshot(name, null, cacheGrpNames, false, onlyPrimary,
true, comprParts, encrypted).get();
}
/** */
@@ -588,7 +588,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
private boolean typesCb;
/** */
- private boolean mappingcCb;
+ private boolean mappingCb;
/** */
private boolean cacheCfgCb;
@@ -596,7 +596,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public void start() {
assertFalse(started);
- assertFalse(mappingcCb);
+ assertFalse(mappingCb);
assertFalse(typesCb);
assertFalse(cacheCfgCb);
assertFalse(stopped);
@@ -607,18 +607,18 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public void onMappings(Iterator<TypeMapping> mappings) {
assertTrue(started);
- assertFalse(mappingcCb);
+ assertFalse(mappingCb);
assertFalse(typesCb);
assertFalse(cacheCfgCb);
assertFalse(stopped);
- mappingcCb = true;
+ mappingCb = true;
}
/** {@inheritDoc} */
@Override public void onTypes(Iterator<BinaryType> types) {
assertTrue(started);
- assertTrue(mappingcCb);
+ assertTrue(mappingCb);
assertFalse(typesCb);
assertFalse(cacheCfgCb);
assertFalse(stopped);
@@ -629,7 +629,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public void onCacheConfigs(Iterator<StoredCacheData> caches)
{
assertTrue(started);
- assertTrue(mappingcCb);
+ assertTrue(mappingCb);
assertTrue(typesCb);
assertFalse(cacheCfgCb);
assertFalse(stopped);
@@ -641,7 +641,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
@Override public void stop() {
assertTrue(started);
assertTrue(typesCb);
- assertTrue(mappingcCb);
+ assertTrue(mappingCb);
assertTrue(cacheCfgCb);
assertFalse(stopped);
@@ -652,7 +652,7 @@ public abstract class AbstractCacheDumpTest extends
GridCommonAbstractTest {
public void check() {
assertTrue(started);
assertTrue(typesCb);
- assertTrue(mappingcCb);
+ assertTrue(mappingCb);
assertTrue(cacheCfgCb);
assertTrue(stopped);
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 49a8783f8d6..1e9b9f8b8c3 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -2554,7 +2554,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
* @return {@code Set} of metrics methods that have forbidden return types.
* @throws Exception If failed to obtain metrics.
*/
- protected Set<String> getInvalidMbeansMethods(Ignite ignite) throws
Exception {
+ protected Set<String> getInvalidMbeansMethods(Ignite ignite) {
Set<String> sysMetricsPackages = new HashSet<>();
sysMetricsPackages.add("sun.management");
sysMetricsPackages.add("javax.management");
@@ -2571,7 +2571,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
if (sysMetricsPackages.stream().anyMatch(clsName::startsWith))
continue;
- Class c;
+ Class<?> c;
try {
c = Class.forName(clsName);
@@ -2582,7 +2582,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
continue;
}
- for (Class interf : c.getInterfaces()) {
+ for (Class<?> interf : c.getInterfaces()) {
for (Method m : interf.getMethods()) {
if (!m.isAnnotationPresent(MXBeanDescription.class))
continue;
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
index 93604f289e8..a64b234b1c4 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
@@ -34,5 +34,4 @@ public class IgniteLoggingSelfTestSuite {
public static void setUpClass() {
JUnitTeamcityReporter.suite =
IgniteLoggingSelfTestSuite.class.getName();
}
-
}
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridCacheTwoStepQuery.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridCacheTwoStepQuery.java
index aad80a1b66d..c8c8de4166d 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridCacheTwoStepQuery.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridCacheTwoStepQuery.java
@@ -64,9 +64,6 @@ public class GridCacheTwoStepQuery {
/** */
private final PartitionResult derivedPartitions;
- /** */
- private final boolean mvccEnabled;
-
/** Number of positional arguments in the sql. */
private final int paramsCnt;
@@ -85,7 +82,6 @@ public class GridCacheTwoStepQuery {
* @param replicatedOnly Replicated only flag.
* @param derivedPartitions Derived partitions.
* @param cacheIds Cache ids.
- * @param mvccEnabled Mvcc flag.
* @param locSplit Local split flag.
* @param treatReplicatedAsPartitioned Treat replicated as partitioned
flag.
*/
@@ -101,7 +97,6 @@ public class GridCacheTwoStepQuery {
boolean replicatedOnly,
PartitionResult derivedPartitions,
List<Integer> cacheIds,
- boolean mvccEnabled,
boolean locSplit,
boolean treatReplicatedAsPartitioned
) {
@@ -116,7 +111,6 @@ public class GridCacheTwoStepQuery {
this.distributedJoins = distributedJoins;
this.derivedPartitions = derivedPartitions;
this.cacheIds = cacheIds;
- this.mvccEnabled = mvccEnabled;
this.locSplit = locSplit;
this.mapQrys = mapQrys;
this.replicatedOnly = replicatedOnly;
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
index e99dea72298..ec27eee5da3 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
@@ -667,12 +667,7 @@ public class QueryParser {
throw new IgniteSQLException("Failed to prepare update plan.",
e);
}
- return new QueryParserResultDml(
- stmt,
- false,
- streamTbl,
- plan
- );
+ return new QueryParserResultDml(stmt, streamTbl, plan);
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultDml.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultDml.java
index 9d5626db296..8db448128eb 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultDml.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParserResultDml.java
@@ -29,9 +29,6 @@ public class QueryParserResultDml {
/** Command. */
private final GridSqlStatement stmt;
- /** MVCC enabled flag. */
- private final boolean mvccEnabled;
-
/** Streamer table. */
private final GridH2Table streamTbl;
@@ -42,18 +39,15 @@ public class QueryParserResultDml {
* Constructor.
*
* @param stmt Command.
- * @param mvccEnabled Whether MVCC is enabled.
* @param streamTbl Streamer table.
* @param plan Update plan.
*/
public QueryParserResultDml(
GridSqlStatement stmt,
- boolean mvccEnabled,
@Nullable GridH2Table streamTbl,
UpdatePlan plan
) {
this.stmt = stmt;
- this.mvccEnabled = mvccEnabled;
this.streamTbl = streamTbl;
this.plan = plan;
}
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index bfa265d4474..40c487d8266 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -336,7 +336,6 @@ public class GridSqlQuerySplitter {
replicatedOnly,
splitter.extractor.mergeMapQueries(splitter.mapSqlQrys),
cacheIds,
- false,
locSplit,
treatReplicatedAsPartitioned
);
