Return-Path: X-Original-To: apmail-calcite-commits-archive@www.apache.org Delivered-To: apmail-calcite-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB1A618DAD for ; Tue, 13 Oct 2015 09:25:31 +0000 (UTC) Received: (qmail 37427 invoked by uid 500); 13 Oct 2015 09:25:31 -0000 Delivered-To: apmail-calcite-commits-archive@calcite.apache.org Received: (qmail 37397 invoked by uid 500); 13 Oct 2015 09:25:31 -0000 Mailing-List: contact commits-help@calcite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@calcite.incubator.apache.org Delivered-To: mailing list commits@calcite.incubator.apache.org Received: (qmail 37388 invoked by uid 99); 13 Oct 2015 09:25:31 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Oct 2015 09:25:31 +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 14651C084E for ; Tue, 13 Oct 2015 09:25:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 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] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id I9PVZcEoUQ20 for ; Tue, 13 Oct 2015 09:25:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id EDB04439CE for ; Tue, 13 Oct 2015 09:25:29 +0000 (UTC) Received: (qmail 37374 invoked by uid 99); 13 Oct 2015 09:25:29 -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, 13 Oct 2015 09:25:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71C41DFF16; Tue, 13 Oct 2015 09:25:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jcamacho@apache.org To: commits@calcite.incubator.apache.org Message-Id: <6d8e5dce99214c3bb8b66107659162ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-calcite git commit: [CALCITE-918] createProject in RelOptUtil should uniquify field names Date: Tue, 13 Oct 2015 09:25:29 +0000 (UTC) Repository: incubator-calcite Updated Branches: refs/heads/master b1e91e1e6 -> 13f6efddf [CALCITE-918] createProject in RelOptUtil should uniquify field names Close apache/incubator-calcite#147 Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/13f6efdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/13f6efdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/13f6efdd Branch: refs/heads/master Commit: 13f6efddf350ee87699c767d6d949563f02208b2 Parents: b1e91e1 Author: Jesus Camacho Rodriguez Authored: Mon Oct 12 18:26:57 2015 +0100 Committer: Jesus Camacho Rodriguez Committed: Tue Oct 13 10:17:38 2015 +0100 ---------------------------------------------------------------------- core/src/main/java/org/apache/calcite/plan/RelOptUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/13f6efdd/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java index 7be75b7..e008bbe 100644 --- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java +++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java @@ -2863,12 +2863,9 @@ public abstract class RelOptUtil { public static RelNode createProject(final RelFactories.ProjectFactory factory, final RelNode child, final List posList) { RelDataType rowType = child.getRowType(); - if (Mappings.isIdentity(posList, rowType.getFieldCount())) { - return child; - } final List fieldNames = rowType.getFieldNames(); final RexBuilder rexBuilder = child.getCluster().getRexBuilder(); - return factory.createProject(child, + return createProject(child, new AbstractList() { public int size() { return posList.size(); @@ -2888,7 +2885,7 @@ public abstract class RelOptUtil { final int pos = posList.get(index); return fieldNames.get(pos); } - }); + }, true, factory); } /**