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
The following commit(s) were added to refs/heads/ignite-11704 by this push: new 5010c38 ignite-11704 5010c38 is described below commit 5010c38efd35d6a900159a85b82360f99f24edb8 Author: sboikov <sboi...@apache.org> AuthorDate: Tue Jul 30 08:05:09 2019 +0300 ignite-11704 --- .../internal/processors/cache/IgniteCacheOffheapManager.java | 10 +++++++--- .../cache/persistence/GridCacheDatabaseSharedManager.java | 2 -- .../cache/distributed/CacheRemoveWithTombstonesTest.java | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) 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 e068059..aca75b6 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 @@ -398,7 +398,7 @@ public interface IgniteCacheOffheapManager { /** * @param cctx Cache context. * @param key Key. - * @param partId Partition number. + * @param ver Version. * @param part Partition. * @throws IgniteCheckedException If failed. */ @@ -919,10 +919,14 @@ public interface IgniteCacheOffheapManager { * @param cctx Cache context. * @param key Key. * @param ver Version. - * @param partId Partition number. + * @param part Partition. * @throws IgniteCheckedException If failed. */ - public void removeWithTombstone(GridCacheContext cctx, KeyCacheObject key, GridCacheVersion ver, GridDhtLocalPartition part) throws IgniteCheckedException; + public void removeWithTombstone( + GridCacheContext cctx, + KeyCacheObject key, + GridCacheVersion ver, + GridDhtLocalPartition part) throws IgniteCheckedException; /** * @param cctx Cache context. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 3fd36a0..b1a21de 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -121,8 +121,6 @@ import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionMetaStateRec import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; -import org.apache.ignite.internal.processors.cache.CacheObject; -import org.apache.ignite.internal.processors.cache.CacheObjectImpl; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.cache.ExchangeActions; import org.apache.ignite.internal.processors.cache.GridCacheContext; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java index cb4ad69..b098905 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java @@ -238,6 +238,7 @@ public class CacheRemoveWithTombstonesTest extends GridCommonAbstractTest { assertEquals(0, tombstoneMetric1.get()); } + /** * */