You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/10 15:55:22 UTC
[15/53] [abbrv] ignite git commit: Removed properties specific for
old OFFHEAP modes: offheapMaxMemory and sqlOnheapRowCacheSize.
Removed properties specific for old OFFHEAP modes: offheapMaxMemory and sqlOnheapRowCacheSize.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecfc45e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecfc45e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecfc45e2
Branch: refs/heads/ignite-3477-master
Commit: ecfc45e23bcbc5e440a74c594c21455bdd8b935e
Parents: 4ad8974
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 16:14:42 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 16:14:42 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 86 --------------------
.../processors/cache/CacheMetricsImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 1 -
.../utils/PlatformConfigurationUtils.java | 4 -
.../visor/cache/VisorCacheConfiguration.java | 1 -
.../cache/VisorCacheQueryConfiguration.java | 1 -
.../internal/ClusterNodeMetricsSelfTest.java | 1 -
.../cache/CacheNearReaderUpdateTest.java | 1 -
.../CacheSerializableTransactionsTest.java | 1 -
.../GridCacheAbstractLocalStoreSelfTest.java | 1 -
...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 -
.../cache/GridCacheOffheapUpdateSelfTest.java | 1 -
.../GridCacheValueBytesPreloadingSelfTest.java | 1 -
.../IgniteCacheConfigVariationsFullApiTest.java | 2 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 1 -
.../cache/IgniteCachePeekModesAbstractTest.java | 2 -
...heapCacheMetricsForClusterGroupSelfTest.java | 1 -
.../igfs/IgfsAbstractBaseSelfTest.java | 1 -
.../processors/igfs/IgfsMaxSizeSelfTest.java | 1 -
...gniteClientReconnectMassiveShutdownTest.java | 1 -
...IgniteCacheConfigVariationsAbstractTest.java | 7 --
.../impl/HadoopAbstractMapReduceTest.java | 1 -
.../igfs/HadoopFIleSystemFactorySelfTest.java | 1 -
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 1 -
.../CacheOffheapBatchIndexingBaseTest.java | 4 +-
.../CacheOffheapBatchIndexingMultiTypeTest.java | 17 +---
...CacheOffheapBatchIndexingSingleTypeTest.java | 20 +----
.../CacheOperationsWithExpirationTest.java | 1 -
.../CacheQueryOffheapEvictDataLostTest.java | 1 -
.../CacheRandomOperationsMultithreadedTest.java | 1 -
.../cache/GridCacheOffHeapSelfTest.java | 1 -
.../GridCacheOffheapIndexEntryEvictTest.java | 2 -
.../cache/GridCacheOffheapIndexGetSelfTest.java | 4 -
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 -
.../cache/IgniteCacheOffheapIndexScanTest.java | 1 -
.../IgniteCacheQueryMultiThreadedSelfTest.java | 10 ---
...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 -------
...eCacheQueryOffheapMultiThreadedSelfTest.java | 28 -------
.../cache/ttl/CacheTtlAbstractSelfTest.java | 1 -
.../IgniteCacheQuerySelfTestSuite2.java | 4 -
.../org/apache/ignite/yardstick/IgniteNode.java | 6 --
41 files changed, 7 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 476b983..271490b 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -161,9 +161,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default value for eager ttl flag. */
public static final boolean DFLT_EAGER_TTL = true;
- /** Default off-heap storage size is {@code -1} which means that off-heap storage is disabled. */
- public static final long DFLT_OFFHEAP_MEMORY = -1;
-
/** Default value for 'maxConcurrentAsyncOps'. */
public static final int DFLT_MAX_CONCURRENT_ASYNC_OPS = 500;
@@ -203,9 +200,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default number of queries detail metrics to collect. */
public static final int DFLT_QRY_DETAIL_METRICS_SIZE = 0;
- /** Default size for onheap SQL row cache size. */
- public static final int DFLT_SQL_ONHEAP_ROW_CACHE_SIZE = 10 * 1024;
-
/** Default value for keep binary in store behavior . */
@SuppressWarnings({"UnnecessaryBoxing", "BooleanConstructorCall"})
public static final Boolean DFLT_STORE_KEEP_BINARY = new Boolean(false);
@@ -313,9 +307,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Rebalance batches prefetch count. */
private long rebalanceBatchesPrefetchCount = DFLT_REBALANCE_BATCHES_PREFETCH_COUNT;
- /** Off-heap memory size. */
- private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
-
/** Maximum number of concurrent asynchronous operations. */
private int maxConcurrentAsyncOps = DFLT_MAX_CONCURRENT_ASYNC_OPS;
@@ -380,9 +371,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
private boolean sqlEscapeAll;
/** */
- private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
-
- /** */
private transient Class<?>[] indexedTypes;
/** Copy on read flag. */
@@ -464,7 +452,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
listenerConfigurations = cc.listenerConfigurations;
loadPrevVal = cc.isLoadPreviousValue();
longQryWarnTimeout = cc.getLongQueryWarningTimeout();
- offHeapMaxMem = cc.getOffHeapMaxMemory();
maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
sqlIndexMaxInlineSize = cc.getSqlIndexMaxInlineSize();
name = cc.getName();
@@ -486,7 +473,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
sqlSchema = cc.getSqlSchema();
sqlEscapeAll = cc.isSqlEscapeAll();
sqlFuncCls = cc.getSqlFunctionClasses();
- sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
startSize = cc.getStartSize();
storeFactory = cc.getCacheStoreFactory();
storeSesLsnrs = cc.getCacheStoreSessionListenerFactories();
@@ -1596,53 +1582,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets maximum amount of memory available to off-heap storage. Possible values are
- * <ul>
- * <li>{@code -1} - Means that off-heap storage is disabled.</li>
- * <li>
- * {@code 0} - Ignite will not limit off-heap storage (it's up to user to properly
- * add and remove entries from cache to ensure that off-heap storage does not grow
- * indefinitely.
- * </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li>
- * </ul>
- * Default value is {@code -1}, specified by {@link #DFLT_OFFHEAP_MEMORY} constant
- * which means that off-heap storage is disabled by default.
- * <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down
- * Garbage Collection. Essentially in this case you should allocate very small amount
- * of memory to JVM and Ignite will cache most of the data in off-heap space
- * without affecting JVM performance at all.
- * <p>
- * Note that Ignite will throw an exception if max memory is set to {@code -1} and
- * {@code offHeapValuesOnly} flag is set to {@code true}.
- *
- * @return Maximum memory in bytes available to off-heap memory space.
- */
- public long getOffHeapMaxMemory() {
- return offHeapMaxMem;
- }
-
- /**
- * Sets maximum amount of memory available to off-heap storage. Possible values are <ul> <li>{@code -1} - Means that
- * off-heap storage is disabled.</li> <li> {@code 0} - Ignite will not limit off-heap storage (it's up to user to
- * properly add and remove entries from cache to ensure that off-heap storage does not grow infinitely. </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li> </ul> Default value is {@code -1},
- * specified by {@link #DFLT_OFFHEAP_MEMORY} constant which means that off-heap storage is disabled by default. <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down Garbage Collection. Essentially in
- * this case you should allocate very small amount of memory to JVM and Ignite will cache most of the data in
- * off-heap space without affecting JVM performance at all.
- *
- * @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setOffHeapMaxMemory(long offHeapMaxMem) {
- this.offHeapMaxMem = offHeapMaxMem;
-
- return this;
- }
-
- /**
* Gets maximum number of query iterators that can be stored. Iterators are stored to
* support query pagination when each page of data is sent to user's node only on demand.
* Increase this property if you are running and processing lots of queries in parallel.
@@ -1970,31 +1909,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
- * This setting only makes sense when offheap is enabled for this cache.
- *
- * @return Cache size.
- * @see #setOffHeapMaxMemory(long)
- */
- public int getSqlOnheapRowCacheSize() {
- return sqlOnheapRowCacheSize;
- }
-
- /**
- * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
- * This setting only makes sense when offheap is enabled for this cache.
- *
- * @param size Cache size.
- * @see #setOffHeapMaxMemory(long)
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setSqlOnheapRowCacheSize(int size) {
- this.sqlOnheapRowCacheSize = size;
-
- return this;
- }
-
- /**
* Gets array of cache plugin configurations.
*
* @return Cache plugin configurations.
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 1613af7..534b6b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -241,7 +241,7 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getOffHeapMaxSize() {
- return cctx.config().getOffHeapMaxMemory();
+ return 0;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index c29e01e..b72a7fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -973,7 +973,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
ccfg.setBackups(cfg.getBackups());
ccfg.setCacheMode(cfg.getCacheMode());
ccfg.setAtomicityMode(cfg.getAtomicityMode());
- ccfg.setOffHeapMaxMemory(cfg.getOffHeapMaxMemory());
ccfg.setNodeFilter(cfg.getNodeFilter());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index e137d75..4f7ee5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -158,7 +158,6 @@ public class PlatformConfigurationUtils {
ccfg.setMaxConcurrentAsyncOperations(in.readInt());
ccfg.setEvictMaxOverflowRatio(in.readFloat());
ccfg.setName(in.readString());
- ccfg.setOffHeapMaxMemory(in.readLong());
ccfg.setReadFromBackup(in.readBoolean());
ccfg.setRebalanceBatchSize(in.readInt());
ccfg.setRebalanceDelay(in.readLong());
@@ -166,7 +165,6 @@ public class PlatformConfigurationUtils {
ccfg.setRebalanceThrottle(in.readLong());
ccfg.setRebalanceTimeout(in.readLong());
ccfg.setSqlEscapeAll(in.readBoolean());
- ccfg.setSqlOnheapRowCacheSize(in.readInt());
ccfg.setStartSize(in.readInt());
ccfg.setWriteBehindBatchSize(in.readInt());
ccfg.setWriteBehindEnabled(in.readBoolean());
@@ -785,7 +783,6 @@ public class PlatformConfigurationUtils {
writer.writeInt(ccfg.getMaxConcurrentAsyncOperations());
writer.writeFloat(ccfg.getEvictMaxOverflowRatio());
writer.writeString(ccfg.getName());
- writer.writeLong(ccfg.getOffHeapMaxMemory());
writer.writeBoolean(ccfg.isReadFromBackup());
writer.writeInt(ccfg.getRebalanceBatchSize());
writer.writeLong(ccfg.getRebalanceDelay());
@@ -793,7 +790,6 @@ public class PlatformConfigurationUtils {
writer.writeLong(ccfg.getRebalanceThrottle());
writer.writeLong(ccfg.getRebalanceTimeout());
writer.writeBoolean(ccfg.isSqlEscapeAll());
- writer.writeInt(ccfg.getSqlOnheapRowCacheSize());
writer.writeInt(ccfg.getStartSize());
writer.writeInt(ccfg.getWriteBehindBatchSize());
writer.writeBoolean(ccfg.isWriteBehindEnabled());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index e5325e2..e3ed666 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -127,7 +127,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean {
writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
invalidate = ccfg.isInvalidate();
startSize = ccfg.getStartSize();
- offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
interceptor = compactClass(ccfg.getInterceptor());
typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory(), ccfg.getTypeMetadata());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
index d753b76..a21cf43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
@@ -73,7 +73,6 @@ public class VisorCacheQueryConfiguration implements Serializable, LessNamingBea
longQryWarnTimeout = ccfg.getLongQueryWarningTimeout();
sqlEscapeAll = ccfg.isSqlEscapeAll();
indexedTypes = compactClasses(ccfg.getIndexedTypes());
- sqlOnheapRowCacheSize = ccfg.getSqlOnheapRowCacheSize();
sqlSchema = ccfg.getSqlSchema();
return this;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 35b3def..b43b1f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -90,7 +90,6 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
CacheConfiguration<Integer, Object> ccfg = defaultCacheConfiguration();
ccfg.setName(CACHE_NAME);
ccfg.setStatisticsEnabled(true);
- ccfg.setOffHeapMaxMemory(MAX_VALS_AMOUNT * VAL_SIZE);
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxMemorySize(MAX_VALS_AMOUNT * VAL_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
index 5dd2e2a..9bd7a8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
@@ -316,7 +316,6 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest {
", near=" + (ccfg.getNearConfiguration() != null) +
", store=" + ccfg.isWriteThrough() +
", evictPlc=" + (ccfg.getEvictionPolicy() != null) +
- ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index f3a39c3..3d29315 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -4886,7 +4886,6 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
", near=" + (ccfg.getNearConfiguration() != null) +
", store=" + ccfg.isWriteThrough() +
", evictPlc=" + (ccfg.getEvictionPolicy() != null) +
- ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 489a77d..64c60fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -192,7 +192,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
cacheCfg.setWriteThrough(true);
cacheCfg.setReadThrough(true);
cacheCfg.setBackups(backups);
- cacheCfg.setOffHeapMaxMemory(0);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 28f0ac5..a806b7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -52,7 +52,6 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
ccfg.setAtomicityMode(atomicityMode());
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
- ccfg.setOffHeapMaxMemory(1024 * 1024);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index 3693b33..2b82407 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -47,7 +47,6 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setNearConfiguration(null);
ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- ccfg.setOffHeapMaxMemory(0);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index 9d03e83..44adc84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -53,7 +53,6 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
ccfg.setAtomicityMode(ATOMIC);
ccfg.setNearConfiguration(null);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 083cdf3..6b1eb08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -3758,7 +3758,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
*/
private void checkKeyAfterLocalEvict(IgniteCache<String, Integer> cache, String k) {
assertNull(cache.localPeek(k, ONHEAP));
- assertEquals(offheapEnabled(), cache.localPeek(k, OFFHEAP) != null);
+ assertNotNull(cache.localPeek(k, OFFHEAP));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
index 007515b..6791172 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
@@ -80,7 +80,6 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract
cacheCfg.setBackups(1);
cacheCfg.setReadFromBackup(true);
cacheCfg.setEvictionPolicy(evictionPolicy);
- cacheCfg.setOffHeapMaxMemory(1024 * 1024 * 1024L);
cacheCfg.setStatisticsEnabled(true);
cacheCfg.setWriteThrough(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index ce6d2fa..025abf7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -89,8 +89,6 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setOffHeapMaxMemory(512);
-
ccfg.setBackups(1);
if (hasNearCache())
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
index 254cb9b..a3d3130 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
@@ -133,7 +133,6 @@ public class OffheapCacheMetricsForClusterGroupSelfTest extends GridCommonAbstra
cfg.setBackups(1);
cfg.setStatisticsEnabled(true);
- cfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
return cfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 4143029..55e1905 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -380,7 +380,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
index bfba10a..2e0be3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
@@ -55,7 +55,6 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index ae223b0..50e5093 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -138,7 +138,6 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract
cfg.setCacheMode(PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setBackups(2);
- cfg.setOffHeapMaxMemory(0);
IgniteCache<String, Integer> cache = client.getOrCreateCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
index b915f97..fa287bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
@@ -389,13 +389,6 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
}
/**
- * @return {@code True} if offheap memory is enabled.
- */
- protected boolean offheapEnabled() {
- return cacheConfiguration().getOffHeapMaxMemory() >= 0;
- }
-
- /**
* @return {@code True} if swap is enabled.
*/
protected boolean swapEnabled() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
index 12e1257..4928e3d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
@@ -376,7 +376,6 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
index 2e3a2a3..6b5690c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
@@ -235,7 +235,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
index ad6a9f4..3ffdf23 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -169,7 +169,6 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
index b457db8..41b6c83 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
@@ -86,16 +86,14 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra
}
/**
- * @param onHeapRowCacheSize on heap row cache size.
* @param indexedTypes indexed types for cache.
* @return Cache configuration.
*/
- protected CacheConfiguration<Object, Object> cacheConfiguration(int onHeapRowCacheSize, Class<?>[] indexedTypes) {
+ protected CacheConfiguration<Object, Object> cacheConfiguration(Class<?>[] indexedTypes) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setSqlOnheapRowCacheSize(onHeapRowCacheSize);
ccfg.setIndexedTypes(indexedTypes);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
index 602fc1c..87d10a1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
@@ -35,18 +35,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
doStreamerBatchTest(50, 1_000, new Class<?>[] {
Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class,
Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
- true);
- }
-
- /**
- * Tests putAll with multiple indexed entities and streamer preloading with default off-heap cache size.
- */
- public void testPutAllMultupleEntitiesAndStreamerDfltOffHeapRowCacheSize() {
- doStreamerBatchTest(50, 1_000, new Class<?>[] {
- Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class,
- Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- CacheConfiguration.DFLT_SQL_ONHEAP_ROW_CACHE_SIZE,
true);
}
@@ -57,7 +45,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
false);
}
@@ -65,18 +52,16 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
* @param iterations Number of iterations.
* @param entitiesCnt Number of entities to put.
* @param entityClasses Entity classes.
- * @param onHeapRowCacheSize Cache size.
* @param preloadInStreamer Data preload flag.
*/
private void doStreamerBatchTest(int iterations,
int entitiesCnt,
Class<?>[] entityClasses,
- int onHeapRowCacheSize,
boolean preloadInStreamer) {
Ignite ignite = grid(0);
final IgniteCache<Object, Object> cache =
- ignite.createCache(cacheConfiguration(onHeapRowCacheSize, entityClasses));
+ ignite.createCache(cacheConfiguration(entityClasses));
try {
if (preloadInStreamer)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
index c59e5fe..acf33dc 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
@@ -41,7 +41,7 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
public void testBatchRemove() throws Exception {
Ignite ignite = grid(0);
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(1,
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class});
final IgniteCache<Object, Object> cache = ignite.createCache(ccfg);
@@ -88,18 +88,6 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
- true);
- }
-
- /**
- *
- */
- public void testPutAllAndStreamerDfltOffHeapRowCacheSize() {
- doStreamerBatchTest(50,
- 1_000,
- new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- CacheConfiguration.DFLT_SQL_ONHEAP_ROW_CACHE_SIZE,
true);
}
@@ -110,7 +98,6 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
false);
}
@@ -118,18 +105,17 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
* @param iterations Number of iterations.
* @param entitiesCnt Number of entities to put.
* @param entityClasses Entity classes.
- * @param onHeapRowCacheSize Cache size.
+
* @param preloadInStreamer Data preload flag.
*/
private void doStreamerBatchTest(int iterations,
int entitiesCnt,
Class<?>[] entityClasses,
- int onHeapRowCacheSize,
boolean preloadInStreamer) {
Ignite ignite = grid(0);
final IgniteCache<Object, Object> cache =
- ignite.createCache(cacheConfiguration(onHeapRowCacheSize, entityClasses));
+ ignite.createCache(cacheConfiguration(entityClasses));
try {
if (preloadInStreamer)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
index 7706884..33c82b7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
@@ -61,7 +61,6 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
CacheConfiguration<String, TestIndexedType> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setOffHeapMaxMemory(offheapMem);
ccfg.setBackups(1);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
index 690fff8..0d9948d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
@@ -52,7 +52,6 @@ public class CacheQueryOffheapEvictDataLostTest extends GridCommonAbstractTest {
ccfg.setName("cache-1");
ccfg.setEvictionPolicy(new LruEvictionPolicy(10));
- ccfg.setOffHeapMaxMemory(1024);
ccfg.setIndexedTypes(Integer.class, TestData.class);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index 5fb0fb8..24308cf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -348,7 +348,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setEvictionPolicy(evictionPlc);
- ccfg.setOffHeapMaxMemory(0);
if (cacheMode == PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index 2c083fb..148ce74 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -87,7 +87,6 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(REPLICATED);
- cacheCfg.setOffHeapMaxMemory(1024L * 1024L * 1024L);
cacheCfg.setIndexedTypes(Integer.class, CacheValue.class);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
index efa14c1..d64aa7c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
@@ -62,10 +62,8 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setOffHeapMaxMemory(0);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setEvictionPolicy(null);
- cacheCfg.setSqlOnheapRowCacheSize(10);
cacheCfg.setIndexedTypes(Integer.class, TestValue.class);
cacheCfg.setNearConfiguration(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
index 1463134..60fe5bf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -47,9 +47,6 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED;
*/
public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
/** */
- private static final long OFFHEAP_MEM = 10L * 1024L;
-
- /** */
private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
@@ -78,7 +75,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM);
cacheCfg.setEvictSynchronized(true);
cacheCfg.setEvictSynchronizedKeyBufferSize(1);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index 57a8669..22856b5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -68,14 +68,10 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
cacheCfg.setEvictionPolicy(null);
cacheCfg.setNearConfiguration(null);
- cacheCfg.setSqlOnheapRowCacheSize(128);
-
cacheCfg.setIndexedTypes(
Integer.class, Integer.class
);
- cacheCfg.setOffHeapMaxMemory(2000); // Small offheap for evictions from offheap to swap.
-
cfg.setCacheConfiguration(cacheCfg);
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
index 6b4a546..6f46d33 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
@@ -56,7 +56,6 @@ public class IgniteCacheOffheapIndexScanTest extends GridCommonAbstractTest {
CacheConfiguration<?,?> cacheCfg = new CacheConfiguration<>();
cacheCfg.setCacheMode(LOCAL);
- cacheCfg.setSqlOnheapRowCacheSize(256);
cacheCfg.setIndexedTypes(
Integer.class, Person.class
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index c41da80..382b1ed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -121,11 +121,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
cacheCfg.setEvictionPolicy(plc);
- cacheCfg.setSqlOnheapRowCacheSize(128);
-
- if (offheapEnabled())
- cacheCfg.setOffHeapMaxMemory(evictsEnabled() ? 1000 : 0); // Small offheap for evictions.
-
return cacheCfg;
}
@@ -162,11 +157,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
}
}
- /** @return {@code true} If offheap enabled. */
- protected boolean offheapEnabled() {
- return false;
- }
-
/** @return {@code true} If evictions enabled. */
protected boolean evictsEnabled() {
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
deleted file mode 100644
index d7d2b5a..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +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;
-
-/**
- * Multi-threaded tests for cache queries.
- */
-public class IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest extends IgniteCacheQueryOffheapMultiThreadedSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean evictsEnabled() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
deleted file mode 100644
index db132b8..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +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;
-
-/**
- * Queries over off-heap indexes.
- */
-public class IgniteCacheQueryOffheapMultiThreadedSelfTest extends IgniteCacheQueryMultiThreadedSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean offheapEnabled() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index 4152179..c07d7a5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -77,7 +77,6 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setOffHeapMaxMemory(0);
LruEvictionPolicy plc = new LruEvictionPolicy();
plc.setMaxSize(MAX_CACHE_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
index eab5c7a..2d48411 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
@@ -23,8 +23,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRand
import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest;
@@ -45,11 +43,9 @@ public class IgniteCacheQuerySelfTestSuite2 extends TestSuite {
TestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite 2");
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
// TODO GG-11140.
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index ff193b7..59b31f9 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -125,12 +125,6 @@ public class IgniteNode implements BenchmarkServer {
c.setConnectorConfiguration(ccc);
}
- if (args.isOffHeap()) {
- cc.setOffHeapMaxMemory(0);
-
- cc.setEvictionPolicy(new LruEvictionPolicy(50000));
- }
-
cc.setReadThrough(args.isStoreEnabled());
cc.setWriteThrough(args.isStoreEnabled());