This is an automated email from the ASF dual-hosted git repository.
av 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 1bb2920dda9 IGNITE-21884 Removal of MvccIO and MvccVersionAware
(#11299)
1bb2920dda9 is described below
commit 1bb2920dda9754eb26aa1caadbbd25740ec2ec70
Author: Ilya Shishkov <[email protected]>
AuthorDate: Mon Apr 15 15:18:57 2024 +0300
IGNITE-21884 Removal of MvccIO and MvccVersionAware (#11299)
---
.../internal/cache/query/index/IndexProcessor.java | 8 +-
.../cache/query/index/sorted/IndexRow.java | 30 +------
.../cache/query/index/sorted/IndexRowImpl.java | 20 -----
.../sorted/defragmentation/DefragIndexFactory.java | 30 -------
.../query/index/sorted/inline/InlineIndexTree.java | 68 ++------------
.../sorted/inline/io/AbstractInlineInnerIO.java | 27 ++----
.../sorted/inline/io/AbstractInlineLeafIO.java | 27 ++----
.../query/index/sorted/inline/io/InlineIO.java | 2 +-
.../cache/query/index/sorted/inline/io/MvccIO.java | 49 ----------
.../index/sorted/inline/io/MvccInlineInnerIO.java | 50 -----------
.../index/sorted/inline/io/MvccInlineLeafIO.java | 49 ----------
.../query/index/sorted/inline/io/MvccInnerIO.java | 53 -----------
.../query/index/sorted/inline/io/MvccLeafIO.java | 53 -----------
.../internal/processors/cache/mvcc/MvccUtils.java | 38 --------
.../processors/cache/mvcc/MvccVersionAware.java | 76 ----------------
.../processors/cache/persistence/CacheDataRow.java | 3 +-
.../cache/persistence/CacheDataRowAdapter.java | 44 ---------
.../cache/persistence/CacheSearchRow.java | 3 +-
.../cache/persistence/GridCacheOffheapManager.java | 40 ---------
.../cache/persistence/tree/io/DataPageIO.java | 100 +++------------------
.../cache/persistence/tree/io/PageIO.java | 97 +++-----------------
.../internal/processors/cache/tree/SearchRow.java | 25 ------
.../persistence/tree/io/PageIOFreeSizeTest.java | 2 +-
.../processors/database/CacheFreeListSelfTest.java | 40 ---------
.../processors/query/h2/opt/H2CacheRow.java | 40 ---------
.../internal/processors/query/h2/opt/H2Row.java | 28 +-----
26 files changed, 56 insertions(+), 946 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
index 9c1086e0cce..4f14bf8b7e5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
@@ -42,8 +42,6 @@ import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.AbstractInl
import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.AbstractInlineLeafIO;
import org.apache.ignite.internal.cache.query.index.sorted.inline.io.InnerIO;
import org.apache.ignite.internal.cache.query.index.sorted.inline.io.LeafIO;
-import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.MvccInnerIO;
-import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.MvccLeafIO;
import org.apache.ignite.internal.managers.indexing.IndexesRebuildTask;
import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageMemory;
@@ -90,7 +88,7 @@ public class IndexProcessor extends GridProcessorAdapter {
* Register inline IOs for sorted indexes.
*/
public static void registerIO() {
- PageIO.registerH2(InnerIO.VERSIONS, LeafIO.VERSIONS,
MvccInnerIO.VERSIONS, MvccLeafIO.VERSIONS);
+ PageIO.registerH2(InnerIO.VERSIONS, LeafIO.VERSIONS);
AbstractInlineInnerIO.register();
AbstractInlineLeafIO.register();
@@ -522,8 +520,8 @@ public class IndexProcessor extends GridProcessorAdapter {
removeId,
metaPageId,
reuseList,
- AbstractInlineInnerIO.versions(inlineSize, mvccEnabled),
- AbstractInlineLeafIO.versions(inlineSize, mvccEnabled),
+ AbstractInlineInnerIO.versions(inlineSize),
+ AbstractInlineLeafIO.versions(inlineSize),
PageIdAllocator.FLAG_IDX,
ctx.failure(),
ctx.cache().context().diagnostic().pageLockTracker()
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRow.java
index d6c2e51f252..d4f514a03f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRow.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRow.java
@@ -19,18 +19,12 @@ package org.apache.ignite.internal.cache.query.index.sorted;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexTree;
import org.apache.ignite.internal.cache.query.index.sorted.keys.IndexKey;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccVersionAware;
-import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_NA;
-
/**
* Represents an index row stored in a tree.
*/
-public interface IndexRow extends MvccVersionAware {
+public interface IndexRow {
/**
* @param idx Index of a key.
* @return Underlying key by specified index.
@@ -57,28 +51,6 @@ public interface IndexRow extends MvccVersionAware {
*/
public CacheDataRow cacheDataRow();
- // MVCC stuff.
-
- /** {@inheritDoc} */
- @Override public default long mvccCoordinatorVersion() {
- return MVCC_CRD_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public default long mvccCounter() {
- return MVCC_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public default int mvccOperationCounter() {
- return MVCC_OP_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public default byte mvccTxState() {
- return TxState.NA;
- }
-
/**
* @return {@code True} for rows used for index search (as opposed to rows
stored in {@link InlineIndexTree}.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRowImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRowImpl.java
index 2b7e8f5fec1..dfbd45279bc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRowImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexRowImpl.java
@@ -141,26 +141,6 @@ public class IndexRowImpl implements IndexRow {
return sb.toString();
}
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return cacheRow.mvccCoordinatorVersion();
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return cacheRow.mvccCounter();
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return cacheRow.mvccOperationCounter();
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return cacheRow.mvccTxState();
- }
-
/** {@inheritDoc} */
@Override public boolean indexPlainRow() {
return false;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/DefragIndexFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/DefragIndexFactory.java
index 9f9e34db182..23491c147e5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/DefragIndexFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/DefragIndexFactory.java
@@ -246,21 +246,6 @@ public class DefragIndexFactory extends InlineIndexFactory
{
@Override public int inlineSize() {
return io.inlineSize();
}
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return io.mvccCoordinatorVersion(pageAddr, idx);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return io.mvccCounter(pageAddr, idx);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return io.mvccOperationCounter(pageAddr, idx);
- }
}
/** */
@@ -307,21 +292,6 @@ public class DefragIndexFactory extends InlineIndexFactory
{
@Override public int inlineSize() {
return io.inlineSize();
}
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return io.mvccCoordinatorVersion(pageAddr, idx);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return io.mvccCounter(pageAddr, idx);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return io.mvccOperationCounter(pageAddr, idx);
- }
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
index beb835e8b28..6154ca10f93 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
@@ -37,14 +37,12 @@ import
org.apache.ignite.internal.cache.query.index.sorted.SortedIndexDefinition
import
org.apache.ignite.internal.cache.query.index.sorted.ThreadLocalRowHandlerHolder;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.AbstractInlineInnerIO;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.io.AbstractInlineLeafIO;
-import org.apache.ignite.internal.cache.query.index.sorted.inline.io.MvccIO;
import org.apache.ignite.internal.metric.IoStatisticsHolder;
import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManager;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import
org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
import
org.apache.ignite.internal.processors.cache.persistence.tree.CorruptedTreeException;
@@ -109,9 +107,6 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
/** Row cache. */
private final @Nullable IndexRowCache idxRowCache;
- /** Whether MVCC is enabled. */
- private final boolean mvccEnabled;
-
/**
* Constructor.
*/
@@ -161,15 +156,13 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
this.idxRowCache = idxRowCache;
- mvccEnabled = false;
-
if (!initNew) {
// Init from metastore.
// Page is ready - read meta information.
MetaPageInfo metaInfo = metaInfo();
inlineSize = metaInfo.inlineSize();
- setIos(inlineSize, mvccEnabled);
+ setIos(inlineSize);
boolean inlineObjSupported = inlineObjectSupported(def, metaInfo,
rowHndFactory);
@@ -194,7 +187,7 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
log
);
- setIos(inlineSize, mvccEnabled);
+ setIos(inlineSize);
}
initTree(initNew, inlineSize);
@@ -203,10 +196,10 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
}
/** */
- private void setIos(int inlineSize, boolean mvccEnabled) {
+ private void setIos(int inlineSize) {
setIos(
- AbstractInlineInnerIO.versions(inlineSize, mvccEnabled),
- AbstractInlineLeafIO.versions(inlineSize, mvccEnabled)
+ AbstractInlineInnerIO.versions(inlineSize),
+ AbstractInlineLeafIO.versions(inlineSize)
);
}
@@ -263,9 +256,7 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
if (inlineSize == 0) {
IndexRow currRow = getRow(io, pageAddr, idx);
- int cmp = compareFullRows(currRow, row, 0);
-
- return cmp == 0 ? mvccCompare(currRow, row) : cmp;
+ return compareFullRows(currRow, row, 0);
}
int fieldOff = 0;
@@ -315,13 +306,10 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
if (currRow == null)
currRow = getRow(io, pageAddr, idx);
- int ret = compareFullRows(currRow, row, keyIdx);
-
- if (ret != 0)
- return ret;
+ return compareFullRows(currRow, row, keyIdx);
}
- return mvccCompare((MvccIO)io, pageAddr, idx, row);
+ return 0;
}
/** */
@@ -597,46 +585,6 @@ public class InlineIndexTree extends BPlusTree<IndexRow,
IndexRow> {
return rowHnd != null ? rowHnd :
ThreadLocalRowHandlerHolder.rowHandler();
}
- /**
- * @param io IO.
- * @param pageAddr Page address.
- * @param idx Item index.
- * @param row Search row.
- * @return Comparison result.
- */
- private int mvccCompare(MvccIO io, long pageAddr, int idx, IndexRow row) {
- if (!mvccEnabled || row.indexPlainRow())
- return 0;
-
- long crd = io.mvccCoordinatorVersion(pageAddr, idx);
- long cntr = io.mvccCounter(pageAddr, idx);
- int opCntr = io.mvccOperationCounter(pageAddr, idx);
-
- assert MvccUtils.mvccVersionIsValid(crd, cntr, opCntr);
-
- return -MvccUtils.compare(crd, cntr, opCntr, row); // descending order
- }
-
- /**
- * @param r1 First row.
- * @param r2 Second row.
- * @return Comparison result.
- */
- private int mvccCompare(IndexRow r1, IndexRow r2) {
- if (!mvccEnabled || r2.indexPlainRow() || r1 == r2)
- return 0;
-
- long crdVer1 = r1.mvccCoordinatorVersion();
- long crdVer2 = r2.mvccCoordinatorVersion();
-
- int c = -Long.compare(crdVer1, crdVer2);
-
- if (c != 0)
- return c;
-
- return -Long.compare(r1.mvccCounter(), r2.mvccCounter());
- }
-
/** {@inheritDoc} */
@Override protected String lockRetryErrorMessage(String op) {
IndexName idxName = def.idxName();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
index 2fc657fa302..b33418ea321 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
@@ -57,25 +57,15 @@ public abstract class AbstractInlineInnerIO extends
BPlusInnerIO<IndexRow> imple
}
/**
- * Register IOs for every available {@link #inlineSize} for MVCC and not.
+ * Register IOs for every available {@link #inlineSize}.
*/
public static void register() {
- register(false);
- register(true);
- }
-
- /** */
- private static void register(boolean mvcc) {
- short type = mvcc ? PageIO.T_H2_EX_REF_MVCC_INNER_START :
PageIO.T_H2_EX_REF_INNER_START;
-
for (short payload = 1; payload <= PageIO.MAX_PAYLOAD_SIZE; payload++)
{
- short ioType = (short)(type + payload - 1);
-
- AbstractInlineInnerIO io = mvcc ? new MvccInlineInnerIO(ioType,
payload) : new InlineInnerIO(ioType, payload);
+ short ioType = (short)(PageIO.T_H2_EX_REF_INNER_START + payload -
1);
- IOVersions<? extends AbstractInlineInnerIO> versions = new
IOVersions<>(io);
+ IOVersions<? extends AbstractInlineInnerIO> versions = new
IOVersions<>(new InlineInnerIO(ioType, payload));
- PageIO.registerH2ExtraInner(versions, mvcc);
+ PageIO.registerH2ExtraInner(versions);
}
}
@@ -148,15 +138,12 @@ public abstract class AbstractInlineInnerIO extends
BPlusInnerIO<IndexRow> imple
/**
* @param payload Payload size.
- * @param mvccEnabled Whether MVCC is enabled.
* @return IOVersions for given payload.
*/
- public static IOVersions<? extends BPlusInnerIO<IndexRow>> versions(int
payload, boolean mvccEnabled) {
+ public static IOVersions<? extends BPlusInnerIO<IndexRow>> versions(int
payload) {
assert payload >= 0 && payload <= PageIO.MAX_PAYLOAD_SIZE;
- if (payload == 0)
- return mvccEnabled ? MvccInnerIO.VERSIONS : InnerIO.VERSIONS;
- else
- return
(IOVersions<BPlusInnerIO<IndexRow>>)PageIO.getInnerVersions((short)(payload -
1), mvccEnabled);
+ return payload == 0 ? InnerIO.VERSIONS :
+
(IOVersions<BPlusInnerIO<IndexRow>>)PageIO.getInnerVersions((short)(payload -
1));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
index 6c31aea8081..4046aa2cca9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
@@ -57,25 +57,15 @@ public abstract class AbstractInlineLeafIO extends
BPlusLeafIO<IndexRow> impleme
}
/**
- * Register IOs for every available {@link #inlineSize} for MVCC and not.
+ * Register IOs for every available {@link #inlineSize}.
*/
public static void register() {
- register(false);
- register(true);
- }
-
- /** */
- private static void register(boolean mvcc) {
- short type = mvcc ? PageIO.T_H2_EX_REF_MVCC_LEAF_START :
PageIO.T_H2_EX_REF_LEAF_START;
-
for (short payload = 1; payload <= PageIO.MAX_PAYLOAD_SIZE; payload++)
{
- short ioType = (short)(type + payload - 1);
-
- AbstractInlineLeafIO io = mvcc ? new MvccInlineLeafIO(ioType,
payload) : new InlineLeafIO(ioType, payload);
+ short ioType = (short)(PageIO.T_H2_EX_REF_LEAF_START + payload -
1);
- IOVersions<? extends AbstractInlineLeafIO> versions = new
IOVersions<>(io);
+ IOVersions<? extends AbstractInlineLeafIO> versions = new
IOVersions<>(new InlineLeafIO(ioType, payload));
- PageIO.registerH2ExtraLeaf(versions, mvcc);
+ PageIO.registerH2ExtraLeaf(versions);
}
}
@@ -148,15 +138,12 @@ public abstract class AbstractInlineLeafIO extends
BPlusLeafIO<IndexRow> impleme
/**
* @param payload Payload size.
- * @param mvccEnabled Whether MVCC is enabled.
* @return IOVersions for given payload.
*/
- public static IOVersions<? extends BPlusLeafIO<IndexRow>> versions(int
payload, boolean mvccEnabled) {
+ public static IOVersions<? extends BPlusLeafIO<IndexRow>> versions(int
payload) {
assert payload >= 0 && payload <= PageIO.MAX_PAYLOAD_SIZE;
- if (payload == 0)
- return mvccEnabled ? MvccLeafIO.VERSIONS : LeafIO.VERSIONS;
- else
- return
(IOVersions<BPlusLeafIO<IndexRow>>)PageIO.getLeafVersions((short)(payload - 1),
mvccEnabled);
+ return payload == 0 ? LeafIO.VERSIONS :
+
(IOVersions<BPlusLeafIO<IndexRow>>)PageIO.getLeafVersions((short)(payload - 1));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/InlineIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/InlineIO.java
index 349692758f8..4a0fd6dc61d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/InlineIO.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/InlineIO.java
@@ -20,7 +20,7 @@ package
org.apache.ignite.internal.cache.query.index.sorted.inline.io;
/**
* Represents common API for inline IOs.
*/
-public interface InlineIO extends MvccIO {
+public interface InlineIO {
/**
* @param pageAddr Page address.
* @param idx Index.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccIO.java
deleted file mode 100644
index fa51e25a835..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccIO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.ignite.internal.cache.query.index.sorted.inline.io;
-
-/** This interface represents MVCC aware IO. */
-public interface MvccIO {
- /**
- * @param pageAddr Page address.
- * @param idx Index.
- * @return Mvcc coordinator version.
- */
- public default long mvccCoordinatorVersion(long pageAddr, int idx) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @param pageAddr Page address.
- * @param idx Index.
- * @return Mvcc counter.
- */
- public default long mvccCounter(long pageAddr, int idx) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @param pageAddr Page address.
- * @param idx Index.
- * @return Mvcc operation counter.
- */
- public default int mvccOperationCounter(long pageAddr, int idx) {
- throw new UnsupportedOperationException();
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineInnerIO.java
deleted file mode 100644
index 94e9d347ec9..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineInnerIO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.cache.query.index.sorted.inline.io;
-
-import org.apache.ignite.internal.pagemem.PageUtils;
-
-/**
- * Inner page for inlined MVCC index rows.
- */
-public class MvccInlineInnerIO extends AbstractInlineInnerIO {
- /**
- * @param type Page type.
- * @param payloadSize Payload size.
- */
- protected MvccInlineInnerIO(short type, int payloadSize) {
- // Meta stores link and mvcc info about a cache row.
- super(type, 1, 28, payloadSize);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + inlineSize() + 8);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + inlineSize() + 16);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return PageUtils.getInt(pageAddr, offset(idx) + inlineSize() + 24);
- }
-}
-
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineLeafIO.java
deleted file mode 100644
index e5012a73727..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInlineLeafIO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.cache.query.index.sorted.inline.io;
-
-import org.apache.ignite.internal.pagemem.PageUtils;
-
-/**
- * Leaf page for inlined MVCC index rows.
- */
-public class MvccInlineLeafIO extends AbstractInlineLeafIO {
- /**
- * @param type Page type.
- * @param payloadSize Payload size.
- */
- protected MvccInlineLeafIO(short type, int payloadSize) {
- // Meta stores link and mvcc info about a cache row.
- super(type, 1, 28, payloadSize);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + inlineSize() + 8);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + inlineSize() + 16);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return PageUtils.getInt(pageAddr, offset(idx) + inlineSize() + 24);
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInnerIO.java
deleted file mode 100644
index 4f37752c188..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccInnerIO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.cache.query.index.sorted.inline.io;
-
-import org.apache.ignite.internal.pagemem.PageUtils;
-import
org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
-
-/**
- * Inner page for MVCC index rows.
- */
-public class MvccInnerIO extends AbstractInnerIO {
- /** */
- public static final IOVersions<MvccInnerIO> VERSIONS = new IOVersions<>(
- new MvccInnerIO(1)
- );
-
- /**
- * @param ver Page format version.
- */
- private MvccInnerIO(int ver) {
- super(T_H2_MVCC_REF_INNER, ver, 28);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + 8);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + 16);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return PageUtils.getInt(pageAddr, offset(idx) + 24);
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccLeafIO.java
deleted file mode 100644
index 44c3449f8d4..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/MvccLeafIO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.cache.query.index.sorted.inline.io;
-
-import org.apache.ignite.internal.pagemem.PageUtils;
-import
org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
-
-/**
- * Leaf page for inlined MVCC index rows.
- */
-public class MvccLeafIO extends AbstractLeafIO {
- /** */
- public static final IOVersions<MvccLeafIO> VERSIONS = new IOVersions<>(
- new MvccLeafIO(1)
- );
-
- /**
- * @param ver Page format version.
- */
- protected MvccLeafIO(int ver) {
- super(T_H2_MVCC_REF_LEAF, ver, 28);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + 8);
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter(long pageAddr, int idx) {
- return PageUtils.getLong(pageAddr, offset(idx) + 16);
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter(long pageAddr, int idx) {
- return PageUtils.getInt(pageAddr, offset(idx) + 24);
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
index 661af6cf71d..a14b26298a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
@@ -349,18 +349,6 @@ public class MvccUtils {
return invoke(cctx, link, getNewVer, null);
}
- /**
- * Compares row version (xid_min) with the given version.
- *
- * @param row Row.
- * @param ver Version.
- * @return Comparison result, see {@link Comparable}.
- */
- public static int compare(MvccVersionAware row, MvccVersion ver) {
- return compare(row.mvccCoordinatorVersion(), row.mvccCounter(),
row.mvccOperationCounter(),
- ver.coordinatorVersion(), ver.counter(), ver.operationCounter());
- }
-
/**
* Compares to pairs of MVCC versions. See {@link Comparable}.
*
@@ -373,18 +361,6 @@ public class MvccUtils {
return compare(mvccVerLeft.coordinatorVersion(),
mvccVerLeft.counter(), mvccCrdRight, mvccCntrRight);
}
- /**
- * Compares to pairs of MVCC versions. See {@link Comparable}.
- *
- * @param row First MVCC version.
- * @param mvccCrdRight Second coordinator version.
- * @param mvccCntrRight Second counter.
- * @return Comparison result, see {@link Comparable}.
- */
- public static int compare(MvccVersionAware row, long mvccCrdRight, long
mvccCntrRight) {
- return compare(row.mvccCoordinatorVersion(), row.mvccCounter(),
mvccCrdRight, mvccCntrRight);
- }
-
/**
* Compares to pairs of MVCC versions. See {@link Comparable}.
*
@@ -399,20 +375,6 @@ public class MvccUtils {
mvccVerLeft.operationCounter(), mvccCrdRight, mvccCntrRight,
mvccOpCntrRight);
}
- /**
- * Compares to pairs of coordinator/counter versions. See {@link
Comparable}.
- *
- * @param mvccCrdLeft First coordinator version.
- * @param mvccCntrLeft First counter version.
- * @param mvccOpCntrLeft First operation counter.
- * @param other The object to compare with.
- * @return Comparison result, see {@link Comparable}.
- */
- public static int compare(long mvccCrdLeft, long mvccCntrLeft, int
mvccOpCntrLeft, MvccVersionAware other) {
- return compare(mvccCrdLeft, mvccCntrLeft, mvccOpCntrLeft,
- other.mvccCoordinatorVersion(), other.mvccCounter(),
other.mvccOperationCounter());
- }
-
/**
* Compares to pairs of coordinator/counter versions. See {@link
Comparable}.
*
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionAware.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionAware.java
deleted file mode 100644
index 3bfefbc3659..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionAware.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.mvcc;
-
-/**
- *
- */
-public interface MvccVersionAware {
- /**
- * @return Mvcc coordinator version.
- */
- public long mvccCoordinatorVersion();
-
- /**
- * @return Mvcc counter.
- */
- public long mvccCounter();
-
- /**
- * @return Mvcc operation counter.
- */
- public int mvccOperationCounter();
-
- /**
- * @return Tx state hint for 'created' mvcc version.
- */
- public byte mvccTxState();
-
- /**
- * Copies mvcc version from another object.
- * @param other Info source.
- */
- public default void mvccVersion(MvccVersionAware other) {
- mvccVersion(other.mvccCoordinatorVersion(), other.mvccCounter(),
other.mvccOperationCounter());
- }
-
- /**
- * Sets mvcc version.
- * @param ver Mvcc version.
- */
- public default void mvccVersion(MvccVersion ver) {
- mvccVersion(ver.coordinatorVersion(), ver.counter(),
ver.operationCounter());
- }
-
- /**
- * Sets mvcc version.
- * @param crd Mvcc coordinator version.
- * @param cntr Mvcc counter.
- * @param opCntr Mvcc operation counter.
- */
- public default void mvccVersion(long crd, long cntr, int opCntr) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @return Mvcc version.
- */
- public default MvccVersion mvccVersion() {
- return new MvccVersionImpl(mvccCoordinatorVersion(), mvccCounter(),
mvccOperationCounter());
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRow.java
index 746b94aa4d8..647e68dbf51 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRow.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRow.java
@@ -19,7 +19,6 @@ package
org.apache.ignite.internal.processors.cache.persistence;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccUpdateVersionAware;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.AbstractDataPageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
@@ -28,7 +27,7 @@ import
org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
/**
* Cache data row.
*/
-public interface CacheDataRow extends MvccUpdateVersionAware, CacheSearchRow,
Storable {
+public interface CacheDataRow extends CacheSearchRow, Storable {
/**
* @return Cache value.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
index fb289b2d5b3..735d2ac630f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java
@@ -32,7 +32,6 @@ import
org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.IncompleteCacheObject;
import org.apache.ignite.internal.processors.cache.IncompleteObject;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState;
import
org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTreeRuntimeException;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.CacheVersionIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
@@ -50,9 +49,6 @@ import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.internal.pagemem.PageIdUtils.itemId;
import static org.apache.ignite.internal.pagemem.PageIdUtils.pageId;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_NA;
import static
org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter.RowData.KEY_ONLY;
import static
org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter.RowData.LINK_WITH_HEADER;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO.T_DATA;
@@ -928,46 +924,6 @@ public class CacheDataRowAdapter implements CacheDataRow {
return 0;
}
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return MVCC_CRD_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return MVCC_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return MVCC_OP_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return TxState.NA;
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCoordinatorVersion() {
- return MVCC_CRD_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCounter() {
- return MVCC_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public int newMvccOperationCounter() {
- return MVCC_OP_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public byte newMvccTxState() {
- return TxState.NA;
- }
-
/**
*
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheSearchRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheSearchRow.java
index c3cfb83d57d..1637eb05c47 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheSearchRow.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheSearchRow.java
@@ -18,12 +18,11 @@
package org.apache.ignite.internal.processors.cache.persistence;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccVersionAware;
/**
*
*/
-public interface CacheSearchRow extends MvccVersionAware {
+public interface CacheSearchRow {
/**
* @return Cache key.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index cddbb000f7e..0ae545ff32c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -1648,46 +1648,6 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
@Override public int cacheId() {
return entry.cacheId();
}
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCoordinatorVersion() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCounter() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public int newMvccOperationCounter() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return 0; // TODO IGNITE-7384
- }
-
- /** {@inheritDoc} */
- @Override public byte newMvccTxState() {
- return 0; // TODO IGNITE-7384
- }
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
index f89bc4c7029..bf5e0ac6390 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java
@@ -21,18 +21,15 @@ import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageUtils;
import org.apache.ignite.internal.processors.cache.CacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.GridStringBuilder;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_HINTS_BIT_OFF;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_HINTS_MASK;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.CACHE_ID;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.EXPIRE_TIME;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.KEY;
-import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.MVCC_INFO;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.VALUE;
import static
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO.EntryPart.VERSION;
@@ -63,31 +60,11 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
long addr = pageAddr + dataOff;
int cacheIdSize = row.cacheId() != 0 ? 4 : 0;
- int mvccInfoSize = row.mvccCoordinatorVersion() > 0 ? MVCC_INFO_SIZE :
0;
if (newRow) {
PageUtils.putShort(addr, 0, (short)payloadSize);
addr += 2;
- if (mvccInfoSize > 0) {
- assert
MvccUtils.mvccVersionIsValid(row.mvccCoordinatorVersion(), row.mvccCounter(),
row.mvccOperationCounter());
-
- // xid_min.
- PageUtils.putLong(addr, 0, row.mvccCoordinatorVersion());
- PageUtils.putLong(addr, 8, row.mvccCounter());
- PageUtils.putInt(addr, 16, row.mvccOperationCounter() |
(row.mvccTxState() << MVCC_HINTS_BIT_OFF));
-
- assert row.newMvccCoordinatorVersion() == MVCC_CRD_COUNTER_NA
- ||
MvccUtils.mvccVersionIsValid(row.newMvccCoordinatorVersion(),
row.newMvccCounter(), row.newMvccOperationCounter());
-
- // xid_max.
- PageUtils.putLong(addr, 20, row.newMvccCoordinatorVersion());
- PageUtils.putLong(addr, 28, row.newMvccCounter());
- PageUtils.putInt(addr, 36, row.newMvccOperationCounter() |
(row.newMvccTxState() << MVCC_HINTS_BIT_OFF));
-
- addr += mvccInfoSize;
- }
-
if (cacheIdSize != 0) {
PageUtils.putInt(addr, 0, row.cacheId());
@@ -97,7 +74,7 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
addr += row.key().putValue(addr);
}
else
- addr += (2 + mvccInfoSize + cacheIdSize +
row.key().valueBytesLength(null));
+ addr += (2 + cacheIdSize + row.key().valueBytesLength(null));
addr += row.value().putValue(addr);
@@ -117,8 +94,6 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
final int valSize = row.value().valueBytesLength(null);
int written = writeFragment(row, buf, rowOff, payloadSize,
- MVCC_INFO, keySize, valSize);
- written += writeFragment(row, buf, rowOff + written, payloadSize -
written,
CACHE_ID, keySize, valSize);
written += writeFragment(row, buf, rowOff + written, payloadSize -
written,
KEY, keySize, valSize);
@@ -161,42 +136,35 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
final int curLen;
int cacheIdSize = row.cacheId() == 0 ? 0 : 4;
- int mvccInfoSize = row.mvccCoordinatorVersion() > 0 ? MVCC_INFO_SIZE :
0;
switch (type) {
- case MVCC_INFO:
- prevLen = 0;
- curLen = mvccInfoSize;
-
- break;
-
case CACHE_ID:
- prevLen = mvccInfoSize;
- curLen = mvccInfoSize + cacheIdSize;
+ prevLen = 0;
+ curLen = cacheIdSize;
break;
case KEY:
- prevLen = mvccInfoSize + cacheIdSize;
- curLen = mvccInfoSize + cacheIdSize + keySize;
+ prevLen = cacheIdSize;
+ curLen = cacheIdSize + keySize;
break;
case EXPIRE_TIME:
- prevLen = mvccInfoSize + cacheIdSize + keySize;
- curLen = mvccInfoSize + cacheIdSize + keySize + 8;
+ prevLen = cacheIdSize + keySize;
+ curLen = cacheIdSize + keySize + 8;
break;
case VALUE:
- prevLen = mvccInfoSize + cacheIdSize + keySize + 8;
- curLen = mvccInfoSize + cacheIdSize + keySize + valSize + 8;
+ prevLen = cacheIdSize + keySize + 8;
+ curLen = cacheIdSize + keySize + valSize + 8;
break;
case VERSION:
- prevLen = mvccInfoSize + cacheIdSize + keySize + valSize + 8;
- curLen = mvccInfoSize + cacheIdSize + keySize + valSize +
CacheVersionIO.size(row.version(), false) + 8;
+ prevLen = cacheIdSize + keySize + valSize + 8;
+ curLen = cacheIdSize + keySize + valSize +
CacheVersionIO.size(row.version(), false) + 8;
break;
@@ -213,15 +181,6 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
writeExpireTimeFragment(buf, row.expireTime(), rowOff, len,
prevLen);
else if (type == CACHE_ID)
writeCacheIdFragment(buf, row.cacheId(), rowOff, len, prevLen);
- else if (type == MVCC_INFO)
- writeMvccInfoFragment(buf,
- row.mvccCoordinatorVersion(),
- row.mvccCounter(),
- row.mvccOperationCounter() | (row.mvccTxState() <<
MVCC_HINTS_BIT_OFF),
- row.newMvccCoordinatorVersion(),
- row.newMvccCounter(),
- row.newMvccOperationCounter() | (row.newMvccTxState() <<
MVCC_HINTS_BIT_OFF),
- len);
else if (type != VERSION) {
// Write key or value.
final CacheObject co = type == KEY ? row.key() : row.value();
@@ -500,38 +459,6 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
}
}
- /**
- * @param buf Byte buffer.
- * @param mvccCrd Coordinator version.
- * @param mvccCntr Counter.
- * @param mvccOpCntr Operation counter.
- * @param newMvccCrd New coordinator version.
- * @param newMvccCntr New counter version.
- * @param newMvccOpCntr New operation counter.
- * @param len Length.
- */
- private void writeMvccInfoFragment(ByteBuffer buf, long mvccCrd, long
mvccCntr, int mvccOpCntr, long newMvccCrd,
- long newMvccCntr, int newMvccOpCntr, int len) {
- if (mvccCrd == 0)
- return;
-
- assert len >= MVCC_INFO_SIZE : "Mvcc info should fit on the one page!";
-
- assert MvccUtils.mvccVersionIsValid(mvccCrd, mvccCntr, mvccOpCntr);
-
- // xid_min.
- buf.putLong(mvccCrd);
- buf.putLong(mvccCntr);
- buf.putInt(mvccOpCntr);
-
- assert newMvccCrd == 0 || MvccUtils.mvccVersionIsValid(newMvccCrd,
newMvccCntr, newMvccOpCntr);
-
- // xid_max.
- buf.putLong(newMvccCrd);
- buf.putLong(newMvccCntr);
- buf.putInt(newMvccOpCntr);
- }
-
/** {@inheritDoc} */
@Override protected void printPage(long addr, int pageSize,
GridStringBuilder sb) throws IgniteCheckedException {
sb.a("DataPageIO [\n");
@@ -556,9 +483,6 @@ public class DataPageIO extends
AbstractDataPageIO<CacheDataRow> {
EXPIRE_TIME,
/** */
- CACHE_ID,
-
- /** */
- MVCC_INFO
+ CACHE_ID
}
}
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 f4a53a1423c..a0bd1866725 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
@@ -97,12 +97,6 @@ public abstract class PageIO {
/** */
private static IOVersions<? extends BPlusLeafIO<?>> h2LeafIOs;
- /** */
- private static IOVersions<? extends BPlusInnerIO<?>> h2MvccInnerIOs;
-
- /** */
- private static IOVersions<? extends BPlusLeafIO<?>> h2MvccLeafIOs;
-
/** Maximum payload size. */
public static final short MAX_PAYLOAD_SIZE = 2048;
@@ -112,12 +106,6 @@ public abstract class PageIO {
/** */
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);
-
- /** */
- private static List<IOVersions<? extends BPlusLeafIO<?>>>
h2ExtraMvccLeafIOs = new ArrayList<>(MAX_PAYLOAD_SIZE);
-
/** */
public static final int TYPE_OFF = 0;
@@ -226,12 +214,6 @@ public abstract class PageIO {
/** */
public static final short T_DATA_REF_METASTORAGE_LEAF = 23;
- /** */
- public static final short T_H2_MVCC_REF_LEAF = 28;
-
- /** */
- public static final short T_H2_MVCC_REF_INNER = 29;
-
/** */
public static final short T_DATA_PART = 32;
@@ -256,18 +238,6 @@ public abstract class PageIO {
/** */
public static final short T_H2_EX_REF_INNER_END = T_H2_EX_REF_INNER_START
+ MAX_PAYLOAD_SIZE - 1;
- /** */
- public static final short T_H2_EX_REF_MVCC_LEAF_START = 23_000;
-
- /** */
- public static final short T_H2_EX_REF_MVCC_LEAF_END =
T_H2_EX_REF_MVCC_LEAF_START + MAX_PAYLOAD_SIZE - 1;
-
- /** */
- public static final short T_H2_EX_REF_MVCC_INNER_START = 26_000;
-
- /** */
- public static final short T_H2_EX_REF_MVCC_INNER_END =
T_H2_EX_REF_MVCC_INNER_START + MAX_PAYLOAD_SIZE - 1;
-
/** */
private final int ver;
@@ -491,19 +461,13 @@ public abstract class PageIO {
*
* @param innerIOs Inner IO versions.
* @param leafIOs Leaf IO versions.
- * @param mvccInnerIOs Inner IO versions with mvcc enabled.
- * @param mvccLeafIOs Leaf IO versions with mvcc enabled.
*/
public static void registerH2(
IOVersions<? extends BPlusInnerIO<?>> innerIOs,
- IOVersions<? extends BPlusLeafIO<?>> leafIOs,
- IOVersions<? extends BPlusInnerIO<?>> mvccInnerIOs,
- IOVersions<? extends BPlusLeafIO<?>> mvccLeafIOs
+ IOVersions<? extends BPlusLeafIO<?>> leafIOs
) {
h2InnerIOs = innerIOs;
h2LeafIOs = leafIOs;
- h2MvccInnerIOs = mvccInnerIOs;
- h2MvccLeafIOs = mvccLeafIOs;
}
/**
@@ -511,10 +475,8 @@ public abstract class PageIO {
*
* @param innerExtIOs Extra versions.
*/
- public static void registerH2ExtraInner(IOVersions<? extends
BPlusInnerIO<?>> innerExtIOs, boolean mvcc) {
- List<IOVersions<? extends BPlusInnerIO<?>>> ios = mvcc ?
h2ExtraMvccInnerIOs : h2ExtraInnerIOs;
-
- ios.add(innerExtIOs);
+ public static void registerH2ExtraInner(IOVersions<? extends
BPlusInnerIO<?>> innerExtIOs) {
+ h2ExtraInnerIOs.add(innerExtIOs);
}
/**
@@ -522,30 +484,24 @@ public abstract class PageIO {
*
* @param leafExtIOs Extra versions.
*/
- public static void registerH2ExtraLeaf(IOVersions<? extends
BPlusLeafIO<?>> leafExtIOs, boolean mvcc) {
- List<IOVersions<? extends BPlusLeafIO<?>>> ios = mvcc ?
h2ExtraMvccLeafIOs : h2ExtraLeafIOs;
-
- ios.add(leafExtIOs);
+ public static void registerH2ExtraLeaf(IOVersions<? extends
BPlusLeafIO<?>> leafExtIOs) {
+ h2ExtraLeafIOs.add(leafExtIOs);
}
/**
* @param idx Index.
* @return IOVersions for given idx.
*/
- public static IOVersions<? extends BPlusInnerIO<?>> getInnerVersions(int
idx, boolean mvcc) {
- List<IOVersions<? extends BPlusInnerIO<?>>> ios = mvcc ?
h2ExtraMvccInnerIOs : h2ExtraInnerIOs;
-
- return ios.get(idx);
+ public static IOVersions<? extends BPlusInnerIO<?>> getInnerVersions(int
idx) {
+ return h2ExtraInnerIOs.get(idx);
}
/**
* @param idx Index.
* @return IOVersions for given idx.
*/
- public static IOVersions<? extends BPlusLeafIO<?>> getLeafVersions(int
idx, boolean mvcc) {
- List<IOVersions<? extends BPlusLeafIO<?>>> ios = mvcc ?
h2ExtraMvccLeafIOs : h2ExtraLeafIOs;
-
- return ios.get(idx);
+ public static IOVersions<? extends BPlusLeafIO<?>> getLeafVersions(int
idx) {
+ return h2ExtraLeafIOs.get(idx);
}
/**
@@ -611,13 +567,10 @@ public abstract class PageIO {
* @param pageType Page type (can be obtained by {@link #getType(long)} or
{@link #getType(ByteBuffer)} methods).
*/
public static boolean isIndexPage(int pageType) {
- if ((T_H2_EX_REF_LEAF_START <= pageType && pageType <=
T_H2_EX_REF_LEAF_END) ||
- (T_H2_EX_REF_MVCC_LEAF_START <= pageType && pageType <=
T_H2_EX_REF_MVCC_LEAF_END)
- )
+ if (T_H2_EX_REF_LEAF_START <= pageType && pageType <=
T_H2_EX_REF_LEAF_END)
return true;
- 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);
+ return T_H2_EX_REF_INNER_START <= pageType && pageType <=
T_H2_EX_REF_INNER_END;
}
/** {@inheritDoc} */
@@ -719,12 +672,6 @@ public abstract class PageIO {
if (type >= T_H2_EX_REF_INNER_START && type <= T_H2_EX_REF_INNER_END)
return (Q)h2ExtraInnerIOs.get(type -
T_H2_EX_REF_INNER_START).forVersion(ver);
- if (type >= T_H2_EX_REF_MVCC_LEAF_START && type <=
T_H2_EX_REF_MVCC_LEAF_END)
- return (Q)h2ExtraMvccLeafIOs.get(type -
T_H2_EX_REF_MVCC_LEAF_START).forVersion(ver);
-
- if (type >= T_H2_EX_REF_MVCC_INNER_START && type <=
T_H2_EX_REF_MVCC_INNER_END)
- return (Q)h2ExtraMvccInnerIOs.get(type -
T_H2_EX_REF_MVCC_INNER_START).forVersion(ver);
-
switch (type) {
case T_H2_REF_INNER:
if (h2InnerIOs == null)
@@ -738,18 +685,6 @@ public abstract class PageIO {
return (Q)h2LeafIOs.forVersion(ver);
- case T_H2_MVCC_REF_INNER:
- if (h2MvccInnerIOs == null)
- break;
-
- return (Q)h2MvccInnerIOs.forVersion(ver);
-
- case T_H2_MVCC_REF_LEAF:
- if (h2MvccLeafIOs == null)
- break;
-
- return (Q)h2MvccLeafIOs.forVersion(ver);
-
case T_DATA_REF_INNER:
return (Q)DataInnerIO.VERSIONS.forVersion(ver);
@@ -813,25 +748,19 @@ public abstract class PageIO {
switch (pageIoType) {
case T_DATA_REF_INNER:
case T_H2_REF_INNER:
- case T_H2_MVCC_REF_INNER:
case T_CACHE_ID_AWARE_DATA_REF_INNER:
return IndexPageType.INNER;
case T_DATA_REF_LEAF:
case T_H2_REF_LEAF:
- case T_H2_MVCC_REF_LEAF:
case T_CACHE_ID_AWARE_DATA_REF_LEAF:
return IndexPageType.LEAF;
default:
- if ((T_H2_EX_REF_LEAF_START <= pageIoType && pageIoType <=
T_H2_EX_REF_LEAF_END) ||
- (T_H2_EX_REF_MVCC_LEAF_START <= pageIoType && pageIoType
<= T_H2_EX_REF_MVCC_LEAF_END)
- )
+ if (T_H2_EX_REF_LEAF_START <= pageIoType && pageIoType <=
T_H2_EX_REF_LEAF_END)
return IndexPageType.LEAF;
- if ((T_H2_EX_REF_INNER_START <= pageIoType && pageIoType <=
T_H2_EX_REF_INNER_END) ||
- (T_H2_EX_REF_MVCC_INNER_START <= pageIoType && pageIoType
<= T_H2_EX_REF_MVCC_INNER_END)
- )
+ if (T_H2_EX_REF_INNER_START <= pageIoType && pageIoType <=
T_H2_EX_REF_INNER_END)
return IndexPageType.INNER;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
index 4b166d4fcd4..6b6cb513ea9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
@@ -18,14 +18,9 @@
package org.apache.ignite.internal.processors.cache.tree;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState;
import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
import org.apache.ignite.internal.util.typedef.internal.S;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_NA;
-
/**
*
*/
@@ -80,26 +75,6 @@ public class SearchRow implements CacheSearchRow {
return cacheId;
}
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return MVCC_CRD_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return MVCC_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return MVCC_OP_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return TxState.NA;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(SearchRow.class, this);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIOFreeSizeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIOFreeSizeTest.java
index a73a956e267..9f4d82e6d17 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIOFreeSizeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIOFreeSizeTest.java
@@ -177,7 +177,7 @@ public class PageIOFreeSizeTest extends
GridCommonAbstractTest {
/** */
@Test
public void testBPlusIO() throws IgniteCheckedException {
- BPlusInnerIO<IndexRow> io = io(AbstractInlineInnerIO.versions(42,
false));
+ BPlusInnerIO<IndexRow> io = io(AbstractInlineInnerIO.versions(42));
int emptyPageSz = io.getMaxCount(addr, pageSz) * io.getItemSize();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
index af11bd726e4..abe7091861a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
@@ -634,46 +634,6 @@ public class CacheFreeListSelfTest extends
GridCommonAbstractTest {
@Override public int cacheId() {
return 0;
}
-
- /** {@inheritDoc} */
- @Override public long newMvccCoordinatorVersion() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCounter() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public int newMvccOperationCounter() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public byte newMvccTxState() {
- return 0;
- }
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2CacheRow.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2CacheRow.java
index 17496dda00f..5046e9dd914 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2CacheRow.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2CacheRow.java
@@ -238,46 +238,6 @@ public class H2CacheRow extends H2Row implements
CacheDataRow {
return row.cacheId();
}
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return row.mvccCoordinatorVersion();
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return row.mvccCounter();
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return row.mvccOperationCounter();
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return row.mvccTxState();
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCoordinatorVersion() {
- return row.newMvccCoordinatorVersion();
- }
-
- /** {@inheritDoc} */
- @Override public long newMvccCounter() {
- return row.newMvccCounter();
- }
-
- /** {@inheritDoc} */
- @Override public int newMvccOperationCounter() {
- return row.newMvccOperationCounter();
- }
-
- /** {@inheritDoc} */
- @Override public byte newMvccTxState() {
- return row.newMvccTxState();
- }
-
/** {@inheritDoc} */
@Override public boolean indexSearchRow() {
return false;
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2Row.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2Row.java
index 07ad4976e64..15aa2087b43 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2Row.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/H2Row.java
@@ -17,21 +17,15 @@
package org.apache.ignite.internal.processors.query.h2.opt;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccVersionAware;
-import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState;
import org.h2.result.Row;
import org.h2.result.SearchRow;
import org.h2.store.Data;
import org.h2.value.Value;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
-import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_NA;
-
/**
* Dummy H2 search row adadpter.
*/
-public abstract class H2Row implements Row, MvccVersionAware {
+public abstract class H2Row implements Row {
/** {@inheritDoc} */
@Override public void setKeyAndVersion(SearchRow old) {
throw new UnsupportedOperationException();
@@ -107,26 +101,6 @@ public abstract class H2Row implements Row,
MvccVersionAware {
throw new UnsupportedOperationException();
}
- /** {@inheritDoc} */
- @Override public long mvccCoordinatorVersion() {
- return MVCC_CRD_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public long mvccCounter() {
- return MVCC_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public int mvccOperationCounter() {
- return MVCC_OP_COUNTER_NA;
- }
-
- /** {@inheritDoc} */
- @Override public byte mvccTxState() {
- return TxState.NA;
- }
-
/**
* @return Expire time.
*/
