ignite-sql-tests - fixes + disabled multithreaded tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d35e88f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d35e88f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d35e88f Branch: refs/heads/ignite-sql-tests Commit: 0d35e88fcb853735b1080717a43ad8b8d7bd20ba Parents: a5e4a4a Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Feb 10 03:41:29 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Feb 10 03:41:29 2015 +0300 ---------------------------------------------------------------------- .../query/h2/sql/GridSqlQuerySplitter.java | 30 ++++++++++++++------ .../query/h2/twostep/GridMergeIndex.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 30 +++++++++++--------- ...niteCachePartitionedFieldsQuerySelfTest.java | 4 +-- .../IgniteCacheQuerySelfTestSuite.java | 18 ++++++------ 5 files changed, 51 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d35e88f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java index d70a9a5..c48622c 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java @@ -72,8 +72,10 @@ public class GridSqlQuerySplitter { List<GridSqlElement> mapExps = new ArrayList<>(srcQry.allExpressions()); GridSqlElement[] rdcExps = new GridSqlElement[srcQry.select().size()]; + Set<String> colNames = new HashSet<>(); + for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len because mapExps list can grow. - splitSelectExpression(mapExps, rdcExps, i); + splitSelectExpression(mapExps, rdcExps, colNames, i); // Fill select expressions. mapQry.clearSelect(); @@ -200,9 +202,11 @@ public class GridSqlQuerySplitter { /** * @param mapSelect Selects for map query. * @param rdcSelect Selects for reduce query. + * @param colNames Set of unique top level column names. * @param idx Index. */ - private static void splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect, int idx) { + private static void splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect, + Set<String> colNames, int idx) { GridSqlElement el = mapSelect.get(idx); GridSqlAlias alias = null; @@ -288,19 +292,27 @@ public class GridSqlQuerySplitter { rdcSelect[idx] = rdcAgg; } else { - if (alias == null) { // Generate alias if none. - GridSqlElement expr = mapSelect.get(idx); + String mapColAlias = columnName(idx); + String rdcColAlias; - String aliasName = expr instanceof GridSqlColumn ? ((GridSqlColumn)expr).columnName() : - columnName(idx); + if (alias == null) { // Wrap map column with generated alias if none. + rdcColAlias = el instanceof GridSqlColumn ? ((GridSqlColumn)el).columnName() : mapColAlias; - alias = alias(aliasName, expr); + alias = alias(mapColAlias, el); // `el` is known not to be alias. mapSelect.set(idx, alias); } + else // Set initial alias for reduce column. + rdcColAlias = alias.alias(); + + if (idx < rdcSelect.length) { // SELECT __C0 AS orginal_alias + GridSqlElement rdcEl = column(mapColAlias); - if (idx < rdcSelect.length) - rdcSelect[idx] = column(alias.alias()); + if (colNames.add(rdcColAlias)) + rdcEl = alias(rdcColAlias, rdcEl); + + rdcSelect[idx] = rdcEl; + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d35e88f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java index 1cb57fb5..1c93c5d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java @@ -95,7 +95,7 @@ public abstract class GridMergeIndex extends BaseIndex { if (page.response().isLast()) { int srcs0 = srcs.decrementAndGet(); - assert srcs0 >= 0; + assert srcs0 >= 0 : srcs0; if (srcs0 == 0) addPage0(END); // We've fetched all. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d35e88f/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 cbc01a6..65cac6f 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 @@ -29,11 +29,14 @@ import org.apache.ignite.spi.discovery.*; 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.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; +import javax.cache.*; import java.io.*; import java.util.*; +import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; @@ -69,7 +72,8 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cfg.setMarshaller(new OptimizedMarshaller(false)); if (hasCache) - cfg.setCacheConfiguration(cache(null, null), cache(CACHE, null), cache(EMPTY_CACHE, null)); + cfg.setCacheConfiguration(cache(null, true), cache(CACHE, true), cache(EMPTY_CACHE, true), + cache(CACHE_NO_PRIMITIVES, false), cache(CACHE_COMPLEX_KEYS, false)); else cfg.setCacheConfiguration(); @@ -80,10 +84,10 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** * @param name Cache name. - * @param spiName Indexing SPI name. + * @param primitives Index primitives. * @return Cache. */ - protected CacheConfiguration cache(@Nullable String name, @Nullable String spiName) { + protected CacheConfiguration cache(@Nullable String name, boolean primitives) { CacheConfiguration cache = defaultCacheConfiguration(); cache.setName(name); @@ -94,8 +98,8 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); - qcfg.setIndexPrimitiveKey(true); - qcfg.setIndexPrimitiveValue(true); + qcfg.setIndexPrimitiveKey(primitives); + qcfg.setIndexPrimitiveValue(primitives); qcfg.setIndexFixedTyping(true); cache.setQueryConfiguration(qcfg); @@ -414,20 +418,20 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA } /** @throws Exception If failed. */ - public void _testNoPrimitives() throws Exception { // TODO - IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_NO_PRIMITIVES); + public void testNoPrimitives() throws Exception { + final IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_NO_PRIMITIVES); cache.put("key", "val"); - QueryCursor<List<?>> qry = cache.queryFields(sql("select * from String")); - - assert qry.getAll().isEmpty(); - - cache.removeAll(); + GridTestUtils.assertThrows(log, new Callable<Object>() { + @Override public Object call() throws Exception { + return cache.queryFields(sql("select * from String")); + } + }, CacheException.class, null); } /** @throws Exception If failed. */ - public void _testComplexKeys() throws Exception { // TODO + public void testComplexKeys() throws Exception { IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_COMPLEX_KEYS); UUID id = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d35e88f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java index 9803104..f20a998 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java @@ -47,8 +47,8 @@ public class IgniteCachePartitionedFieldsQuerySelfTest extends IgniteCacheAbstra } /** {@inheritDoc} */ - @Override protected CacheConfiguration cache(@Nullable String name, @Nullable String spiName) { - CacheConfiguration cc = super.cache(name, spiName); + @Override protected CacheConfiguration cache(@Nullable String name, boolean primitives) { + CacheConfiguration cc = super.cache(name, primitives); cc.setDistributionMode(distributionMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d35e88f/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 14a3c33..bee76af 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 @@ -53,16 +53,18 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class); suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class); suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class); + +// suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class); + suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class); - suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); - suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); +// suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class); - suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); +// suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); // Fields queries. suite.addTestSuite(IgniteCacheLocalFieldsQuerySelfTest.class);
