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 5556318EB2 for ; Wed, 22 Jul 2015 06:05:29 +0000 (UTC) Received: (qmail 77019 invoked by uid 500); 22 Jul 2015 06:05:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 76988 invoked by uid 500); 22 Jul 2015 06:05:13 -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 76979 invoked by uid 99); 22 Jul 2015 06:05:13 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2015 06:05:13 +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 E0B1E18B71C for ; Wed, 22 Jul 2015 06:05:12 +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 KcsatVwXuMm1 for ; Wed, 22 Jul 2015 06:05:11 +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 4B4B823117 for ; Wed, 22 Jul 2015 06:05:10 +0000 (UTC) Received: (qmail 76932 invoked by uid 99); 22 Jul 2015 06:05:09 -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, 22 Jul 2015 06:05:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F3D1DF9F2; Wed, 22 Jul 2015 06:05:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 22 Jul 2015 06:05:12 -0000 Message-Id: <54abb186121d4762865c618657a1db74@git.apache.org> In-Reply-To: <9a2e39bdf8364286adea4206cbe19ece@git.apache.org> References: <9a2e39bdf8364286adea4206cbe19ece@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] incubator-ignite git commit: ignite-1015 - minor ignite-1015 - minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bb26bb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bb26bb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bb26bb1 Branch: refs/heads/ignite-1015 Commit: 0bb26bb1d8823104012c764d890919b08a449462 Parents: cbdc614 Author: S.Vladykin Authored: Wed Jul 22 06:17:04 2015 +0300 Committer: S.Vladykin Committed: Wed Jul 22 06:17:04 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/sql/GridSqlQuery.java | 8 ++------ .../internal/processors/query/h2/sql/GridSqlSelect.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bb26bb1/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java index b562279..ad13dfe 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuery.java @@ -145,13 +145,10 @@ public abstract class GridSqlQuery { int visibleCols = visibleColumns(); - boolean first = true; + buff.resetCount(); for (GridSqlSortColumn col : sort) { - if (first) - first = false; - else - buff.append(", "); + buff.appendExceptFirst(", "); int idx = col.column(); @@ -183,6 +180,5 @@ public abstract class GridSqlQuery { if (offset != null) buff.append(" OFFSET ").append(StringUtils.unEnclose(offset.getSQL())); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bb26bb1/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java index 08304aa..fb2643e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java @@ -70,7 +70,7 @@ public class GridSqlSelect extends GridSqlQuery { for (GridSqlElement expression : select) { buff.appendExceptFirst(","); buff.append('\n'); - buff.append(StringUtils.indent(expression.getSQL(), 4, false)); + buff.append(expression.getSQL()); } buff.append("\nFROM ").append(from.getSQL());