#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/12c24e2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12c24e2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12c24e2b Branch: refs/heads/ignite-gg-9613 Commit: 12c24e2b18fb88c864024d7f1f615f114203c9fa Parents: bed9781 e16701d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 14 16:48:30 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 14 16:48:30 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/query/CacheQueries.java | 2 +- .../processors/cache/query/CacheQueriesImpl.java | 8 -------- .../processors/cache/query/GridCacheQueryAdapter.java | 11 +++++++++++ .../processors/cache/IgniteTxMultiNodeAbstractTest.java | 1 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 4 ++-- .../GridCacheReduceFieldsQueryPartitionedSelfTest.java | 5 ----- 6 files changed, 14 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c24e2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index 4b1fc87,07a68bf..1ac5175 --- 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 @@@ -426,10 -395,20 +426,21 @@@ public class GridCacheQueryAdapter<T> i boolean loc = nodes.size() == 1 && F.first(nodes).id().equals(cctx.localNodeId()); if (type == SQL_FIELDS || type == SPI) - return (CacheQueryFuture<T>)(loc ? qryMgr.queryFieldsLocal(bean) : + return (CacheQueryFuture<R>)(loc ? qryMgr.queryFieldsLocal(bean) : 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/12c24e2b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java ----------------------------------------------------------------------
