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 412071895E for ; Wed, 6 May 2015 10:29:01 +0000 (UTC) Received: (qmail 85055 invoked by uid 500); 6 May 2015 10:29:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84992 invoked by uid 500); 6 May 2015 10:29:01 -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 84953 invoked by uid 99); 6 May 2015 10:29:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2015 10:29:01 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2015 10:28:55 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C105D230FC for ; Wed, 6 May 2015 10:28:35 +0000 (UTC) Received: (qmail 83689 invoked by uid 99); 6 May 2015 10:28:35 -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; Wed, 06 May 2015 10:28:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F824E17CA; Wed, 6 May 2015 10:28:35 +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: Wed, 06 May 2015 10:28:37 -0000 Message-Id: <44cb333757b74d30b30f3ba1fe5ba719@git.apache.org> In-Reply-To: <1b9ad81f6a444c22a3925c89da8e317a@git.apache.org> References: <1b9ad81f6a444c22a3925c89da8e317a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] incubator-ignite git commit: # GG-10218 Added support for local query. X-Virus-Checked: Checked by ClamAV on apache.org # GG-10218 Added support for local query. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ff80298 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ff80298 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ff80298 Branch: refs/heads/ignite-157-2 Commit: 9ff80298f395315027883ade7771730b6182477f Parents: 6d2a759 Author: AKuznetsov Authored: Wed May 6 14:23:38 2015 +0700 Committer: AKuznetsov Committed: Wed May 6 14:23:38 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/visor/query/VisorQueryArg.java | 14 +++++++++++++- .../ignite/internal/visor/query/VisorQueryJob.java | 2 ++ .../visor/commands/cache/VisorCacheScanCommand.scala | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff80298/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java index becebda..5050414 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java @@ -32,17 +32,22 @@ public class VisorQueryArg implements Serializable { /** Query text. */ private final String qryTxt; + /** Flag whether to execute query locally. */ + private final boolean local; + /** Result batch size. */ private final int pageSize; /** * @param cacheName Cache name for query. * @param qryTxt Query text. + * @param local Flag whether to execute query locally. * @param pageSize Result batch size. */ - public VisorQueryArg(String cacheName, String qryTxt, int pageSize) { + public VisorQueryArg(String cacheName, String qryTxt, boolean local, int pageSize) { this.cacheName = cacheName; this.qryTxt = qryTxt; + this.local = local; this.pageSize = pageSize; } @@ -61,6 +66,13 @@ public class VisorQueryArg implements Serializable { } /** + * @return {@code true} if query should be executed locally. + */ + public boolean local() { + return local; + } + + /** * @return Page size. */ public int pageSize() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff80298/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java index ebf62fa..4a9daad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java @@ -75,6 +75,7 @@ public class VisorQueryJob extends VisorJob qry = new ScanQuery<>(null); qry.setPageSize(arg.pageSize()); + qry.setLocal(arg.local()); long start = U.currentTimeMillis(); @@ -100,6 +101,7 @@ public class VisorQueryJob extends VisorJob error(x.get1())