Merge branch 'ignite-sql-tests' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-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/9e5ac7cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e5ac7cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e5ac7cd Branch: refs/heads/ignite-sql-tests Commit: 9e5ac7cdd232d51d7199aa21bd09221bbc193701 Parents: a21f3ba 426e48e Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Feb 13 17:22:11 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Feb 13 17:22:11 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 19 ++ .../processors/query/GridQueryProcessor.java | 40 ++- ...hePartitionedQueryMultiThreadedSelfTest.java | 307 ------------------- .../query/h2/twostep/GridMapQueryExecutor.java | 19 ++ .../GridCacheQueryIndexDisabledSelfTest.java | 253 +++++++++++++++ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 6 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 133 ++------ ...hePartitionedQueryMultiThreadedSelfTest.java | 306 ++++++++++++++++++ .../cache/IgniteCacheQueryLoadSelfTest.java | 19 +- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 6 +- .../IgniteCachePartitionedQuerySelfTest.java | 30 -- .../IgniteCacheQueryNodeRestartSelfTest.java | 2 +- .../IgniteCacheReplicatedQuerySelfTest.java | 17 +- .../IgniteCacheQuerySelfTestSuite.java | 1 + .../commands/cache/VisorCacheCommandSpec.scala | 65 +++- 15 files changed, 730 insertions(+), 493 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e5ac7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index d78e3ce,ae8a249..e983656 --- 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 @@@ -34,7 -35,9 +35,8 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.worker.*; import org.apache.ignite.lang.*; + import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; -import org.jdk8.backport.*; import org.jetbrains.annotations.*; import javax.cache.*;