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 3A6FF200B61 for ; Tue, 26 Jul 2016 05:33:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 393AE160A7D; Tue, 26 Jul 2016 03:33:29 +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 B628A160AA5 for ; Tue, 26 Jul 2016 05:33:27 +0200 (CEST) Received: (qmail 12580 invoked by uid 500); 26 Jul 2016 03:33:26 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 10141 invoked by uid 99); 26 Jul 2016 03:33:21 -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, 26 Jul 2016 03:33:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FF35E02E4; Tue, 26 Jul 2016 03:33:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shaofengshi@apache.org To: commits@kylin.apache.org Date: Tue, 26 Jul 2016 03:34:07 -0000 Message-Id: <09fe24d12023478bb888d1cb76b4c494@git.apache.org> In-Reply-To: <5947187d840c4a5a949ac8e15bcf17f6@git.apache.org> References: <5947187d840c4a5a949ac8e15bcf17f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/55] [abbrv] kylin git commit: KYLIN-1758 add the hive set statements archived-at: Tue, 26 Jul 2016 03:33:29 -0000 KYLIN-1758 add the hive set statements Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/76d3bd21 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/76d3bd21 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/76d3bd21 Branch: refs/heads/1.5.x-CDH5.7 Commit: 76d3bd21a46549dd6da4db1ffac3bdc5dcbe12c4 Parents: 9bac838 Author: shaofengshi Authored: Sat Jun 4 16:22:38 2016 +0800 Committer: shaofengshi Committed: Mon Jul 25 20:13:38 2016 +0800 ---------------------------------------------------------------------- jdbc/pom.xml | 4 ---- server/pom.xml | 4 ---- .../main/java/org/apache/kylin/source/hive/HiveMRInput.java | 7 ++++--- 3 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/76d3bd21/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index ff83568..e86998e 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -27,11 +27,7 @@ org.apache.kylin kylin -<<<<<<< 571874049bdb9139afdc467474b53a1d63be818b 1.5.3 -======= - 1.5.2.1 ->>>>>>> update version number http://git-wip-us.apache.org/repos/asf/kylin/blob/76d3bd21/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index e0a4110..bca91fb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,11 +28,7 @@ org.apache.kylin kylin -<<<<<<< 571874049bdb9139afdc467474b53a1d63be818b 1.5.3 -======= - 1.5.2.1 ->>>>>>> update version number http://git-wip-us.apache.org/repos/asf/kylin/blob/76d3bd21/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java index 5de9a98..0dfeb5a 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java @@ -132,7 +132,6 @@ public class HiveMRInput implements IMRInput { hiveCmdBuilder.addStatement(JoinedFlatTable.generateHiveSetStatements(conf)); hiveCmdBuilder.addStatement("set hive.exec.compress.output=false;\n"); hiveCmdBuilder.addStatement(JoinedFlatTable.generateCountDataStatement(flatTableDesc, rowCountOutputDir)); - step.setCmd(hiveCmdBuilder.build()); step.setName(ExecutableConstants.STEP_NAME_COUNT_HIVE_TABLE); @@ -161,10 +160,12 @@ public class HiveMRInput implements IMRInput { if (lookupViewsTables.size() == 0) { return null; } + String setHql = ""; + setHql = JoinedFlatTable.generateHiveSetStatements(conf); final String useDatabaseHql = "USE " + conf.getConfig().getHiveDatabaseForIntermediateTable() + ";"; hiveCmdBuilder.addStatement(useDatabaseHql); - hiveCmdBuilder.addStatement(JoinedFlatTable.generateHiveSetStatements(conf)); - for (TableDesc lookUpTableDesc : lookupViewsTables) { + hiveCmdBuilder.addStatement(setHql); + for(TableDesc lookUpTableDesc : lookupViewsTables) { if (TableDesc.TABLE_TYPE_VIRTUAL_VIEW.equalsIgnoreCase(lookUpTableDesc.getTableType())) { StringBuilder createIntermediateTableHql = new StringBuilder(); createIntermediateTableHql.append("DROP TABLE IF EXISTS " + lookUpTableDesc.getMaterializedName() + ";\n");