You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2019/01/24 10:24:49 UTC
[ignite] branch master updated: IGNITE-11044 Removed heap metrics
check for MVCC as Onheap cache is not supported - Fixes #5901.
This is an automated email from the ASF dual-hosted git repository.
ilyak 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 2b674b2 IGNITE-11044 Removed heap metrics check for MVCC as Onheap cache is not supported - Fixes #5901.
2b674b2 is described below
commit 2b674b237a85583a6e831dff2fbf11661d657b93
Author: Sergey Kosarev <sk...@gridgain.com>
AuthorDate: Thu Jan 24 13:24:16 2019 +0300
IGNITE-11044 Removed heap metrics check for MVCC as Onheap cache is not supported - Fixes #5901.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
.../processors/cache/CacheMetricsEntitiesCountTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
index 2bd72d8..c11c285 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
@@ -273,7 +273,10 @@ public class CacheMetricsEntitiesCountTest extends GridCommonAbstractTest {
metrics.getOffHeapBackupEntriesCount());
assertEquals(cacheInfo + " offHeapPrimaryEntriesCnt", offHeapPrimaryEntriesCnt,
metrics.getOffHeapPrimaryEntriesCount());
- assertEquals(cacheInfo + " heapEntriesCnt", heapEntriesCnt, metrics.getHeapEntriesCount());
+
+ if (!MvccFeatureChecker.forcedMvcc()) // Onheap cache is not supported in Mvcc mode.
+ assertEquals(cacheInfo + " heapEntriesCnt", heapEntriesCnt, metrics.getHeapEntriesCount());
+
assertEquals(cacheInfo + " size", cacheSize, metrics.getSize());
assertEquals(cacheInfo + " keySize", cacheSize, metrics.getKeySize());
assertEquals(cacheInfo + " isEmpty", cacheSize == 0, metrics.isEmpty());
@@ -294,7 +297,10 @@ public class CacheMetricsEntitiesCountTest extends GridCommonAbstractTest {
assertEquals(cacheInfo + " offHeapEntriesCnt", offHeapEntriesCnt, offHeapEntriesCntSum);
assertEquals(cacheInfo + " offHeapBackupEntriesCnt", offHeapBackupEntriesCnt, offHeapBackupEntriesCntSum);
assertEquals(cacheInfo + " offHeapPrimaryEntriesCnt", offHeapPrimaryEntriesCnt, offHeapPrimaryEntriesCntSum);
- assertEquals(cacheInfo + " heapEntriesCnt", heapEntriesCnt, heapEntriesCntSum);
+
+ if (!MvccFeatureChecker.forcedMvcc()) // Onheap cache is not supported in Mvcc mode.
+ assertEquals(cacheInfo + " heapEntriesCnt", heapEntriesCnt, heapEntriesCntSum);
+
assertEquals(cacheInfo + " isEmpty", cacheSize == 0, isEmptySum);
}
}