ignite-sql-tests - compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20afb303 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20afb303 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20afb303 Branch: refs/heads/ignite-375 Commit: 20afb3038a54bacb952c1215b00c3212885e24b2 Parents: 8c4e322 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Mar 13 04:47:33 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Mar 13 04:47:33 2015 +0300 ---------------------------------------------------------------------- .../datagrid/store/CacheNodeWithStoreStartup.java | 3 --- .../communication/GridIoMessageFactory.java | 10 +++++----- .../cache/GridCacheClearAllRunnable.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 3 ++- .../processors/query/GridQueryProcessor.java | 14 +++++++------- .../twostep/messages/GridQueryCancelRequest.java | 2 +- .../h2/twostep/messages/GridQueryFailResponse.java | 2 +- .../twostep/messages/GridQueryNextPageRequest.java | 2 +- .../messages/GridQueryNextPageResponse.java | 2 +- .../h2/twostep/messages/GridQueryRequest.java | 2 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 17 ----------------- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 3 +-- .../cache/IgniteCacheQueryLoadSelfTest.java | 1 + 13 files changed, 22 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java index 8d2cb7f..3f780a4 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -73,9 +73,6 @@ public class CacheNodeWithStoreStartup { // Set atomicity as transaction, since we are showing transactions in example. cacheCfg.setAtomicityMode(TRANSACTIONAL); - // Set query indexing enabled for use query in example. - cacheCfg.setQueryIndexEnabled(true); - CacheStore<Long, Person> store; // Uncomment other cache stores to try them. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index d32d64b..d69a809 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -580,27 +580,27 @@ public class GridIoMessageFactory implements MessageFactory { break; - case 90: + case 106: msg = new GridQueryCancelRequest(); break; - case 91: + case 107: msg = new GridQueryFailResponse(); break; - case 92: + case 108: msg = new GridQueryNextPageRequest(); break; - case 93: + case 109: msg = new GridQueryNextPageResponse(); break; - case 94: + case 110: msg = new GridQueryRequest(); break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/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 0a2e565..76faa39 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 @@ -96,7 +96,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { if (ctx.isSwapOrOffheapEnabled()) { if (ctx.swap().swapEnabled()) { if (GridQueryProcessor.isEnabled(ctx.config())) { - Iterator<Map.Entry<K, V>> it = null; + Iterator<KeyCacheObject> it = null; try { it = ctx.swap().swapKeyIterator(true, true, -1L); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 1966a21..269b75a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -24,6 +24,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -273,7 +274,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme return new CacheObjectContext(ctx, new GridCacheDefaultAffinityKeyMapper(), ccfg.isCopyOnRead() && memMode == ONHEAP_TIERED, - ctx.config().isPeerClassLoadingEnabled() || ccfg.isQueryIndexEnabled()); + ctx.config().isPeerClassLoadingEnabled() || GridQueryProcessor.isEnabled(ccfg)); } else return new CacheObjectContext( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/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 4e9084b..11a9f2c 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 @@ -125,7 +125,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) { declaredTypes.put(new TypeName(ccfg.getName(), meta.getValueType()), meta); - int valTypeId = ctx.portable().typeId(meta.getValueType()); + int valTypeId = ctx.cacheObjects().typeId(meta.getValueType()); portableIds.put(valTypeId, meta.getValueType()); @@ -351,8 +351,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { TypeId id; - if (ctx.portable().isPortableObject(val)) { - int typeId = ctx.portable().typeId(val); + if (ctx.cacheObjects().isPortableObject(val)) { + int typeId = ctx.cacheObjects().typeId(val); String typeName = portableName(typeId); @@ -1355,7 +1355,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (obj == null) return null; - if (!ctx.portable().isPortableObject(obj)) + if (!ctx.cacheObjects().isPortableObject(obj)) throw new IgniteCheckedException("Non-portable object received as a result of property extraction " + "[parent=" + parent + ", propName=" + propName + ", obj=" + obj + ']'); } @@ -1363,9 +1363,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { int isKeyProp0 = isKeyProp; if (isKeyProp0 == 0) { - if (ctx.portable().hasField(key, propName)) + if (ctx.cacheObjects().hasField(key, propName)) isKeyProp = isKeyProp0 = 1; - else if (ctx.portable().hasField(val, propName)) + else if (ctx.cacheObjects().hasField(val, propName)) isKeyProp = isKeyProp0 = -1; else { U.warn(log, "Neither key nor value have property " + @@ -1378,7 +1378,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { obj = isKeyProp0 == 1 ? key : val; } - return ctx.portable().field(obj, propName); + return ctx.cacheObjects().field(obj, propName); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java index 85371b8..de86b7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java @@ -101,7 +101,7 @@ public class GridQueryCancelRequest implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return 90; + return 106; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java index 7a2f22e..a959193 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java @@ -130,7 +130,7 @@ public class GridQueryFailResponse implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return 91; + return 107; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index 2e49683..474cd55 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -157,7 +157,7 @@ public class GridQueryNextPageRequest implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return 92; + return 108; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index b2cdea6..e798051 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -230,7 +230,7 @@ public class GridQueryNextPageResponse implements Externalizable, Message { /** {@inheritDoc} */ @Override public byte directType() { - return 93; + return 109; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java index bc929dd..b4c6668 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java @@ -201,7 +201,7 @@ public class GridQueryRequest implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return 94; + return 110; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 662d7b6..6a672c0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -25,14 +25,12 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import java.util.*; import java.util.concurrent.*; @@ -293,21 +291,6 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { return ((Number)l.get(idx)).intValue(); } - /** @throws Exception If failed. */ - public void testOnProjection() throws Exception { - CacheProjection<Integer, FactPurchase> prj = ((IgniteKernal)ignite) - .<Integer, FactPurchase>cache("partitioned").projection( - new IgnitePredicate<Cache.Entry<Integer, FactPurchase>>() { - @Override public boolean apply(Cache.Entry<Integer, FactPurchase> e) { - return e.getKey() > 12; - } - }); - - List<Map.Entry<Integer, FactPurchase>> res = body(prj); - - check(res); - } - /** * @throws IgniteCheckedException If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index b9952d5..59c66a3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -40,7 +40,6 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CachePreloadMode.*; /** * Tests for fields queries. @@ -93,7 +92,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cache.setCacheMode(cacheMode()); cache.setAtomicityMode(atomicityMode()); cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(CacheRebalanceMode.SYNC); List<Class<?>> indexedTypes = new ArrayList<>(F.<Class<?>>asList( String.class, Organization.class http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20afb303/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java index fc88c74..cc3d105 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.io.*;
