Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EEA4F200B40 for ; Thu, 16 Jun 2016 20:16:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED826160A51; Thu, 16 Jun 2016 18:16:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4A29E160A52 for ; Thu, 16 Jun 2016 20:16:13 +0200 (CEST) Received: (qmail 76010 invoked by uid 500); 16 Jun 2016 18:16:12 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 75990 invoked by uid 99); 16 Jun 2016 18:16:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2016 18:16:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E5341C0FA7 for ; Thu, 16 Jun 2016 18:16:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id euQI0V4CvC0Z for ; Thu, 16 Jun 2016 18:16:10 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3CC825F39A for ; Thu, 16 Jun 2016 18:16:09 +0000 (UTC) Received: (qmail 75357 invoked by uid 99); 16 Jun 2016 18:16:08 -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 Jun 2016 18:16:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59F72E00DB; Thu, 16 Jun 2016 18:16:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Thu, 16 Jun 2016 18:16:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-geode git commit: GEODE-1521 - APP_FETCH_SIZE in GFSH should not be applied to COUNT queries archived-at: Thu, 16 Jun 2016 18:16:14 -0000 GEODE-1521 - APP_FETCH_SIZE in GFSH should not be applied to COUNT queries Change to search for " count(" instead of "count(*)" because 'count' can accept more options than simply a star. * This closes #155 [klund@apache.org] Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b3955c16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b3955c16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b3955c16 Branch: refs/heads/develop Commit: b3955c16909c9d780bfc1a539ed428cf40b7bd2c Parents: 1c5ba14 Author: Kevin J. Duling Authored: Fri Jun 10 10:03:44 2016 -0700 Committer: Kirk Lund Committed: Thu Jun 16 11:15:59 2016 -0700 ---------------------------------------------------------------------- .../management/internal/cli/functions/DataCommandFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3955c16/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java index 8a4736b..48cc83a 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java @@ -948,7 +948,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnt } private String addLimit(String query) { - if (StringUtils.containsIgnoreCase(query, " limit") || StringUtils.containsIgnoreCase(query, "count(*)")) + if (StringUtils.containsIgnoreCase(query, " limit") || StringUtils.containsIgnoreCase(query, " count(")) return query; return query + " limit " + getFetchSize(); }