Merge remote-tracking branch 'remotes/origin/master' into ignite-1232 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java # modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4bc9969f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4bc9969f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4bc9969f Branch: refs/heads/ignite-1232 Commit: 4bc9969f88d2a386bd1dfa43710d55354dfdf9ef Parents: bc1902b Author: sboikov <[email protected]> Authored: Tue Jun 28 16:06:18 2016 +0300 Committer: sboikov <[email protected]> Committed: Tue Jun 28 16:06:18 2016 +0300 ---------------------------------------------------------------------- .../communication/GridIoMessageFactory.java | 2 +- .../closure/GridClosureProcessor.java | 9 ---- .../query/h2/opt/GridH2IndexBase.java | 12 ++--- .../h2/twostep/msg/GridH2IndexRangeRequest.java | 2 +- .../twostep/msg/GridH2IndexRangeResponse.java | 2 +- .../h2/twostep/msg/GridH2QueryRequest.java | 2 +- .../query/h2/twostep/msg/GridH2RowMessage.java | 2 +- .../query/h2/twostep/msg/GridH2RowRange.java | 2 +- .../h2/twostep/msg/GridH2RowRangeBounds.java | 2 +- .../twostep/msg/GridH2ValueMessageFactory.java | 12 ++--- .../query/IgniteSqlSplitterSelfTest.java | 8 +-- .../IgniteCacheQuerySelfTestSuite.java | 52 +------------------- .../IgniteCacheQuerySelfTestSuite2.java | 10 ---- 13 files changed, 23 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/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 cd557f0..1eebfd4 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 @@ -752,7 +752,7 @@ public class GridIoMessageFactory implements MessageFactory { // [-3..119] [124] - this // [120..123] - DR - // [-4..-28] - SQL + // [-4..-22, -30..-35] - SQL default: if (ext != null) { for (MessageFactory factory : ext) { http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index a1213d6..a4559c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -90,15 +90,6 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** Ignite version in which binarylizable versions of closures were introduced. */ public static final IgniteProductVersion BINARYLIZABLE_CLOSURES_SINCE = IgniteProductVersion.fromString("1.6.0"); - /** */ - private final Executor sysPool; - - /** */ - private final Executor pubPool; - - /** */ - private final Executor igfsPool; - /** Lock to control execution after stop. */ private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java index 962946a..109f238 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java @@ -199,11 +199,7 @@ public abstract class GridH2IndexBase extends BaseIndex { * @return Filtered iterator. */ protected Iterator<GridH2Row> filter(Iterator<GridH2Row> iter, IndexingQueryFilter filter) { - IgniteBiPredicate<Object, Object> p = null; - - IndexingQueryFilter f = filters.get(); - - return new FilteringIterator(iter, U.currentTimeMillis(), f); + return new FilteringIterator(iter, U.currentTimeMillis(), filter, getTable().spaceName()); } /** @@ -266,15 +262,17 @@ public abstract class GridH2IndexBase extends BaseIndex { /** * @param iter Iterator. * @param time Time for expired rows filtering. + * @param qryFilter Filter. + * @param spaceName Space name. */ protected FilteringIterator(Iterator<GridH2Row> iter, long time, - IndexingQueryFilter qryFilter) { + IndexingQueryFilter qryFilter, String spaceName) { super(iter); this.time = time; if (qryFilter != null) { - this.fltr = qryFilter.forSpace(((GridH2Table)getTable()).spaceName()); + this.fltr = qryFilter.forSpace(spaceName); this.isValRequired = qryFilter.isValueRequired(); } else { http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java index 075f50d28..e49c48f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java @@ -188,7 +188,7 @@ public class GridH2IndexRangeRequest implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -23; + return -30; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java index f557a35..c6414bd 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java @@ -259,7 +259,7 @@ public class GridH2IndexRangeResponse implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -24; + return -31; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java index e8d97b3..3b200c5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java @@ -381,7 +381,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { /** {@inheritDoc} */ @Override public byte directType() { - return -26; + return -33; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java index 2100847..59c548d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java @@ -96,7 +96,7 @@ public class GridH2RowMessage implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -25; + return -32; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java index b38a44d..374e4b8 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java @@ -158,7 +158,7 @@ public class GridH2RowRange implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -27; + return -34; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java index 2dd1e34..e32e449 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java @@ -168,7 +168,7 @@ public class GridH2RowRangeBounds implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -28; + return -35; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java index ac9710b..aa84e4b 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java @@ -91,22 +91,22 @@ public class GridH2ValueMessageFactory implements MessageFactory { case -22: return new GridH2CacheObject(); - case -23: + case -30: return new GridH2IndexRangeRequest(); - case -24: + case -31: return new GridH2IndexRangeResponse(); - case -25: + case -32: return new GridH2RowMessage(); - case -26: + case -33: return new GridH2QueryRequest(); - case -27: + case -34: return new GridH2RowRange(); - case -28: + case -35: return new GridH2RowRangeBounds(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java index f87cb6d..ce4d24b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java @@ -216,7 +216,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest { */ public void testDistributedJoins() throws Exception { CacheConfiguration ccfg = cacheConfig("persOrg", true, - Integer.class, Person.class, Integer.class, Organization.class); + Integer.class, Person2.class, Integer.class, Organization.class); IgniteCache<Integer, Object> c = ignite(0).getOrCreateCache(ccfg); @@ -309,7 +309,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest { Random rnd = new GridRandom(); for (int i = 0; i < persons; i++) { - Person p = new Person(); + Person2 p = new Person2(); p.name = "Person" + i; p.orgId = rnd.nextInt(orgs); @@ -317,7 +317,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest { c.put(key++, p); } - String select = "select count(*) from Organization o, Person p where p.orgId = o._key"; + String select = "select count(*) from Organization o, Person2 p where p.orgId = o._key"; String plan = (String)c.query(new SqlFieldsQuery("explain " + select) .setDistributedJoins(true).setEnforceJoinOrder(enforceJoinOrder).setPageSize(pageSize)) @@ -491,7 +491,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest { } } - private static class Person implements Serializable { + private static class Person2 implements Serializable { @QuerySqlField int orgId; http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 2c3cb01..c0a3b09 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -26,8 +26,6 @@ import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuery import org.apache.ignite.internal.processors.cache.IgniteBinaryWrappedObjectFieldsQuerySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheJoinQueryTest; import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapEvictQueryTest; import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapIndexScanTest; @@ -42,10 +40,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreaded import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCrossCachesJoinsQueryTest; -import org.apache.ignite.internal.processors.cache.SqlFieldsQuerySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicFieldsQuerySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicNearEnabledFieldsQuerySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicNearEnabledQuerySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheAtomicQuerySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest; @@ -54,59 +48,15 @@ import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheP import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedSnapshotEnabledQuerySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNoRebalanceSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeFailTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartDistributedJoinSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest2; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQueryP2PDisabledSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest; import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalAtomicQuerySelfTest; import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalQuerySelfTest; -import org.apache.ignite.internal.processors.cache.query.GridCacheSwapScanQuerySelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterPartitionedAtomicTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterPartitionedTxTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterReplicatedAtomicTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterReplicatedTxTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchAckTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchForceServerModeAckTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryFilterTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryOperationP2PTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapValuesTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionAtomicOneNodeTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionTxOneNodeTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedOnlySelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedP2PDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicOneNodeTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedTxOneNodeTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedP2PDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryTxOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryTxOffheapValuesTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryTxSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientReconnectTest; -import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTest; -import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTxReconnectTest; -import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryReconnectTest; import org.apache.ignite.internal.processors.query.IgniteSqlSchemaIndexingTest; import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest; import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest; -import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryDistributedJoinsTest; -import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; -import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; /** * Test suite for cache queries. @@ -128,13 +78,13 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { // Queries tests. suite.addTestSuite(IgniteSqlSplitterSelfTest.class); suite.addTestSuite(IgniteSqlSchemaIndexingTest.class); - suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class); suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class); suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class); suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class); suite.addTestSuite(IgniteCacheLocalAtomicQuerySelfTest.class); suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class); suite.addTestSuite(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class); + suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class); suite.addTestSuite(IgniteCachePartitionedSnapshotEnabledQuerySelfTest.class); suite.addTestSuite(IgniteCacheAtomicQuerySelfTest.class); suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc9969f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java index e5f4027..7cb1adb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java @@ -40,10 +40,6 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.Ignite import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedFieldsQuerySelfTest; import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalFieldsQuerySelfTest; import org.apache.ignite.internal.processors.cache.query.GridCacheSwapScanQuerySelfTest; -import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryLocalSelfTest; -import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.reducefields.GridCacheReduceFieldsQueryReplicatedSelfTest; import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; @@ -73,12 +69,6 @@ public class IgniteCacheQuerySelfTestSuite2 extends TestSuite { suite.addTestSuite(IgniteCachePartitionedFieldsQueryP2PEnabledSelfTest.class); suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class); - // Reduce fields queries. - suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class); - suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class); suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
