Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 55D8017C02 for ; Thu, 16 Apr 2015 09:49:47 +0000 (UTC) Received: (qmail 78018 invoked by uid 500); 16 Apr 2015 09:49:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77954 invoked by uid 500); 16 Apr 2015 09:49:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 77938 invoked by uid 99); 16 Apr 2015 09:49:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 09:49:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Apr 2015 09:49:23 +0000 Received: (qmail 77376 invoked by uid 99); 16 Apr 2015 09:49:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 09:49:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48E10E1072; Thu, 16 Apr 2015 09:49:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Apr 2015 09:49:33 -0000 Message-Id: In-Reply-To: <2440f1a964f44b49b5d81368506d6ec4@git.apache.org> References: <2440f1a964f44b49b5d81368506d6ec4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] incubator-ignite git commit: #ignite-738: revert execute. X-Virus-Checked: Checked by ClamAV on apache.org #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-424 Commit: 12c24e2b18fb88c864024d7f1f615f114203c9fa Parents: bed9781 e16701d Author: ivasilinets Authored: Tue Apr 14 16:48:30 2015 +0300 Committer: ivasilinets 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 i boolean loc = nodes.size() == 1 && F.first(nodes).id().equals(cctx.localNodeId()); if (type == SQL_FIELDS || type == SPI) - return (CacheQueryFuture)(loc ? qryMgr.queryFieldsLocal(bean) : + return (CacheQueryFuture)(loc ? qryMgr.queryFieldsLocal(bean) : qryMgr.queryFieldsDistributed(bean, nodes)); else + return (CacheQueryFuture)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean, nodes)); + return (CacheQueryFuture)(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 ----------------------------------------------------------------------