Repository: ignite Updated Branches: refs/heads/ignite-3478 b04849ea6 -> d46a03950
ignite-3478 Fix tests Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d46a0395 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d46a0395 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d46a0395 Branch: refs/heads/ignite-3478 Commit: d46a039506be32c1b472903525392fd3500e9c13 Parents: b04849e Author: sboikov <[email protected]> Authored: Fri Oct 27 14:52:13 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 27 14:52:13 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/persistence/CacheDataRow.java | 6 ++++++ .../processors/cache/persistence/CacheDataRowAdapter.java | 8 +++++++- .../cache/persistence/GridCacheOffheapManager.java | 5 +++++ .../ignite/internal/processors/cache/tree/MvccDataRow.java | 6 ++++++ .../internal/processors/database/FreeListImplSelfTest.java | 5 +++++ .../internal/processors/query/h2/IgniteH2Indexing.java | 4 ++++ .../internal/processors/query/h2/opt/GridH2KeyRowOnheap.java | 5 +++++ .../processors/query/h2/opt/GridH2KeyValueRowOnheap.java | 5 +++++ .../ignite/internal/processors/query/h2/opt/GridH2Row.java | 2 +- 9 files changed, 44 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRow.java ---------------------------------------------------------------------- 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 b76826f..9078176 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 @@ -59,4 +59,10 @@ public interface CacheDataRow extends CacheSearchRow { * @return {@code True} if this is row for cache remove operation (used only with mvcc). */ public boolean removed(); + + /** + * @param crdVer Mvcc coordinator version. + * @param mvccCntr Mvcc counter. + */ + public void mvccVersion(long crdVer, long mvccCntr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java ---------------------------------------------------------------------- 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 29bb6bf..e4bfed8 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 @@ -42,6 +42,7 @@ 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.CacheCoordinatorsProcessor.MVCC_COUNTER_NA; /** * Cache data row adapter. @@ -575,13 +576,18 @@ public class CacheDataRowAdapter implements CacheDataRow { } /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + throw new UnsupportedOperationException(); + } + + /** {@inheritDoc} */ @Override public long mvccCoordinatorVersion() { return 0; } /** {@inheritDoc} */ @Override public long mvccCounter() { - return 0; + return MVCC_COUNTER_NA; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java ---------------------------------------------------------------------- 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 c2d5256..a6bdca4 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 @@ -819,6 +819,11 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple } /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + throw new UnsupportedOperationException(); + } + + /** {@inheritDoc} */ @Override public int hash() { return entry.key().hashCode(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java index a2cf079..ee52587 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccDataRow.java @@ -93,6 +93,12 @@ public class MvccDataRow extends DataRow { } /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + this.crdVer = crdVer; + this.mvccCntr = mvccCntr; + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(MvccDataRow.class, this, "super", super.toString()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java index d6aaadf..8538fc9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java @@ -437,6 +437,11 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + throw new UnsupportedOperationException(); + } + + /** {@inheritDoc} */ @Override public boolean removed() { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index c84b221..db6eb78 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -160,6 +160,7 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_INDEXING_CACHE_ import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_INDEXING_CACHE_THREAD_USAGE_TIMEOUT; import static org.apache.ignite.IgniteSystemProperties.getInteger; import static org.apache.ignite.IgniteSystemProperties.getString; +import static org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor.MVCC_START_CNTR; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL_FIELDS; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.TEXT; @@ -705,6 +706,9 @@ public class IgniteH2Indexing implements GridQueryIndexing { SchemaIndexCacheVisitorClosure clo = new SchemaIndexCacheVisitorClosure() { @Override public void apply(CacheDataRow row) throws IgniteCheckedException { + if (rowDesc.context().mvccEnabled()) + row.mvccVersion(1, MVCC_START_CNTR); + GridH2Row h2Row = rowDesc.createRow(row, null); h2Idx.put(h2Row); http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyRowOnheap.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyRowOnheap.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyRowOnheap.java index 291f8c8..ed576a2 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyRowOnheap.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyRowOnheap.java @@ -60,4 +60,9 @@ public class GridH2KeyRowOnheap extends GridH2Row { @Override public long expireTime() { return 0; } + + /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + throw new UnsupportedOperationException(); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOnheap.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOnheap.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOnheap.java index 62b459a..729fe9d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOnheap.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOnheap.java @@ -102,6 +102,11 @@ public class GridH2KeyValueRowOnheap extends GridH2Row { } /** {@inheritDoc} */ + @Override public void mvccVersion(long crdVer, long mvccCntr) { + row.mvccVersion(crdVer, mvccCntr); + } + + /** {@inheritDoc} */ @Override public boolean indexSearchRow() { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d46a0395/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java index 785b791..5fec2c6 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java @@ -28,7 +28,7 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; */ public abstract class GridH2Row extends GridH2SearchRowAdapter implements CacheDataRow { /** Row. */ - private CacheDataRow row; + protected final CacheDataRow row; /** * @param row Row.
