#ignite-738: revert execute.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5454ee52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5454ee52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5454ee52 Branch: refs/heads/ignite-485 Commit: 5454ee52418f792d44e107d9b8f0f4d60de39667 Parents: 12c24e2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 14 16:48:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 14 16:48:40 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/query/GridCacheQueryAdapter.java | 11 ----------- .../cache/GridCacheReduceQueryMultithreadedSelfTest.java | 9 ++++----- .../GridCacheReduceFieldsQueryPartitionedSelfTest.java | 8 +++++++- 3 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5454ee52/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 1ac5175..4b1fc87 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 @@ -430,17 +430,6 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { qryMgr.queryFieldsDistributed(bean, nodes)); else return (CacheQueryFuture<R>)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean, nodes)); - return (CacheQueryFuture<T>)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean, nodes)); - } - - /** {@inheritDoc} */ - @Override public QueryMetrics metrics() { - return metrics.copy(); - } - - /** {@inheritDoc} */ - @Override public void resetMetrics() { - metrics = new GridCacheQueryMetricsAdapter(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5454ee52/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index d2a626a..4d71437 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -101,15 +101,14 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract }, 1); // Create query. - final CacheQuery<Map.Entry<String, Integer>> sumQry = - c.queries().createSqlQuery(Integer.class, "_val > 0").timeout(TEST_TIMEOUT); + final CacheQuery<List<?>> sumQry = c.queries().createSqlFieldsQuery("select _val from Integer").timeout(TEST_TIMEOUT); - final R1<Map.Entry<String, Integer>, Integer> rmtRdc = new R1<Map.Entry<String, Integer>, Integer>() { + final R1<List<?>, Integer> rmtRdc = new R1<List<?>, Integer>() { /** */ private AtomicInteger sum = new AtomicInteger(); - @Override public boolean collect(Map.Entry<String, Integer> e) { - sum.addAndGet(e.getValue()); + @Override public boolean collect(List<?> e) { + sum.addAndGet((Integer)e.get(0)); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5454ee52/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java index fd5e97c..5726d94 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java @@ -18,6 +18,11 @@ package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.lang.*; + +import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -39,7 +44,8 @@ public class GridCacheReduceFieldsQueryPartitionedSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testIncludeBackups() throws Exception { - CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select age from Person"); + CacheQuery<List<?>> qry = ((IgniteKernal)grid(0)).getCache(null).queries(). + createSqlFieldsQuery("select age from Person"); qry.includeBackups(true);
