This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 86bc43e24e2a5cec9060470b8958631605e50963 Author: sboikov <[email protected]> AuthorDate: Tue Jul 23 07:23:40 2019 +0300 ignite-11704 --- .../internal/processors/cache/CacheGroupContext.java | 2 +- .../processors/cache/IgniteCacheOffheapManager.java | 2 -- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 15 +-------------- .../distributed/dht/topology/GridDhtLocalPartition.java | 3 --- .../processors/cache/persistence/CacheDataRowAdapter.java | 4 +++- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java index ffff101..cbdb3e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java @@ -1293,7 +1293,7 @@ public class CacheGroupContext { } public boolean supportsTombstone() { - return !hasAtomicCaches && !mvccEnabled && !isLocal(); + return !sharedGroup() && !hasAtomicCaches && !mvccEnabled && !isLocal(); } public boolean createTombstone(@Nullable GridDhtLocalPartition part) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java index c883343..2272439 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java @@ -453,8 +453,6 @@ public interface IgniteCacheOffheapManager { */ public GridIterator<CacheDataRow> partitionIterator(final int part, boolean withTombstones) throws IgniteCheckedException; - public GridIterator<CacheDataRow> tombstonesIterator(final int part) throws IgniteCheckedException; - /** * @param part Partition number. * @param topVer Topology version. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index f653342..6683237 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -898,19 +898,6 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager return iterator(CU.UNDEFINED_CACHE_ID, singletonIterator(data), null, null, withTombstones); } - /** {@inheritDoc} */ - @Override public GridIterator<CacheDataRow> tombstonesIterator(int part) { - assert locCacheDataStore == null; - - CacheDataStore data = partitionData(part); - - if (data == null) - return new GridEmptyCloseableIterator<>(); - - // TODO IGNITE-11704. - return iterator(CU.UNDEFINED_CACHE_ID, singletonIterator(data), null, null, true); - } - /** * * @param cacheId Cache ID. @@ -2940,7 +2927,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager @Override public GridCursor<? extends CacheDataRow> cursor(boolean withTombstones) throws IgniteCheckedException { GridCursor<? extends CacheDataRow> cur = dataTree.find(null, null); - return withTombstones ? cursorSkipEmpty(cur) : cursorSkipTombstone(cur); + return withTombstones ? cur : cursorSkipTombstone(cur); } private GridCursor<? extends CacheDataRow> cursorSkipEmpty(final GridCursor<? extends CacheDataRow> cur) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java index b5a63e6..d24cfee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java @@ -1157,9 +1157,6 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements while (cur.next()) { CacheDataRow row = cur.get(); - if (!grp.offheap().isTombstone(row)) - continue; - assert row.key() != null; assert row.version() != null; 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 f168903..1be2bb5 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 @@ -272,8 +272,10 @@ public class CacheDataRowAdapter implements CacheDataRow { else if (rowData == TOMBSTONES) { // TODO IGNITE-11704. if (val != null && !sharedCtx.database().isTombstone(this)) { - verReady = true; ver = null; + key = null; + val = null; + verReady = true; return; }
