You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/03/05 00:39:35 UTC
[19/22] incubator-ignite git commit: ignite-sql-test - config changes
ignite-sql-test - config changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c55f86e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c55f86e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c55f86e
Branch: refs/heads/ignite-sql-tests
Commit: 6c55f86eb49dcec32d2526fed9b52f11af1895a5
Parents: c32e4e0
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Mar 5 01:49:50 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Mar 5 01:49:50 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 86 +-------------------
.../org/apache/ignite/internal/IgnitionEx.java | 2 -
.../processors/cache/GridCacheAttributes.java | 2 -
.../cache/GridCacheClearAllRunnable.java | 5 +-
.../processors/cache/GridCacheContext.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 13 +--
.../processors/cache/GridCacheUtils.java | 1 -
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../cache/query/GridCacheQueryAdapter.java | 3 +-
.../cache/query/GridCacheQueryManager.java | 9 +-
.../internal/processors/igfs/IgfsProcessor.java | 6 --
.../processors/query/GridQueryProcessor.java | 8 ++
.../visor/cache/VisorCacheConfiguration.java | 2 -
.../cache/VisorCacheDefaultConfiguration.java | 1 -
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 2 -
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 -
.../GridDiscoveryManagerAliveCacheSelfTest.java | 1 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 -
...idCacheConfigurationConsistencySelfTest.java | 22 -----
.../GridCacheDeploymentOffHeapSelfTest.java | 1 -
.../cache/GridCacheKeyCheckSelfTest.java | 1 -
.../processors/cache/GridCacheLeakTest.java | 1 -
.../cache/GridCacheMemoryModeSelfTest.java | 1 -
.../processors/cache/GridCacheOffHeapTest.java | 1 -
.../cache/GridCacheP2PUndeploySelfTest.java | 2 -
.../cache/GridCachePutAllFailoverSelfTest.java | 1 -
.../GridCacheQueryIndexingDisabledSelfTest.java | 2 -
.../GridCacheQueryInternalKeysSelfTest.java | 1 -
.../processors/cache/GridCacheStopSelfTest.java | 1 -
.../IgniteTxExceptionAbstractSelfTest.java | 1 -
...tractPartitionedByteArrayValuesSelfTest.java | 2 -
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 1 -
...stractReplicatedByteArrayValuesSelfTest.java | 2 -
...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 1 -
...heNearOnlyLruNearEvictionPolicySelfTest.java | 1 -
.../GridCacheLocalByteArrayValuesSelfTest.java | 1 -
...ridCacheContinuousQueryAbstractSelfTest.java | 1 -
...heIgfsPerBlockLruEvictionPolicySelfTest.java | 4 -
.../processors/igfs/IgfsAbstractSelfTest.java | 2 -
.../processors/igfs/IgfsCacheSelfTest.java | 1 -
.../igfs/IgfsDataManagerSelfTest.java | 1 -
.../igfs/IgfsMetaManagerSelfTest.java | 1 -
.../processors/igfs/IgfsMetricsSelfTest.java | 4 -
.../processors/igfs/IgfsModesSelfTest.java | 4 -
.../processors/igfs/IgfsProcessorSelfTest.java | 1 -
.../igfs/IgfsProcessorValidationSelfTest.java | 7 --
...IpcEndpointRegistrationAbstractSelfTest.java | 2 -
.../processors/igfs/IgfsSizeSelfTest.java | 2 -
.../processors/igfs/IgfsStreamsSelfTest.java | 1 -
.../processors/igfs/IgfsTaskSelfTest.java | 2 -
.../IgfsAbstractRecordResolverSelfTest.java | 2 -
.../cache/GridCacheCommandHandlerSelfTest.java | 1 -
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 1 -
.../swap/GridSwapEvictAllBenchmark.java | 1 -
.../marshaller/GridMarshallerAbstractTest.java | 1 -
.../testframework/junits/GridAbstractTest.java | 1 -
.../IgfsHadoop20FileSystemAbstractSelfTest.java | 4 -
.../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 -
.../IgfsHadoopFileSystemAbstractSelfTest.java | 4 -
.../IgfsHadoopFileSystemClientSelfTest.java | 2 -
.../IgfsHadoopFileSystemHandshakeSelfTest.java | 2 -
.../IgfsHadoopFileSystemIpcCacheSelfTest.java | 2 -
...IgfsHadoopFileSystemLoggerStateSelfTest.java | 2 -
...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 -
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 1 -
.../GridCacheQueryIndexDisabledSelfTest.java | 2 -
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 3 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +-
...gniteCacheReplicatedFieldsQuerySelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 3 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 -
.../commands/cache/VisorCacheCommandSpec.scala | 1 -
73 files changed, 33 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/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 03c522a..d9fb719 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
@@ -70,9 +70,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default value for cache distribution mode. */
public static final CacheDistributionMode DFLT_DISTRIBUTION_MODE = CacheDistributionMode.PARTITIONED_ONLY;
- /** Default query timeout. */
- public static final long DFLT_QUERY_TIMEOUT = 0;
-
/** Default lock timeout. */
public static final long DFLT_LOCK_TIMEOUT = 0;
@@ -127,9 +124,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default value for 'maxConcurrentAsyncOps'. */
public static final int DFLT_MAX_CONCURRENT_ASYNC_OPS = 500;
- /** Default value for 'queryIndexEnabled' flag. */
- public static final boolean DFLT_QUERY_INDEX_ENABLED = false;
-
/** Default value for 'writeBehindEnabled' flag. */
public static final boolean DFLT_WRITE_BEHIND_ENABLED = false;
@@ -148,9 +142,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default batch size for write-behind cache store. */
public static final int DFLT_WRITE_BEHIND_BATCH_SIZE = 512;
- /** Default maximum number of query iterators that can be stored. */
- public static final int DFLT_MAX_QUERY_ITERATOR_CNT = 1024;
-
/** Default value for load previous value flag. */
public static final boolean DFLT_LOAD_PREV_VAL = false;
@@ -211,9 +202,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default lock timeout. */
private long dfltLockTimeout = DFLT_LOCK_TIMEOUT;
- /** Default query timeout. */
- private long dfltQryTimeout = DFLT_QUERY_TIMEOUT;
-
/** Default cache start size. */
private int startSize = DFLT_START_SIZE;
@@ -274,9 +262,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Maximum number of concurrent asynchronous operations. */
private int maxConcurrentAsyncOps = DFLT_MAX_CONCURRENT_ASYNC_OPS;
- /** */
- private boolean qryIdxEnabled = DFLT_QUERY_INDEX_ENABLED;
-
/** Write-behind feature. */
private boolean writeBehindEnabled = DFLT_WRITE_BEHIND_ENABLED;
@@ -292,9 +277,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Maximum batch size for write-behind cache store. */
private int writeBehindBatchSize = DFLT_WRITE_BEHIND_BATCH_SIZE;
- /** Maximum number of query iterators that can be stored. */
- private int maxQryIterCnt = DFLT_MAX_QUERY_ITERATOR_CNT;
-
/** Memory mode. */
private CacheMemoryMode memMode = DFLT_MEMORY_MODE;
@@ -350,7 +332,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
if (!(cfg instanceof CacheConfiguration))
return;
- CacheConfiguration cc = (CacheConfiguration)cfg;
+ CacheConfiguration<K,V> cc = (CacheConfiguration<K,V>)cfg;
/*
* NOTE: MAKE SURE TO PRESERVE ALPHABETIC ORDER!
@@ -365,7 +347,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
cacheMode = cc.getCacheMode();
cacheWriterFactory = cc.getCacheWriterFactory();
dfltLockTimeout = cc.getDefaultLockTimeout();
- dfltQryTimeout = cc.getDefaultQueryTimeout();
distro = cc.getDistributionMode();
eagerTtl = cc.isEagerTtl();
evictFilter = cc.getEvictionFilter();
@@ -387,7 +368,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
longQryWarnTimeout = cc.getLongQueryWarningTimeout();
offHeapMaxMem = cc.getOffHeapMaxMemory();
maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
- maxQryIterCnt = cc.getMaximumQueryIteratorCount();
memMode = cc.getMemoryMode();
name = cc.getName();
nearStartSize = cc.getNearStartSize();
@@ -399,7 +379,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
preloadPoolSize = cc.getPreloadThreadPoolSize();
preloadTimeout = cc.getPreloadTimeout();
preloadThrottle = cc.getPreloadThrottle();
- qryIdxEnabled = cc.isQueryIndexEnabled();
readFromBackup = cc.isReadFromBackup();
sqlEscapeAll = cc.isSqlEscapeAll();
sqlFuncCls = cc.getSqlFunctionClasses();
@@ -974,25 +953,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets default query timeout. Default value is defined by {@link #DFLT_QUERY_TIMEOUT}. {@code 0} (zero)
- * means that the query will never timeout and will wait for completion.
- *
- * @return Default query timeout, {@code 0} for never.
- */
- public long getDefaultQueryTimeout() {
- return dfltQryTimeout;
- }
-
- /**
- * Sets default query timeout, {@code 0} for never. For more information see {@link #getDefaultQueryTimeout()}.
- *
- * @param dfltQryTimeout Default query timeout.
- */
- public void setDefaultQueryTimeout(long dfltQryTimeout) {
- this.dfltQryTimeout = dfltQryTimeout;
- }
-
- /**
* Invalidation flag. If {@code true}, values will be invalidated (nullified) upon commit in near cache.
*
* @return Invalidation flag.
@@ -1169,28 +1129,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Flag indicating whether Ignite should attempt to index value and/or key instances
- * stored in cache. If this property is {@code false}, then all indexing annotations
- * inside of any class will be ignored. By default query indexing is disabled and
- * defined via {@link #DFLT_QUERY_INDEX_ENABLED} constant.
- *
- * @return {@code True} if query indexing is enabled.
- * @see #getMemoryMode()
- */
- public boolean isQueryIndexEnabled() {
- return qryIdxEnabled;
- }
-
- /**
- * Flag indicating whether query indexing is enabled or not.
- *
- * @param qryIdxEnabled {@code True} if query indexing is enabled.
- */
- public void setQueryIndexEnabled(boolean qryIdxEnabled) {
- this.qryIdxEnabled = qryIdxEnabled;
- }
-
- /**
* Flag indicating whether Ignite should use write-behind behaviour for the cache store.
* By default write-behind is disabled which is defined via {@link #DFLT_WRITE_BEHIND_ENABLED}
* constant.
@@ -1489,28 +1427,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * 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.
- * <p>
- * Default value is {@link #DFLT_MAX_QUERY_ITERATOR_CNT}.
- *
- * @return Maximum number of query iterators that can be stored.
- */
- public int getMaximumQueryIteratorCount() {
- return maxQryIterCnt;
- }
-
- /**
- * Sets maximum number of query iterators that can be stored.
- *
- * @param maxQryIterCnt Maximum number of query iterators that can be stored.
- */
- public void setMaximumQueryIteratorCount(int maxQryIterCnt) {
- this.maxQryIterCnt = maxQryIterCnt;
- }
-
- /**
* Gets memory mode for cache. Memory mode helps control whether value is stored in on-heap memory,
* off-heap memory, or swap space. Refer to {@link CacheMemoryMode} for more info.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index cb2efbf..7bbc2b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1868,7 +1868,6 @@ public class IgnitionEx {
cache.setCacheMode(REPLICATED);
cache.setAtomicityMode(TRANSACTIONAL);
cache.setSwapEnabled(false);
- cache.setQueryIndexEnabled(false);
cache.setPreloadMode(SYNC);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100));
@@ -1892,7 +1891,6 @@ public class IgnitionEx {
ccfg.setName(CU.ATOMICS_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setSwapEnabled(false);
- ccfg.setQueryIndexEnabled(false);
ccfg.setPreloadMode(SYNC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setCacheMode(cfg.getCacheMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 9874d41..6436bca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -153,7 +153,6 @@ public class GridCacheAttributes implements Externalizable {
atomicityMode = cfg.getAtomicityMode();
cacheMode = cfg.getCacheMode();
dfltLockTimeout = cfg.getDefaultLockTimeout();
- dfltQryTimeout = cfg.getDefaultQueryTimeout();
evictMaxOverflowRatio = cfg.getEvictMaxOverflowRatio();
evictNearSync = cfg.isEvictNearSynchronized();
evictSync = cfg.isEvictSynchronized();
@@ -162,7 +161,6 @@ public class GridCacheAttributes implements Externalizable {
partDistro = GridCacheUtils.distributionMode(cfg);
preloadBatchSize = cfg.getPreloadBatchSize();
preloadMode = cfg.getPreloadMode();
- qryIdxEnabled = cfg.isQueryIndexEnabled();
readThrough = cfg.isReadThrough();
storeValBytes = cfg.isStoreValueBytes();
swapEnabled = cfg.isSwapEnabled();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
index 78d92e6..824443b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.util.*;
@@ -79,7 +80,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
// Clear swapped entries.
if (!ctx.isNear()) {
if (ctx.swap().offHeapEnabled()) {
- if (ctx.config().isQueryIndexEnabled()) {
+ if (GridQueryProcessor.isQueryIndexEnabled(ctx.config())) {
for (Iterator<Map.Entry<K, V>> it = ctx.swap().lazyOffHeapIterator(); it.hasNext();) {
Map.Entry<K, V> e = it.next();
@@ -94,7 +95,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
if (ctx.isSwapOrOffheapEnabled()) {
if (ctx.swap().swapEnabled()) {
- if (ctx.config().isQueryIndexEnabled()) {
+ if (GridQueryProcessor.isQueryIndexEnabled(ctx.config())) {
Iterator<Map.Entry<K, V>> it = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 44f8e69..ecd03f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -43,6 +43,7 @@ import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.processors.closure.*;
import org.apache.ignite.internal.processors.offheap.*;
import org.apache.ignite.internal.processors.portable.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.lang.*;
@@ -1441,7 +1442,7 @@ public class GridCacheContext<K, V> implements Externalizable {
* @return {@code True} if values should be always unmarshalled.
*/
public boolean isUnmarshalValues() {
- return cacheCfg.isQueryIndexEnabled() || !cacheCfg.isStoreValueBytes();
+ return GridQueryProcessor.isQueryIndexEnabled(cacheCfg) || !cacheCfg.isStoreValueBytes();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index afb1b08..8e35e12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.processors.cache.query.continuous.*;
import org.apache.ignite.internal.processors.cache.serialization.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -286,8 +287,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (hasStore && cfg.isWriteThrough())
perf.add("Enable write-behind to persistent store (set 'writeBehindEnabled' to true)",
cfg.isWriteBehindEnabled());
-
- perf.add("Disable query index (set 'queryIndexEnabled' to false)", !cfg.isQueryIndexEnabled());
}
/**
@@ -425,20 +424,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
if (cc.getMemoryMode() == CacheMemoryMode.OFFHEAP_VALUES) {
- if (cc.isQueryIndexEnabled())
+ if (GridQueryProcessor.isQueryIndexEnabled(cc))
throw new IgniteCheckedException("Cannot have query indexing enabled while values are stored off-heap. " +
"You must either disable query indexing or disable off-heap values only flag for cache: " +
cc.getName());
}
- boolean igfsCache = CU.isIgfsCache(c, cc.getName());
- boolean utilityCache = CU.isUtilityCache(cc.getName());
-
- if (!igfsCache && !utilityCache && !cc.isQueryIndexEnabled())
- U.warn(log, "Query indexing is disabled (queries will not work) for cache: '" + cc.getName() + "'. " +
- "To enable change GridCacheConfiguration.isQueryIndexEnabled() property.",
- "Query indexing is disabled (queries will not work) for cache: " + cc.getName());
-
if (cc.getAtomicityMode() == ATOMIC)
assertParameter(cc.getTransactionManagerLookupClassName() == null,
"transaction manager can not be used with ATOMIC cache");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 1e67907..c977d8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1509,7 +1509,6 @@ public class GridCacheUtils {
cache.setEvictionPolicy(null);
cache.setSwapEnabled(false);
- cache.setQueryIndexEnabled(false);
cache.setCacheStoreFactory(null);
cache.setEagerTtl(true);
cache.setPreloadMode(SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 719b2bc..a4f564d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
@@ -476,7 +477,8 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
* @throws CacheException If query indexing disabled for sql query.
*/
private void validate(Query qry) {
- if (!ctx.config().isQueryIndexEnabled() && !(qry instanceof ScanQuery) && !(qry instanceof ContinuousQuery))
+ if (!GridQueryProcessor.isQueryIndexEnabled(ctx.config()) && !(qry instanceof ScanQuery) &&
+ !(qry instanceof ContinuousQuery))
throw new CacheException("Indexing is disabled for cache: " + ctx.cache().name());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 0c81e5e..222eac3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -23,6 +23,7 @@ import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -354,7 +355,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
* @throws IgniteCheckedException If query is invalid.
*/
public void validate() throws IgniteCheckedException {
- if ((type != SCAN && type != SET) && !cctx.config().isQueryIndexEnabled())
+ if ((type != SCAN && type != SET) && !GridQueryProcessor.isQueryIndexEnabled(cctx.config()))
throw new IgniteCheckedException("Indexing is disabled for cache: " + cctx.cache().name());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 4e810a3..6f4cd78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -61,6 +61,9 @@ import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryTy
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapter<K, V> {
/** */
+ public static int MAX_ITERATORS = 1000;
+
+ /** */
protected GridQueryProcessor qryProc;
/** */
@@ -90,7 +93,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
@Override public void start0() throws IgniteCheckedException {
qryProc = cctx.kernalContext().query();
space = cctx.name();
- maxIterCnt = cctx.config().getMaximumQueryIteratorCount();
+ maxIterCnt = MAX_ITERATORS;
cctx.events().addListener(new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
@@ -324,7 +327,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
assert key != null;
assert val != null || valBytes != null;
- if (!cctx.config().isQueryIndexEnabled() && !(key instanceof GridCacheInternal))
+ if (!GridQueryProcessor.isQueryIndexEnabled(cctx.config()) && !(key instanceof GridCacheInternal))
return; // No-op.
if (!enterBusy())
@@ -352,7 +355,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
public void remove(K key, @Nullable byte[] keyBytes) throws IgniteCheckedException {
assert key != null;
- if (!cctx.config().isQueryIndexEnabled() && !(key instanceof GridCacheInternal))
+ if (!GridQueryProcessor.isQueryIndexEnabled(cctx.config()) && !(key instanceof GridCacheInternal))
return; // No-op.
if (!enterBusy())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index 847cd50..872610a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -273,17 +273,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
if (dataCache == null)
throw new IgniteCheckedException("Data cache is not configured locally for IGFS: " + cfg);
- if (dataCache.configuration().isQueryIndexEnabled())
- throw new IgniteCheckedException("IGFS data cache cannot start with enabled query indexing.");
-
GridCache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
if (metaCache == null)
throw new IgniteCheckedException("Metadata cache is not configured locally for IGFS: " + cfg);
- if (metaCache.configuration().isQueryIndexEnabled())
- throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing.");
-
if (F.eq(cfg.getDataCacheName(), cfg.getMetaCacheName()))
throw new IgniteCheckedException("Cannot use same cache as both data and meta cache: " + cfg.getName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index af8aeeb..105a648 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -107,6 +107,14 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
* @param ccfg Cache configuration.
+ * @return {@code true} If query index must be enabled.
+ */
+ public static boolean isQueryIndexEnabled(CacheConfiguration<?, ?> ccfg) {
+ return !F.isEmpty(ccfg.getIndexedTypes()) || !F.isEmpty(ccfg.getTypeMetadata());
+ }
+
+ /**
+ * @param ccfg Cache configuration.
*/
public void initializeCache(CacheConfiguration<?, ?> ccfg) throws IgniteCheckedException {
Map<TypeName,CacheTypeMetadata> declaredTypes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/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 71e1cde..303439d 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
@@ -145,12 +145,10 @@ public class VisorCacheConfiguration implements Serializable {
cfg.eagerTtl = ccfg.isEagerTtl();
cfg.writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
cfg.swapEnabled = ccfg.isSwapEnabled();
- cfg.qryIdxEnabled = ccfg.isQueryIndexEnabled();
cfg.invalidate = ccfg.isInvalidate();
cfg.startSize = ccfg.getStartSize();
cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
- cfg.maxQryIterCnt = ccfg.getMaximumQueryIteratorCount();
cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
cfg.memoryMode = ccfg.getMemoryMode();
cfg.interceptor = compactClass(ccfg.getInterceptor());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index 0996e65..858ba75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -47,7 +47,6 @@ public class VisorCacheDefaultConfiguration implements Serializable {
cfg.ttl = ccfg.getDefaultTimeToLive();
cfg.txLockTimeout = ccfg.getDefaultLockTimeout();
- cfg.qryTimeout = ccfg.getDefaultQueryTimeout();
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 364eaa1..3041657 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -66,7 +66,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
cacheCfg.setEvictionPolicy(null);
cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
cacheCfg.setBackups(0);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -75,7 +74,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
metaCacheCfg.setEvictionPolicy(null);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
return new CacheConfiguration[] {cacheCfg, metaCacheCfg};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index 6ae9c86..b36cc67 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -93,7 +93,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
cfg.setCacheMode(REPLICATED);
cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cfg.setQueryIndexEnabled(false);
cfg.setAtomicityMode(TRANSACTIONAL);
return cfg;
@@ -114,7 +113,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
cfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(IGFS_GROUP_SIZE));
cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cfg.setQueryIndexEnabled(false);
cfg.setAtomicityMode(TRANSACTIONAL);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 433f9fa..664433f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -84,7 +84,6 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
cCfg.setBackups(1);
cCfg.setDistributionMode(NEAR_PARTITIONED);
cCfg.setPreloadMode(SYNC);
- cCfg.setQueryIndexEnabled(false);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
TcpDiscoverySpi disc = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 43dc0ce..8b3b716 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -134,7 +134,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
if (offHeapValues()) {
- ccfg.setQueryIndexEnabled(false);
ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_VALUES);
ccfg.setOffHeapMaxMemory(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index 311c36f..14be367 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -547,26 +547,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAttributesError() throws Exception {
- checkSecondGridStartFails(
- new C1<CacheConfiguration, Void>() {
- @Override public Void apply(CacheConfiguration cfg) {
- cfg.setQueryIndexEnabled(true);
- return null;
- }
- },
- new C1<CacheConfiguration, Void>() {
- @Override public Void apply(CacheConfiguration cfg) {
- cfg.setQueryIndexEnabled(false);
- return null;
- }
- }
- );
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAffinityFunctionConsistency() throws Exception {
cacheEnabled = true;
cacheMode = PARTITIONED;
@@ -633,7 +613,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setDefaultLockTimeout(1000);
- cfg.setDefaultQueryTimeout(1000);
cfg.setDefaultTimeToLive(1000);
return null;
@@ -648,7 +627,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setDefaultLockTimeout(2 * 1000);
- cfg.setDefaultQueryTimeout(2 * 1000);
cfg.setDefaultTimeToLive(2 * 1000);
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index c0f136e..f9fa88a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -31,7 +31,6 @@ public class GridCacheDeploymentOffHeapSelfTest extends GridCacheDeploymentSelfT
@Override protected CacheConfiguration cacheConfiguration() throws Exception {
CacheConfiguration cacheCfg = super.cacheConfiguration();
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setMemoryMode(OFFHEAP_VALUES);
cacheCfg.setOffHeapMaxMemory(0);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
index 06c5907..d21d20c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
@@ -74,7 +74,6 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest {
cfg.setBackups(1);
cfg.setDistributionMode(distributionMode());
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setQueryIndexEnabled(false);
cfg.setAtomicityMode(atomicityMode);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 3903c6f..175ba8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -78,7 +78,6 @@ public class GridCacheLeakTest extends GridCommonAbstractTest {
cfg.setBackups(1);
cfg.setDistributionMode(PARTITIONED_ONLY);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setQueryIndexEnabled(false);
cfg.setAtomicityMode(atomicityMode);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
index c0c902b..0ac127a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
@@ -86,7 +86,6 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest {
new CacheLruEvictionPolicy(maxOnheapSize));
cacheCfg.setAtomicityMode(atomicity);
cacheCfg.setOffHeapMaxMemory(offheapSize);
- cacheCfg.setQueryIndexEnabled(memoryMode != CacheMemoryMode.OFFHEAP_VALUES);
cfg.setCacheConfiguration(cacheCfg);
cfg.setMarshaller(new OptimizedMarshaller(false));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
index 0d707b1..bce17b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
@@ -73,7 +73,6 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
cacheCfg.setSwapEnabled(false);
cacheCfg.setCacheMode(mode);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setDistributionMode(PARTITIONED_ONLY);
cacheCfg.setStartSize(startSize);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index ea99af2..a5086db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -84,7 +84,6 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
repCacheCfg.setCacheMode(REPLICATED);
repCacheCfg.setPreloadMode(mode);
repCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- repCacheCfg.setQueryIndexEnabled(false);
repCacheCfg.setAtomicityMode(TRANSACTIONAL);
if (offheap)
@@ -100,7 +99,6 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(11, 1));
partCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
partCacheCfg.setEvictNearSynchronized(false);
- partCacheCfg.setQueryIndexEnabled(false);
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
partCacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 9d2fe99..687c213 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -622,7 +622,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
cacheCfg.setStoreValueBytes(true);
cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
index e0ec73d..8e32c6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.testframework.*;
@@ -41,7 +40,6 @@ public class GridCacheQueryIndexingDisabledSelfTest extends GridCacheAbstractSel
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
ccfg.setCacheMode(CacheMode.PARTITIONED);
- ccfg.setQueryIndexEnabled(false);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
index 6c0c583..bba3390 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
@@ -56,7 +56,6 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cc = super.cacheConfiguration(gridName);
- cc.setQueryIndexEnabled(false);
cc.setPreloadMode(SYNC);
return cc;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
index dc0670e..27a1424 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
@@ -62,7 +62,6 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
ccfg.setAtomicityMode(atomic ? ATOMIC : TRANSACTIONAL);
- ccfg.setQueryIndexEnabled(true);
ccfg.setSwapEnabled(true);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index cda3a77..e0ae128 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -74,7 +74,6 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setQueryIndexEnabled(true);
ccfg.setCacheStoreFactory(null);
ccfg.setReadThrough(false);
ccfg.setWriteThrough(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
index 485f95c..5ebb524 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
@@ -69,7 +69,6 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setMemoryMode(OFFHEAP_VALUES);
cfg.setOffHeapMaxMemory(100 * 1024 * 1024);
- cfg.setQueryIndexEnabled(false);
return cfg;
}
@@ -85,7 +84,6 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setMemoryMode(OFFHEAP_TIERED);
cfg.setOffHeapMaxMemory(100 * 1024 * 1024);
- cfg.setQueryIndexEnabled(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
index 6dae00d..1009877 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
@@ -30,7 +30,6 @@ public class GridCacheDhtPreloadOffHeapSelfTest extends GridCacheDhtPreloadSelfT
@Override protected CacheConfiguration cacheConfiguration(String gridName) {
CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setMemoryMode(OFFHEAP_VALUES);
cacheCfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index bd89825..736bd52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -62,7 +62,6 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setMemoryMode(OFFHEAP_VALUES);
cfg.setOffHeapMaxMemory(100 * 1024 * 1024);
- cfg.setQueryIndexEnabled(false);
return cfg;
}
@@ -76,7 +75,6 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setMemoryMode(OFFHEAP_TIERED);
cfg.setOffHeapMaxMemory(100 * 1024 * 1024);
- cfg.setQueryIndexEnabled(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
index 50afac9..f7e6e41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
- * Tests for replicated cache {@link GridReplicatedPreloader preloader}.
+ * Tests for replicated cache preloader.
*/
public class GridCacheReplicatedPreloadOffHeapSelfTest extends GridCacheReplicatedPreloadSelfTest {
/** {@inheritDoc} */
@@ -30,7 +30,6 @@ public class GridCacheReplicatedPreloadOffHeapSelfTest extends GridCacheReplicat
CacheConfiguration cacheConfiguration(String gridName) {
CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setMemoryMode(OFFHEAP_VALUES);
cacheCfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index ea8f060..88c1e18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@ -63,7 +63,6 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
cc.setPreloadMode(SYNC);
cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
cc.setStartSize(100);
- cc.setQueryIndexEnabled(true);
cc.setBackups(0);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index a381082..0dc6d29 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -74,7 +74,6 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
cc.setPreloadMode(SYNC);
cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
cc.setStartSize(100);
- cc.setQueryIndexEnabled(true);
cc.setBackups(0);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 4cd2889..3c2dce3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -72,7 +72,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
cc2.setWriteSynchronizationMode(FULL_SYNC);
cc2.setMemoryMode(OFFHEAP_VALUES);
cc2.setOffHeapMaxMemory(100 * 1024 * 1024);
- cc2.setQueryIndexEnabled(false);
c.setCacheConfiguration(cc1, cc2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 15bae88..27315ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -85,7 +85,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
cacheCfg.setLoadPreviousValue(true);
- cacheCfg.setQueryIndexEnabled(false);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
index f0e2c70..8c3f50d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
@@ -109,7 +109,6 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
dataCacheCfg.setEvictionPolicy(evictPlc);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -117,7 +116,6 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
@@ -166,7 +164,6 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -175,7 +172,6 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index a7e6780..2d71221 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -202,7 +202,6 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setMemoryMode(memoryMode);
dataCacheCfg.setOffHeapMaxMemory(0);
@@ -212,7 +211,6 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index bde395b..2c8dc24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -86,7 +86,6 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setQueryIndexEnabled(false);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 2e48648..13dd015 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -127,7 +127,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setQueryIndexEnabled(false);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index 1a52b7c..be7f853 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -102,7 +102,6 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
}
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
index be5afe7..b0b3d0f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
@@ -124,7 +124,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -133,7 +132,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
@@ -176,7 +174,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -185,7 +182,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
index 2b501f7..bdc8437 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
@@ -107,7 +107,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
cacheCfg.setBackups(0);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -115,7 +114,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
@@ -164,7 +162,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
cacheCfg.setBackups(0);
- cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -172,7 +169,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index ead7511..a366d26 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -140,7 +140,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setQueryIndexEnabled(false);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 6f444c0..ee5f058 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -132,7 +132,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testLocalIfNoDataCacheIsConfigured() throws Exception {
CacheConfiguration cc = defaultCacheConfiguration();
- cc.setQueryIndexEnabled(false);
cc.setName("someName");
g1Cfg.setCacheConfiguration(cc);
@@ -146,7 +145,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testLocalIfNoMetadataCacheIsConfigured() throws Exception {
CacheConfiguration cc = defaultCacheConfiguration();
- cc.setQueryIndexEnabled(false);
cc.setName(dataCache1Name);
g1Cfg.setCacheConfiguration(cc);
@@ -186,7 +184,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception {
CacheConfiguration[] dataCaches = dataCaches(1024);
- dataCaches[0].setQueryIndexEnabled(true);
g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class));
@@ -199,8 +196,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception {
CacheConfiguration[] metaCaches = metaCaches();
- metaCaches[0].setQueryIndexEnabled(true);
-
g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class));
checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with enabled query indexing", true);
@@ -500,7 +495,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
dataCache.setName(cacheNames[i]);
dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
dataCache.setAtomicityMode(TRANSACTIONAL);
- dataCache.setQueryIndexEnabled(false);
res[i] = dataCache;
}
@@ -525,7 +519,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
metaCache.setName(cacheNames[i]);
metaCache.setAtomicityMode(TRANSACTIONAL);
- metaCache.setQueryIndexEnabled(false);
res[i] = metaCache;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index ee8e7bd..daaa41d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -132,14 +132,12 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
cc.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
cc.setBackups(0);
cc.setAtomicityMode(TRANSACTIONAL);
- cc.setQueryIndexEnabled(false);
CacheConfiguration metaCfg = defaultCacheConfiguration();
metaCfg.setName("replicated");
metaCfg.setCacheMode(CacheMode.REPLICATED);
metaCfg.setAtomicityMode(TRANSACTIONAL);
- metaCfg.setQueryIndexEnabled(false);
cfg.setCacheConfiguration(metaCfg, cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index b212f02..271a86a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -135,7 +135,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
dataCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCfg.setPreloadMode(SYNC);
dataCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- dataCfg.setQueryIndexEnabled(false);
dataCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCfg = defaultCacheConfiguration();
@@ -145,7 +144,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCfg.setPreloadMode(SYNC);
- metaCfg.setQueryIndexEnabled(false);
metaCfg.setAtomicityMode(TRANSACTIONAL);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 054665d..d23c7c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -141,7 +141,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setQueryIndexEnabled(false);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index 5b7a636..0cf74e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -115,7 +115,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(1));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
CacheConfiguration metaCacheCfg = new CacheConfiguration();
@@ -123,7 +122,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c55f86e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
index 05de61a..6cb66a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -67,7 +67,6 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- dataCacheCfg.setQueryIndexEnabled(false);
CacheConfiguration metaCacheCfg = new CacheConfiguration();
@@ -75,7 +74,6 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- metaCacheCfg.setQueryIndexEnabled(false);
IgniteConfiguration cfg = new IgniteConfiguration();