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 DA06718480 for ; Tue, 9 Jun 2015 16:15:19 +0000 (UTC) Received: (qmail 65940 invoked by uid 500); 9 Jun 2015 16:15:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 65873 invoked by uid 500); 9 Jun 2015 16:15:19 -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 65853 invoked by uid 99); 9 Jun 2015 16:15:19 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 16:15:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 56338182224 for ; Tue, 9 Jun 2015 16:15:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 95UCIqeFR8vB for ; Tue, 9 Jun 2015 16:15:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A997325727 for ; Tue, 9 Jun 2015 16:15:13 +0000 (UTC) Received: (qmail 62387 invoked by uid 99); 9 Jun 2015 16:15:11 -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; Tue, 09 Jun 2015 16:15:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C39A0E022E; Tue, 9 Jun 2015 16:15:11 +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: Tue, 09 Jun 2015 16:15:21 -0000 Message-Id: <3903313e38844737a05621d6bf9298db@git.apache.org> In-Reply-To: <9eb0f40626364c628c1df5ac53231224@git.apache.org> References: <9eb0f40626364c628c1df5ac53231224@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/50] incubator-ignite git commit: # GG-10218 Added support for local query. # 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/master 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())