ignite-sql-tests - config fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/54d46a08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54d46a08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54d46a08 Branch: refs/heads/ignite-sql-tests Commit: 54d46a08ad254412e6b57b0f68a28db6f85b3f8e Parents: d427cd5 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Mar 5 02:38:07 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Mar 5 02:38:07 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 3 --- examples/config/filesystem/example-igfs.xml | 2 -- .../clients/src/test/resources/spring-cache.xml | 7 ----- .../src/test/resources/spring-server-node.xml | 7 ----- .../test/resources/spring-server-ssl-node.xml | 4 --- .../processors/cache/GridCacheAttributes.java | 12 --------- .../cache/GridCacheClearAllRunnable.java | 4 +-- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheProcessor.java | 8 +----- .../processors/cache/IgniteCacheProxy.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 4 +-- .../processors/query/GridQueryProcessor.java | 4 +-- .../spring-cache-client-benchmark-1.xml | 2 -- .../spring-cache-client-benchmark-2.xml | 2 -- .../spring-cache-client-benchmark-3.xml | 2 -- .../core/src/test/config/discovery-stress.xml | 1 - modules/core/src/test/config/example-cache.xml | 3 --- modules/core/src/test/config/igfs-loopback.xml | 2 -- modules/core/src/test/config/igfs-shmem.xml | 2 -- .../src/test/config/load/cache-benchmark.xml | 2 -- .../test/config/load/cache-client-benchmark.xml | 2 -- .../config/spring-cache-put-remove-load.xml | 2 -- .../loadtests/colocation/spring-colocation.xml | 2 -- .../webapp/META-INF/ignite-webapp-config.xml | 28 -------------------- .../GridCacheQueryIndexDisabledSelfTest.java | 1 - .../scalar/src/test/resources/spring-cache.xml | 1 - modules/yardstick/config/ignite-base-config.xml | 16 ----------- .../yardstick/config/ignite-store-config.xml | 4 --- 29 files changed, 10 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 7f27a94..9ab9abc 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -176,8 +176,5 @@ <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. --> <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <!-- Set to true to enable indexing for query examples, default value is false. --> - <property name="queryIndexEnabled" value="true"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/examples/config/filesystem/example-igfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-igfs.xml b/examples/config/filesystem/example-igfs.xml index 8350e2a..860fe4f 100644 --- a/examples/config/filesystem/example-igfs.xml +++ b/examples/config/filesystem/example-igfs.xml @@ -114,7 +114,6 @@ <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> @@ -130,7 +129,6 @@ <property name="name" value="igfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index 2cccf5a..b445edd 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -79,13 +79,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <!-- - For better performance set this property to false in case - cache queries are not used. - Default value is true. - --> - <property name="queryIndexEnabled" value="true"/> - - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 3496e37..c8745e9 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -95,8 +95,6 @@ <!-- LOCAL cache mode. --> <property name="cacheMode" value="LOCAL"/> - - <property name="queryIndexEnabled" value="false"/> </bean> <!-- @@ -125,9 +123,6 @@ <property name="portableEnabled" value="true"/> - <!-- Enable queries for partitioned cache --> - <property name="queryIndexEnabled" value="true"/> - <property name="typeMetadata"> <list> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> @@ -188,8 +183,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="queryIndexEnabled" value="false"/> - <property name="store"> <bean class="org.apache.ignite.internal.client.HashMapStore"/> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index c56f25a..1c7af47 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -97,7 +97,6 @@ <!-- LOCAL cache mode. --> <property name="cacheMode" value="LOCAL"/> - <property name="queryIndexEnabled" value="false"/> </bean> <!-- @@ -126,9 +125,6 @@ <property name="portableEnabled" value="true"/> - <!-- Enable queries for partitioned cache --> - <property name="queryIndexEnabled" value="true"/> - <property name="typeMetadata"> <list> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 6436bca..85bb6f9 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 @@ -85,9 +85,6 @@ public class GridCacheAttributes implements Externalizable { /** Flag indicating whether Ignite should use swap storage by default. */ protected boolean swapEnabled; - /** Flag indicating whether query indexing is enabled. */ - private boolean qryIdxEnabled; - /** Flag indicating whether Ignite should use write-behind behaviour for the cache store. */ private boolean writeBehindEnabled; @@ -409,13 +406,6 @@ public class GridCacheAttributes implements Externalizable { } /** - * @return Flag indicating whether query indexing is enabled. - */ - public boolean queryIndexEnabled() { - return qryIdxEnabled; - } - - /** * @return Flag indicating whether read-through behaviour is enabled. */ public boolean readThrough() { @@ -485,7 +475,6 @@ public class GridCacheAttributes implements Externalizable { U.writeEnum(out, partDistro); out.writeInt(preloadBatchSize); U.writeEnum(out, preloadMode); - out.writeBoolean(qryIdxEnabled); out.writeBoolean(readThrough); out.writeBoolean(storeValBytes); out.writeBoolean(swapEnabled); @@ -526,7 +515,6 @@ public class GridCacheAttributes implements Externalizable { partDistro = CacheDistributionMode.fromOrdinal(in.readByte()); preloadBatchSize = in.readInt(); preloadMode = CachePreloadMode.fromOrdinal(in.readByte()); - qryIdxEnabled = in.readBoolean(); readThrough = in.readBoolean(); storeValBytes = in.readBoolean(); swapEnabled = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 824443b..dc173ee 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 @@ -80,7 +80,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { // Clear swapped entries. if (!ctx.isNear()) { if (ctx.swap().offHeapEnabled()) { - if (GridQueryProcessor.isQueryIndexEnabled(ctx.config())) { + if (GridQueryProcessor.isEnabled(ctx.config())) { for (Iterator<Map.Entry<K, V>> it = ctx.swap().lazyOffHeapIterator(); it.hasNext();) { Map.Entry<K, V> e = it.next(); @@ -95,7 +95,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { if (ctx.isSwapOrOffheapEnabled()) { if (ctx.swap().swapEnabled()) { - if (GridQueryProcessor.isQueryIndexEnabled(ctx.config())) { + if (GridQueryProcessor.isEnabled(ctx.config())) { Iterator<Map.Entry<K, V>> it = null; try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 ecd03f4..f0b714c 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 @@ -1442,7 +1442,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return {@code True} if values should be always unmarshalled. */ public boolean isUnmarshalValues() { - return GridQueryProcessor.isQueryIndexEnabled(cacheCfg) || !cacheCfg.isStoreValueBytes(); + return GridQueryProcessor.isEnabled(cacheCfg) || !cacheCfg.isStoreValueBytes(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 8e35e12..3e909c6 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 @@ -424,7 +424,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } if (cc.getMemoryMode() == CacheMemoryMode.OFFHEAP_VALUES) { - if (GridQueryProcessor.isQueryIndexEnabled(cc)) + if (GridQueryProcessor.isEnabled(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()); @@ -1159,15 +1159,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { "Eviction max overflow ratio", locAttr.evictMaxOverflowRatio(), rmtAttr.evictMaxOverflowRatio(), true); - CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled", - "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(), true); - CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "storeValueBytes", "Store value bytes", locAttr.storeValueBytes(), rmtAttr.storeValueBytes(), true); - CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled", - "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(), true); - if (locAttr.cacheMode() == PARTITIONED) { CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictSynchronized", "Eviction synchronized", locAttr.evictSynchronized(), rmtAttr.evictSynchronized(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 a4f564d..e694de4 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 @@ -477,7 +477,7 @@ 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 (!GridQueryProcessor.isQueryIndexEnabled(ctx.config()) && !(qry instanceof ScanQuery) && + if (!GridQueryProcessor.isEnabled(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/54d46a08/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 222eac3..930cb4f 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 @@ -355,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) && !GridQueryProcessor.isQueryIndexEnabled(cctx.config())) + if ((type != SCAN && type != SET) && !GridQueryProcessor.isEnabled(cctx.config())) throw new IgniteCheckedException("Indexing is disabled for cache: " + cctx.cache().name()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 6f4cd78..5ff2c4d 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 @@ -327,7 +327,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte assert key != null; assert val != null || valBytes != null; - if (!GridQueryProcessor.isQueryIndexEnabled(cctx.config()) && !(key instanceof GridCacheInternal)) + if (!GridQueryProcessor.isEnabled(cctx.config()) && !(key instanceof GridCacheInternal)) return; // No-op. if (!enterBusy()) @@ -355,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 (!GridQueryProcessor.isQueryIndexEnabled(cctx.config()) && !(key instanceof GridCacheInternal)) + if (!GridQueryProcessor.isEnabled(cctx.config()) && !(key instanceof GridCacheInternal)) return; // No-op. if (!enterBusy()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/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 105a648..dc1c032 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,9 +107,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { /** * @param ccfg Cache configuration. - * @return {@code true} If query index must be enabled. + * @return {@code true} If query index must be enabled for this cache. */ - public static boolean isQueryIndexEnabled(CacheConfiguration<?, ?> ccfg) { + public static boolean isEnabled(CacheConfiguration<?,?> ccfg) { return !F.isEmpty(ccfg.getIndexedTypes()) || !F.isEmpty(ccfg.getTypeMetadata()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index b1e8f6d..b90436c 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -80,8 +80,6 @@ <property name="distributionMode" value="NEAR_PARTITIONED"/> - <property name="queryIndexEnabled" value="false"/> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml index 5a134c3..4a5276f 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml @@ -78,8 +78,6 @@ <property name="distributionMode" value="NEAR_PARTITIONED"/> - <property name="queryIndexEnabled" value="false"/> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml index 661dd0b..5c36fb6 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml @@ -78,8 +78,6 @@ <property name="distributionMode" value="NEAR_PARTITIONED"/> - <property name="queryIndexEnabled" value="false"/> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/discovery-stress.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml index 53e7092..b3dc389 100644 --- a/modules/core/src/test/config/discovery-stress.xml +++ b/modules/core/src/test/config/discovery-stress.xml @@ -31,7 +31,6 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="preloadMode" value="SYNC"/> <property name="swapEnabled" value="false"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_ASYNC"/> <property name="evictionPolicy"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index 1a02fbc..33ad624 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -135,9 +135,6 @@ <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. --> <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <!-- Set to true to enable indexing for query examples, default value is false. --> - <property name="queryIndexEnabled" value="true"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/igfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml index 81ce501..68c105d 100644 --- a/modules/core/src/test/config/igfs-loopback.xml +++ b/modules/core/src/test/config/igfs-loopback.xml @@ -110,7 +110,6 @@ <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> @@ -126,7 +125,6 @@ <property name="name" value="igfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/igfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml index d30051b..0694ad7 100644 --- a/modules/core/src/test/config/igfs-shmem.xml +++ b/modules/core/src/test/config/igfs-shmem.xml @@ -110,7 +110,6 @@ <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> @@ -126,7 +125,6 @@ <property name="name" value="igfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/load/cache-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml index 5aa5e58..3d4f39c 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -43,8 +43,6 @@ <property name="writeSynchronizationMode" value="FULL_ASYNC"/> <property name="startSize" value="400000"/> - - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="local"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/load/cache-client-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml index 03685e8..f1fe14f 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -43,8 +43,6 @@ <property name="startSize" value="400000"/> <property name="distributionMode" value="CLIENT_ONLY"/> - - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="local"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/config/spring-cache-put-remove-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml index 6c7dc90..aac08f5 100644 --- a/modules/core/src/test/config/spring-cache-put-remove-load.xml +++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml @@ -35,8 +35,6 @@ <property name="name" value="cache"/> <property name="swapEnabled" value="false"/> - - <property name="queryIndexEnabled" value="false"/> </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml index 8d68a73..7cd6fef 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml @@ -115,8 +115,6 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> - <property name="queryIndexEnabled" value="false"/> - <property name="store"> <bean class="org.apache.ignite.loadtests.colocation.GridTestCacheStore"/> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml index 7e0f233..ab4905b 100644 --- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml +++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml @@ -110,13 +110,6 @@ <property name="startSize" value="1500000"/> <!-- - For better performance set this property to false in case - cache queries are not used. - Default value is false. - --> - <property name="queryIndexEnabled" value="true"/> - - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). --> @@ -151,13 +144,6 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <!-- - For better performance set this property to false in case - cache queries are not used. - Default value is false. - --> - <property name="queryIndexEnabled" value="true"/> - - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). --> @@ -188,13 +174,6 @@ <!-- Initial cache size. --> <property name="startSize" value="150000"/> - - <!-- - For better performance set this property to false in case - cache queries are not used. - Default value is false. - --> - <property name="queryIndexEnabled" value="true"/> </bean> <!-- @@ -209,13 +188,6 @@ <!-- Initial cache size. --> <property name="startSize" value="150000"/> - - <!-- - For better performance set this property to false in case - cache queries are not used. - Default value is false. - --> - <property name="queryIndexEnabled" value="true"/> </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java index 341e175..72ac087 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; /** - * Test {@link CacheConfiguration#setQueryIndexEnabled} checked before executing query */ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/scalar/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-cache.xml b/modules/scalar/src/test/resources/spring-cache.xml index 3c7b5b9..a04bfa9 100644 --- a/modules/scalar/src/test/resources/spring-cache.xml +++ b/modules/scalar/src/test/resources/spring-cache.xml @@ -29,7 +29,6 @@ <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="distributionMode" value="NEAR_PARTITIONED"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="queryIndexEnabled" value="true"/> <property name="indexedTypes"> <list> <value>java.lang.Integer</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 1067145..c88316d 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -54,8 +54,6 @@ <property name="atomicityMode" value="ATOMIC"/> <property name="swapEnabled" value="false"/> - - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -68,8 +66,6 @@ <property name="swapEnabled" value="false"/> <property name="memoryMode" value="OFFHEAP_TIERED"/> - - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -83,7 +79,6 @@ <property name="memoryMode" value="OFFHEAP_VALUES"/> - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -95,7 +90,6 @@ <property name="swapEnabled" value="false"/> - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -109,7 +103,6 @@ <property name="memoryMode" value="OFFHEAP_TIERED"/> - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -123,7 +116,6 @@ <property name="memoryMode" value="OFFHEAP_VALUES"/> - <property name="queryIndexEnabled" value="false"/> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> @@ -135,9 +127,6 @@ <property name="swapEnabled" value="false"/> - <!-- Enable query indexing for query cache. --> - <property name="queryIndexEnabled" value="true"/> - <property name="indexedTypes"> <list> <value>java.lang.Integer</value> @@ -158,9 +147,6 @@ <property name="swapEnabled" value="false"/> - <!-- Enable query indexing for query cache. --> - <property name="queryIndexEnabled" value="true"/> - <property name="memoryMode" value="OFFHEAP_TIERED"/> <property name="indexedTypes"> @@ -182,8 +168,6 @@ <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="swapEnabled" value="false"/> - - <!--<property name="queryIndexEnabled" value="false"/>--> </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d46a08/modules/yardstick/config/ignite-store-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml index 066b246..8a27df1 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -102,8 +102,6 @@ <property name="swapEnabled" value="false"/> - <property name="queryIndexEnabled" value="false"/> - <property name="typeMetadata"> <list> <ref bean="sampleTypeMetadata"/> @@ -126,8 +124,6 @@ <property name="swapEnabled" value="false"/> - <property name="queryIndexEnabled" value="false"/> - <property name="typeMetadata"> <list> <ref bean="sampleTypeMetadata"/>
