Jenkins build became unstable: Kylin-Master-JDK-1.8 #382

2017-04-06 Thread Apache Jenkins Server 
See

kylin git commit: KYLIN-2165 use cube specific configs for hive job and use lowercase tablename

2017-04-06 Thread gaodayue 
Repository: kylin
Updated Branches:
  refs/heads/master 4ae40bd7a -> 7129ea650


KYLIN-2165 use cube specific configs for hive job and use lowercase tablename

Signed-off-by: gaodayue 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7129ea65
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7129ea65
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7129ea65

Branch: refs/heads/master
Commit: 7129ea650e757d6c50a81823760c45734688cfd2
Parents: 4ae40bd
Author: gaodayue 
Authored: Thu Apr 6 13:55:27 2017 +0800
Committer: gaodayue 
Committed: Thu Apr 6 20:38:03 2017 +0800

--
 .../org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java | 4 ++--
 .../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7129ea65/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
 
b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
index 2a68116..f607466 100644
--- 
a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
+++ 
b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
@@ -63,9 +63,9 @@ public class CubeJoinedFlatTableDesc implements 
IJoinedFlatTableDesc, java.io.Se
 
 protected String makeTableName(CubeDesc cubeDesc, CubeSegment cubeSegment) 
{
 if (cubeSegment == null) {
-return "kylin_intermediate_" + cubeDesc.getName();
+return "kylin_intermediate_" + cubeDesc.getName().toLowerCase();
 } else {
-return "kylin_intermediate_" + cubeDesc.getName() + "_" + 
cubeSegment.getUuid().replaceAll("-", "_");
+return "kylin_intermediate_" + cubeDesc.getName().toLowerCase() + 
"_" + cubeSegment.getUuid().replaceAll("-", "_");
 }
 }
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/7129ea65/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 a5d1353..0a03461 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
@@ -127,12 +127,11 @@ public class HiveMRInput implements IMRInput {
 
 public static class BatchCubingInputSide implements 
IMRBatchCubingInputSide {
 
-final JobEngineConfig conf;
+JobEngineConfig conf;
 final IJoinedFlatTableDesc flatDesc;
 String hiveViewIntermediateTables = "";
 
 public BatchCubingInputSide(IJoinedFlatTableDesc flatDesc) {
-this.conf = new JobEngineConfig(KylinConfig.getInstanceFromEnv());
 this.flatDesc = flatDesc;
 }
 
@@ -140,6 +139,7 @@ public class HiveMRInput implements IMRInput {
 public void addStepPhase1_CreateFlatTable(DefaultChainedExecutable 
jobFlow) {
 final String cubeName = 
CubingExecutableUtil.getCubeName(jobFlow.getParams());
 final KylinConfig kylinConfig = 
CubeManager.getInstance(conf.getConfig()).getCube(cubeName).getConfig();
+this.conf = new JobEngineConfig(kylinConfig);
 
 // create flat table first, then count and redistribute
 jobFlow.addTask(createFlatHiveTableStep(conf, flatDesc, 
jobFlow.getId(), cubeName));

Jenkins build became unstable: Kylin-Master-JDK-1.7 #382

2017-04-06 Thread Apache Jenkins Server 
See

kylin git commit: KYLIN-2165 fix UT

2017-04-06 Thread gaodayue 
Repository: kylin
Updated Branches:
  refs/heads/master 7129ea650 -> 93cc5ab6a


KYLIN-2165 fix UT


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/93cc5ab6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/93cc5ab6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/93cc5ab6

Branch: refs/heads/master
Commit: 93cc5ab6a454ecf99a492fa1eb4161a13bf91247
Parents: 7129ea6
Author: gaodayue 
Authored: Fri Apr 7 12:11:34 2017 +0800
Committer: gaodayue 
Committed: Fri Apr 7 12:11:34 2017 +0800

--
 .../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/93cc5ab6/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 0a03461..2f966ab 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
@@ -138,7 +138,7 @@ public class HiveMRInput implements IMRInput {
 @Override
 public void addStepPhase1_CreateFlatTable(DefaultChainedExecutable 
jobFlow) {
 final String cubeName = 
CubingExecutableUtil.getCubeName(jobFlow.getParams());
-final KylinConfig kylinConfig = 
CubeManager.getInstance(conf.getConfig()).getCube(cubeName).getConfig();
+final KylinConfig kylinConfig = 
CubeManager.getInstance(KylinConfig.getInstanceFromEnv()).getCube(cubeName).getConfig();
 this.conf = new JobEngineConfig(kylinConfig);
 
 // create flat table first, then count and redistribute

Jenkins build is back to stable : Kylin-Master-JDK-1.8 #383

2017-04-06 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : Kylin-Master-JDK-1.7 #384

2017-04-06 Thread Apache Jenkins Server 
See

kylin git commit: minor, recover query test sql_casewhen/query55.sql

2017-04-06 Thread liyang 
Repository: kylin
Updated Branches:
  refs/heads/master 6f9bce275 -> 4ae40bd7a


minor, recover query test sql_casewhen/query55.sql


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4ae40bd7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4ae40bd7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4ae40bd7

Branch: refs/heads/master
Commit: 4ae40bd7a59217adef7fe68f952b006191908551
Parents: 6f9bce2
Author: Li Yang 
Authored: Thu Apr 6 15:46:43 2017 +0800
Committer: Li Yang 
Committed: Thu Apr 6 15:46:43 2017 +0800

--
 .../resources/query/sql_casewhen/query55.sql| 22 
 .../query/sql_casewhen/query55.sql.disable  | 22 
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/4ae40bd7/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
--
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query55.sql 
b/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
new file mode 100644
index 000..d29b60d
--- /dev/null
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
@@ -0,0 +1,22 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 
'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) AS 
"LSTG_FORMAT_NAME__group_",
+  SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
+FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
+GROUP BY (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 
'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END)

http://git-wip-us.apache.org/repos/asf/kylin/blob/4ae40bd7/kylin-it/src/test/resources/query/sql_casewhen/query55.sql.disable
--
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query55.sql.disable 
b/kylin-it/src/test/resources/query/sql_casewhen/query55.sql.disable
deleted file mode 100644
index d29b60d..000
--- a/kylin-it/src/test/resources/query/sql_casewhen/query55.sql.disable
+++ /dev/null
@@ -1,22 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
-
-SELECT (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 
'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) AS 
"LSTG_FORMAT_NAME__group_",
-  SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
-FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
-GROUP BY (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 
'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END)

Jenkins build is still unstable: Kylin-Master-JDK-1.7 #383

2017-04-06 Thread Apache Jenkins Server 
See