kylin git commit: bug fix

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2497-2 47c67f0ab -> 7033f4be5


bug fix


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

Branch: refs/heads/KYLIN-2497-2
Commit: 7033f4be50a65d8a83dc9a12796c0adf4d39a4ec
Parents: 47c67f0
Author: Yang Li 
Authored: Fri Mar 10 22:08:25 2017 +0800
Committer: Yang Li 
Committed: Fri Mar 10 22:08:37 2017 +0800

--
 .../org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7033f4be/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java
--
diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java
 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java
index 07ad850..ace753a 100644
--- 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKey.java
@@ -48,8 +48,7 @@ public class SelfDefineSortableKey implements 
WritableComparable

[08/12] kylin git commit: bug fix

[liyang]

bug fix


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

Branch: refs/heads/mhb-master
Commit: 9f2d1145640be3dd47b90fcb1b64d796f87b5fbd
Parents: e14aadf
Author: Hongbin Ma 
Authored: Sun Dec 25 14:51:08 2016 +0800
Committer: Hongbin Ma 
Committed: Tue Dec 27 22:15:44 2016 +0800

--
 .../org/apache/kylin/query/enumerator/OLAPEnumerator.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/9f2d1145/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java 
b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
index 408d227..e4fc937 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
@@ -76,14 +76,15 @@ public class OLAPEnumerator implements Enumerator 
{
 }
 convertCurrentRow(tuple);
 return true;
-} finally {
+} catch (Exception e) {
 try {
 if (cursor != null) {
 cursor.close();
 }
-} catch (Exception e) {
-logger.info("Error when closing cursor, ignore it", e);
+} catch (Exception ee) {
+logger.info("Error when closing cursor, ignore it", ee);
 }
+throw e;
 }
 }
 

[5/8] kylin git commit: bug fix

[lidong]

bug fix


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

Branch: refs/heads/yang22-hbase102
Commit: 473f77b06a1554aedbfcfd4fc5b827087aadb426
Parents: 83f9dc7
Author: Hongbin Ma 
Authored: Sun Dec 25 14:51:08 2016 +0800
Committer: Hongbin Ma 
Committed: Sun Dec 25 14:51:08 2016 +0800

--
 .../org/apache/kylin/query/enumerator/OLAPEnumerator.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/473f77b0/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java 
b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
index 408d227..e4fc937 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
@@ -76,14 +76,15 @@ public class OLAPEnumerator implements Enumerator 
{
 }
 convertCurrentRow(tuple);
 return true;
-} finally {
+} catch (Exception e) {
 try {
 if (cursor != null) {
 cursor.close();
 }
-} catch (Exception e) {
-logger.info("Error when closing cursor, ignore it", e);
+} catch (Exception ee) {
+logger.info("Error when closing cursor, ignore it", ee);
 }
+throw e;
 }
 }
 

[5/8] kylin git commit: bug fix

[lidong]

bug fix


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

Branch: refs/heads/yang22-cdh5.7
Commit: 473f77b06a1554aedbfcfd4fc5b827087aadb426
Parents: 83f9dc7
Author: Hongbin Ma 
Authored: Sun Dec 25 14:51:08 2016 +0800
Committer: Hongbin Ma 
Committed: Sun Dec 25 14:51:08 2016 +0800

--
 .../org/apache/kylin/query/enumerator/OLAPEnumerator.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/473f77b0/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java 
b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
index 408d227..e4fc937 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
@@ -76,14 +76,15 @@ public class OLAPEnumerator implements Enumerator 
{
 }
 convertCurrentRow(tuple);
 return true;
-} finally {
+} catch (Exception e) {
 try {
 if (cursor != null) {
 cursor.close();
 }
-} catch (Exception e) {
-logger.info("Error when closing cursor, ignore it", e);
+} catch (Exception ee) {
+logger.info("Error when closing cursor, ignore it", ee);
 }
+throw e;
 }
 }
 

[5/7] kylin git commit: bug fix

[lidong]

bug fix


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

Branch: refs/heads/yang22-hbase1.x
Commit: 473f77b06a1554aedbfcfd4fc5b827087aadb426
Parents: 83f9dc7
Author: Hongbin Ma 
Authored: Sun Dec 25 14:51:08 2016 +0800
Committer: Hongbin Ma 
Committed: Sun Dec 25 14:51:08 2016 +0800

--
 .../org/apache/kylin/query/enumerator/OLAPEnumerator.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/473f77b0/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java 
b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
index 408d227..e4fc937 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
@@ -76,14 +76,15 @@ public class OLAPEnumerator implements Enumerator 
{
 }
 convertCurrentRow(tuple);
 return true;
-} finally {
+} catch (Exception e) {
 try {
 if (cursor != null) {
 cursor.close();
 }
-} catch (Exception e) {
-logger.info("Error when closing cursor, ignore it", e);
+} catch (Exception ee) {
+logger.info("Error when closing cursor, ignore it", ee);
 }
+throw e;
 }
 }
 

kylin git commit: bug fix

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/yang22 83f9dc7a6 -> 473f77b06


bug fix


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

Branch: refs/heads/yang22
Commit: 473f77b06a1554aedbfcfd4fc5b827087aadb426
Parents: 83f9dc7
Author: Hongbin Ma 
Authored: Sun Dec 25 14:51:08 2016 +0800
Committer: Hongbin Ma 
Committed: Sun Dec 25 14:51:08 2016 +0800

--
 .../org/apache/kylin/query/enumerator/OLAPEnumerator.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/473f77b0/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java 
b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
index 408d227..e4fc937 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java
@@ -76,14 +76,15 @@ public class OLAPEnumerator implements Enumerator 
{
 }
 convertCurrentRow(tuple);
 return true;
-} finally {
+} catch (Exception e) {
 try {
 if (cursor != null) {
 cursor.close();
 }
-} catch (Exception e) {
-logger.info("Error when closing cursor, ignore it", e);
+} catch (Exception ee) {
+logger.info("Error when closing cursor, ignore it", ee);
 }
+throw e;
 }
 }
 

[12/15] kylin git commit: bug fix in FunctionDesc.hashCode()

[liyang]

bug fix in FunctionDesc.hashCode()


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

Branch: refs/heads/master-cdh5.7
Commit: 01060b574cb6186f040dac398e2eb2a90b052d42
Parents: 7ae0663
Author: Yang Li 
Authored: Fri Dec 9 12:11:08 2016 +0800
Committer: Yang Li 
Committed: Fri Dec 9 12:11:08 2016 +0800

--
 .../main/java/org/apache/kylin/metadata/model/FunctionDesc.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/01060b57/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
index 9252c42..ac13f40 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
@@ -240,8 +240,8 @@ public class FunctionDesc {
 final int prime = 31;
 int result = 1;
 result = prime * result + ((expression == null) ? 0 : 
expression.hashCode());
-result = prime * result + ((returnType == null) ? 0 : 
returnType.hashCode());
 result = prime * result + ((isCount() || parameter == null) ? 0 : 
parameter.hashCode());
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return result;
 }
 
@@ -272,6 +272,7 @@ public class FunctionDesc {
 return false;
 }
 }
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return true;
 }
 

[12/14] kylin git commit: bug fix in FunctionDesc.hashCode()

[liyang]

bug fix in FunctionDesc.hashCode()


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

Branch: refs/heads/master-hbase1.x
Commit: 01060b574cb6186f040dac398e2eb2a90b052d42
Parents: 7ae0663
Author: Yang Li 
Authored: Fri Dec 9 12:11:08 2016 +0800
Committer: Yang Li 
Committed: Fri Dec 9 12:11:08 2016 +0800

--
 .../main/java/org/apache/kylin/metadata/model/FunctionDesc.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/01060b57/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
index 9252c42..ac13f40 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
@@ -240,8 +240,8 @@ public class FunctionDesc {
 final int prime = 31;
 int result = 1;
 result = prime * result + ((expression == null) ? 0 : 
expression.hashCode());
-result = prime * result + ((returnType == null) ? 0 : 
returnType.hashCode());
 result = prime * result + ((isCount() || parameter == null) ? 0 : 
parameter.hashCode());
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return result;
 }
 
@@ -272,6 +272,7 @@ public class FunctionDesc {
 return false;
 }
 }
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return true;
 }
 

kylin git commit: bug fix in FunctionDesc.hashCode()

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/master 7ae06634e -> 01060b574


bug fix in FunctionDesc.hashCode()


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

Branch: refs/heads/master
Commit: 01060b574cb6186f040dac398e2eb2a90b052d42
Parents: 7ae0663
Author: Yang Li 
Authored: Fri Dec 9 12:11:08 2016 +0800
Committer: Yang Li 
Committed: Fri Dec 9 12:11:08 2016 +0800

--
 .../main/java/org/apache/kylin/metadata/model/FunctionDesc.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/01060b57/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
index 9252c42..ac13f40 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java
@@ -240,8 +240,8 @@ public class FunctionDesc {
 final int prime = 31;
 int result = 1;
 result = prime * result + ((expression == null) ? 0 : 
expression.hashCode());
-result = prime * result + ((returnType == null) ? 0 : 
returnType.hashCode());
 result = prime * result + ((isCount() || parameter == null) ? 0 : 
parameter.hashCode());
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return result;
 }
 
@@ -272,6 +272,7 @@ public class FunctionDesc {
 return false;
 }
 }
+// NOTE: don't compare returnType, FunctionDesc created at query 
engine does not have a returnType
 return true;
 }
 

kylin git commit: bug fix

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2217-2 6a669b640 -> 643cbe955


bug fix


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

Branch: refs/heads/KYLIN-2217-2
Commit: 643cbe95521cee4bd4f18dc217d3c958dc145647
Parents: 6a669b6
Author: Li Yang 
Authored: Fri Nov 25 17:59:40 2016 +0800
Committer: Li Yang 
Committed: Fri Nov 25 17:59:40 2016 +0800

--
 .../src/main/java/org/apache/kylin/common/KylinConfig.java| 3 ++-
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/643cbe95/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
--
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 73e5aeb..d888fd3 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -222,7 +222,8 @@ public class KylinConfig extends KylinConfigBase {
 Properties propOverride = new Properties();
 propOverride.load(ois);
 IOUtils.closeQuietly(ois);
-conf.putAll(propOverride);
+conf = BCC.check(conf);
+conf.putAll(BCC.check(propOverride));
 }
 } catch (IOException e) {
 throw new RuntimeException(e);

http://git-wip-us.apache.org/repos/asf/kylin/blob/643cbe95/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0501d0f..51479c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1097,7 +1097,7 @@
 
 
 log4j.configuration
-
file:${pom.parent.basedir}/build/conf/kylin-tools-log4j.properties
+
file:${project.basedir}/../build/conf/kylin-tools-log4j.properties
 
 
 
-javaagent:${project.build.testOutputDirectory}/jamm.jar 
${argLine}

[5/8] kylin git commit: bug fix

[liyang]

bug fix


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

Branch: refs/heads/KYLIN-2217-2
Commit: 99197dafc3e33bca922e0ce711f54956169c77d5
Parents: f700a42
Author: Li Yang 
Authored: Fri Nov 25 11:25:08 2016 +0800
Committer: Li Yang 
Committed: Fri Nov 25 15:05:36 2016 +0800

--
 core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/99197daf/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 6a024b4..b4422d2 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -949,7 +949,8 @@ public class CubeManager implements IRealizationProvider {
 }
 
 private boolean isITTestCube(String cubeName) {
-return cubeName.startsWith("test_kylin_cube") || 
cubeName.startsWith("test_streaming");
+return config.isDevEnv() //
+&& (cubeName.startsWith("test_kylin_cube") || 
cubeName.startsWith("test_streaming"));
 }
 
 private MetadataManager getMetadataManager() {

kylin git commit: bug fix

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2217-2 84a0726a5 -> 672500a10


bug fix


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

Branch: refs/heads/KYLIN-2217-2
Commit: 672500a1082ae8fec8257709bd4a1b58f3a47f01
Parents: 84a0726
Author: Li Yang 
Authored: Fri Nov 25 11:25:08 2016 +0800
Committer: Li Yang 
Committed: Fri Nov 25 11:25:08 2016 +0800

--
 core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/672500a1/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 6a024b4..b4422d2 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -949,7 +949,8 @@ public class CubeManager implements IRealizationProvider {
 }
 
 private boolean isITTestCube(String cubeName) {
-return cubeName.startsWith("test_kylin_cube") || 
cubeName.startsWith("test_streaming");
+return config.isDevEnv() //
+&& (cubeName.startsWith("test_kylin_cube") || 
cubeName.startsWith("test_streaming"));
 }
 
 private MetadataManager getMetadataManager() {

[01/10] kylin git commit: bug fix [Forced Update!]

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/yang21-cdh5.7 f03f26af9 -> d4df0043e (forced update)


bug fix


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

Branch: refs/heads/yang21-cdh5.7
Commit: 52076862c098f802d6485c893663f5815f4b46f7
Parents: 44d4fe8
Author: Hongbin Ma 
Authored: Fri Nov 4 09:36:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 09:36:12 2016 +0800

--
 .../org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/52076862/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
index ff729f4..3c73dc6 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
@@ -98,6 +98,10 @@ public class CubeStorageQuery implements IStorageQuery {
 
 @Override
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
+
+//deal with participant columns in subquery join
+sqlDigest.includeSubqueryJoinParticipants();
+
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);
 

[1/9] kylin git commit: bug fix [Forced Update!]

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/yang21-hbase1.x 822be4708 -> 471c1e74e (forced update)


bug fix


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

Branch: refs/heads/yang21-hbase1.x
Commit: 52076862c098f802d6485c893663f5815f4b46f7
Parents: 44d4fe8
Author: Hongbin Ma 
Authored: Fri Nov 4 09:36:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 09:36:12 2016 +0800

--
 .../org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/52076862/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
index ff729f4..3c73dc6 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
@@ -98,6 +98,10 @@ public class CubeStorageQuery implements IStorageQuery {
 
 @Override
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
+
+//deal with participant columns in subquery join
+sqlDigest.includeSubqueryJoinParticipants();
+
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);
 

[27/49] kylin git commit: bug fix in integer as partition column

[liyang]

bug fix in integer as partition column


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

Branch: refs/heads/KYLIN-1971
Commit: 99eb6488227b795b63349851fabce302d7697082
Parents: d9c118b
Author: Hongbin Ma 
Authored: Tue Nov 1 09:40:46 2016 +0800
Committer: Hongbin Ma 
Committed: Thu Nov 3 13:34:12 2016 +0800

--
 .../org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/99eb6488/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
index b4a82d4..8ceb841 100644
--- 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
+++ 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
@@ -24,10 +24,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.kylin.common.util.ByteArray;
 import org.apache.kylin.common.util.DateFormat;
 import org.apache.kylin.common.util.Pair;
-import org.apache.kylin.metadata.model.ISegment;
 import org.apache.kylin.dimension.AbstractDateDimEnc;
 import org.apache.kylin.gridtable.GTInfo;
 import org.apache.kylin.metadata.datatype.DataType;
+import org.apache.kylin.metadata.model.ISegment;
 
 public class SegmentGTStartAndEnd {
 private ISegment segment;
@@ -67,7 +67,7 @@ public class SegmentGTStartAndEnd {
 value = DateFormat.formatToDateStr(ts);
 } else if (partitionColType.isTimeFamily()) {
 value = DateFormat.formatToTimeWithoutMilliStr(ts);
-} else if (partitionColType.isStringFamily()) {
+} else if (partitionColType.isStringFamily() || 
partitionColType.isIntegerFamily()) {//integer like 20160101
 String partitionDateFormat = 
segment.getModel().getPartitionDesc().getPartitionDateFormat();
 if (StringUtils.isEmpty(partitionDateFormat))
 partitionDateFormat = DateFormat.DEFAULT_DATE_PATTERN;

kylin git commit: bug fix

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21 44d4fe8c5 -> 52076862c


bug fix


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

Branch: refs/heads/yang21
Commit: 52076862c098f802d6485c893663f5815f4b46f7
Parents: 44d4fe8
Author: Hongbin Ma 
Authored: Fri Nov 4 09:36:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 09:36:12 2016 +0800

--
 .../org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/52076862/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
index ff729f4..3c73dc6 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/CubeStorageQuery.java
@@ -98,6 +98,10 @@ public class CubeStorageQuery implements IStorageQuery {
 
 @Override
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
+
+//deal with participant columns in subquery join
+sqlDigest.includeSubqueryJoinParticipants();
+
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);
 

[1/4] kylin git commit: bug fix: if outer query does not have aggr, join columns with subquery should not be added to groupbycolumns [Forced Update!]

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21-cdh5.7 7398d08b8 -> f03f26af9 (forced update)


bug fix: if outer query does not have aggr, join columns with subquery should 
not be added to groupbycolumns


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

Branch: refs/heads/yang21-cdh5.7
Commit: 44d4fe8c590dd2f7822acce40715832cc7a08432
Parents: cfd78bb
Author: Hongbin Ma 
Authored: Fri Nov 4 08:59:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 08:59:12 2016 +0800

--
 .../org/apache/kylin/metadata/realization/SQLDigest.java| 9 +
 .../kylin/storage/gtrecord/GTCubeStorageQueryBase.java  | 7 +--
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
index 3aa39e4..e60d785 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
@@ -70,6 +70,15 @@ public class SQLDigest {
 //the reason to choose aggregations rather than metricColumns is 
because the former is set earlier at implOLAP
 }
 
+public void includeSubqueryJoinParticipants() {
+if (this.isRawQuery) {
+this.allColumns.addAll(this.subqueryJoinParticipants);
+} else {
+this.groupbyColumns.addAll(this.subqueryJoinParticipants);
+this.allColumns.addAll(this.subqueryJoinParticipants);
+}
+}
+
 @Override
 public String toString() {
 return "fact table " + this.factTable + "," + //

http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
index 86d66af..7dc6afa 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
@@ -75,12 +75,7 @@ public abstract class GTCubeStorageQueryBase implements 
IStorageQuery {
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
 
 //deal with participant columns in subquery join
-if (sqlDigest.isRawQuery) {
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-} else {
-
sqlDigest.groupbyColumns.addAll(sqlDigest.subqueryJoinParticipants);
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-}
+sqlDigest.includeSubqueryJoinParticipants();
 
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);

[1/3] kylin git commit: bug fix: if outer query does not have aggr, join columns with subquery should not be added to groupbycolumns [Forced Update!]

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21-hbase1.x b0bb09d17 -> 822be4708 (forced update)


bug fix: if outer query does not have aggr, join columns with subquery should 
not be added to groupbycolumns


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

Branch: refs/heads/yang21-hbase1.x
Commit: 44d4fe8c590dd2f7822acce40715832cc7a08432
Parents: cfd78bb
Author: Hongbin Ma 
Authored: Fri Nov 4 08:59:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 08:59:12 2016 +0800

--
 .../org/apache/kylin/metadata/realization/SQLDigest.java| 9 +
 .../kylin/storage/gtrecord/GTCubeStorageQueryBase.java  | 7 +--
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
index 3aa39e4..e60d785 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
@@ -70,6 +70,15 @@ public class SQLDigest {
 //the reason to choose aggregations rather than metricColumns is 
because the former is set earlier at implOLAP
 }
 
+public void includeSubqueryJoinParticipants() {
+if (this.isRawQuery) {
+this.allColumns.addAll(this.subqueryJoinParticipants);
+} else {
+this.groupbyColumns.addAll(this.subqueryJoinParticipants);
+this.allColumns.addAll(this.subqueryJoinParticipants);
+}
+}
+
 @Override
 public String toString() {
 return "fact table " + this.factTable + "," + //

http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
index 86d66af..7dc6afa 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
@@ -75,12 +75,7 @@ public abstract class GTCubeStorageQueryBase implements 
IStorageQuery {
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
 
 //deal with participant columns in subquery join
-if (sqlDigest.isRawQuery) {
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-} else {
-
sqlDigest.groupbyColumns.addAll(sqlDigest.subqueryJoinParticipants);
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-}
+sqlDigest.includeSubqueryJoinParticipants();
 
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);

kylin git commit: bug fix: if outer query does not have aggr, join columns with subquery should not be added to groupbycolumns

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21 cfd78bba0 -> 44d4fe8c5


bug fix: if outer query does not have aggr, join columns with subquery should 
not be added to groupbycolumns


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

Branch: refs/heads/yang21
Commit: 44d4fe8c590dd2f7822acce40715832cc7a08432
Parents: cfd78bb
Author: Hongbin Ma 
Authored: Fri Nov 4 08:59:12 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Nov 4 08:59:12 2016 +0800

--
 .../org/apache/kylin/metadata/realization/SQLDigest.java| 9 +
 .../kylin/storage/gtrecord/GTCubeStorageQueryBase.java  | 7 +--
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
index 3aa39e4..e60d785 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java
@@ -70,6 +70,15 @@ public class SQLDigest {
 //the reason to choose aggregations rather than metricColumns is 
because the former is set earlier at implOLAP
 }
 
+public void includeSubqueryJoinParticipants() {
+if (this.isRawQuery) {
+this.allColumns.addAll(this.subqueryJoinParticipants);
+} else {
+this.groupbyColumns.addAll(this.subqueryJoinParticipants);
+this.allColumns.addAll(this.subqueryJoinParticipants);
+}
+}
+
 @Override
 public String toString() {
 return "fact table " + this.factTable + "," + //

http://git-wip-us.apache.org/repos/asf/kylin/blob/44d4fe8c/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
index 86d66af..7dc6afa 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
@@ -75,12 +75,7 @@ public abstract class GTCubeStorageQueryBase implements 
IStorageQuery {
 public ITupleIterator search(StorageContext context, SQLDigest sqlDigest, 
TupleInfo returnTupleInfo) {
 
 //deal with participant columns in subquery join
-if (sqlDigest.isRawQuery) {
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-} else {
-
sqlDigest.groupbyColumns.addAll(sqlDigest.subqueryJoinParticipants);
-sqlDigest.allColumns.addAll(sqlDigest.subqueryJoinParticipants);
-}
+sqlDigest.includeSubqueryJoinParticipants();
 
 //cope with queries with no aggregations
 RawQueryLastHacker.hackNoAggregations(sqlDigest, cubeDesc);

[4/7] kylin git commit: bug fix in integer as partition column

[mahongbin]

bug fix in integer as partition column


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

Branch: refs/heads/master
Commit: 99eb6488227b795b63349851fabce302d7697082
Parents: d9c118b
Author: Hongbin Ma 
Authored: Tue Nov 1 09:40:46 2016 +0800
Committer: Hongbin Ma 
Committed: Thu Nov 3 13:34:12 2016 +0800

--
 .../org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/99eb6488/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
index b4a82d4..8ceb841 100644
--- 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
+++ 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
@@ -24,10 +24,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.kylin.common.util.ByteArray;
 import org.apache.kylin.common.util.DateFormat;
 import org.apache.kylin.common.util.Pair;
-import org.apache.kylin.metadata.model.ISegment;
 import org.apache.kylin.dimension.AbstractDateDimEnc;
 import org.apache.kylin.gridtable.GTInfo;
 import org.apache.kylin.metadata.datatype.DataType;
+import org.apache.kylin.metadata.model.ISegment;
 
 public class SegmentGTStartAndEnd {
 private ISegment segment;
@@ -67,7 +67,7 @@ public class SegmentGTStartAndEnd {
 value = DateFormat.formatToDateStr(ts);
 } else if (partitionColType.isTimeFamily()) {
 value = DateFormat.formatToTimeWithoutMilliStr(ts);
-} else if (partitionColType.isStringFamily()) {
+} else if (partitionColType.isStringFamily() || 
partitionColType.isIntegerFamily()) {//integer like 20160101
 String partitionDateFormat = 
segment.getModel().getPartitionDesc().getPartitionDateFormat();
 if (StringUtils.isEmpty(partitionDateFormat))
 partitionDateFormat = DateFormat.DEFAULT_DATE_PATTERN;

[1/4] kylin git commit: bug fix in integer as partition column [Forced Update!]

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21-cdh5.7 7dab3bed5 -> 9ae4376ae (forced update)


bug fix in integer as partition column


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

Branch: refs/heads/yang21-cdh5.7
Commit: 01d68fac8a80f08aff065c4a7aba0ab84f36baaa
Parents: d155263
Author: Hongbin Ma 
Authored: Tue Nov 1 09:40:46 2016 +0800
Committer: Hongbin Ma 
Committed: Tue Nov 1 09:40:46 2016 +0800

--
 .../org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/01d68fac/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
index b4a82d4..8ceb841 100644
--- 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
+++ 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
@@ -24,10 +24,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.kylin.common.util.ByteArray;
 import org.apache.kylin.common.util.DateFormat;
 import org.apache.kylin.common.util.Pair;
-import org.apache.kylin.metadata.model.ISegment;
 import org.apache.kylin.dimension.AbstractDateDimEnc;
 import org.apache.kylin.gridtable.GTInfo;
 import org.apache.kylin.metadata.datatype.DataType;
+import org.apache.kylin.metadata.model.ISegment;
 
 public class SegmentGTStartAndEnd {
 private ISegment segment;
@@ -67,7 +67,7 @@ public class SegmentGTStartAndEnd {
 value = DateFormat.formatToDateStr(ts);
 } else if (partitionColType.isTimeFamily()) {
 value = DateFormat.formatToTimeWithoutMilliStr(ts);
-} else if (partitionColType.isStringFamily()) {
+} else if (partitionColType.isStringFamily() || 
partitionColType.isIntegerFamily()) {//integer like 20160101
 String partitionDateFormat = 
segment.getModel().getPartitionDesc().getPartitionDateFormat();
 if (StringUtils.isEmpty(partitionDateFormat))
 partitionDateFormat = DateFormat.DEFAULT_DATE_PATTERN;

[1/3] kylin git commit: bug fix in integer as partition column [Forced Update!]

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang21-hbase1.x b701c7ec9 -> e60bcb0c8 (forced update)


bug fix in integer as partition column


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

Branch: refs/heads/yang21-hbase1.x
Commit: 01d68fac8a80f08aff065c4a7aba0ab84f36baaa
Parents: d155263
Author: Hongbin Ma 
Authored: Tue Nov 1 09:40:46 2016 +0800
Committer: Hongbin Ma 
Committed: Tue Nov 1 09:40:46 2016 +0800

--
 .../org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/01d68fac/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
index b4a82d4..8ceb841 100644
--- 
a/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
+++ 
b/core-cube/src/main/java/org/apache/kylin/cube/gridtable/SegmentGTStartAndEnd.java
@@ -24,10 +24,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.kylin.common.util.ByteArray;
 import org.apache.kylin.common.util.DateFormat;
 import org.apache.kylin.common.util.Pair;
-import org.apache.kylin.metadata.model.ISegment;
 import org.apache.kylin.dimension.AbstractDateDimEnc;
 import org.apache.kylin.gridtable.GTInfo;
 import org.apache.kylin.metadata.datatype.DataType;
+import org.apache.kylin.metadata.model.ISegment;
 
 public class SegmentGTStartAndEnd {
 private ISegment segment;
@@ -67,7 +67,7 @@ public class SegmentGTStartAndEnd {
 value = DateFormat.formatToDateStr(ts);
 } else if (partitionColType.isTimeFamily()) {
 value = DateFormat.formatToTimeWithoutMilliStr(ts);
-} else if (partitionColType.isStringFamily()) {
+} else if (partitionColType.isStringFamily() || 
partitionColType.isIntegerFamily()) {//integer like 20160101
 String partitionDateFormat = 
segment.getModel().getPartitionDesc().getPartitionDateFormat();
 if (StringUtils.isEmpty(partitionDateFormat))
 partitionDateFormat = DateFormat.DEFAULT_DATE_PATTERN;

kylin git commit: bug fix

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/mhb_test_1 7c154921e -> 5fd272892


bug fix


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

Branch: refs/heads/mhb_test_1
Commit: 5fd2728929ff29a90b062fe6a97049178149e86f
Parents: 7c15492
Author: Hongbin Ma 
Authored: Wed Apr 27 13:11:01 2016 +0800
Committer: Hongbin Ma 
Committed: Wed Apr 27 13:11:01 2016 +0800

--
 .../apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5fd27289/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java
index f554dac..75cc977 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java
@@ -322,6 +322,7 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC {
 final AtomicInteger totalScannedCount = new AtomicInteger(0);
 final ExpectedSizeIterator epResultItr = new 
ExpectedSizeIterator(scanRequests.size() * shardNum);
 final AtomicInteger atomicInteger = new AtomicInteger(0);
+final String storageResultDumpPath = 
BackdoorToggles.getStorageResultDump();//usually it's null
 
 for (final Pair epRange : 
getEPKeyRanges(cuboidBaseShard, shardNum, totalShards)) {
 executorService.submit(new Runnable() {
@@ -358,7 +359,7 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC {
 int order = 
atomicInteger.incrementAndGet();
 byte[] compressed = 
HBaseZeroCopyByteString.zeroCopyGetBytes(result.getValue().getCompressedRows());
 logger.info("Checking 
BackdoorToggles.getStorageResultDump()");
-if (BackdoorToggles.getStorageResultDump() 
!= null) {
+if (storageResultDumpPath != null) {
 try {
 FileUtils.writeByteArrayToFile(new 
File(BackdoorToggles.getStorageResultDump() + "/" + order), compressed);
 logger.info("write to file for 
part " + order + " finished");

[26/50] [abbrv] kylin git commit: bug fix, new aggr group does not support hierarchy well

[shaofengshi]

bug fix, new aggr group does not support hierarchy well


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

Branch: refs/heads/1.5.x-HBase1.1.3
Commit: b7db093fbefd9fac1e2193e8e06ce64db2bd0ce0
Parents: 4e48f2a
Author: lidongsjtu 
Authored: Thu Mar 10 18:58:21 2016 +0800
Committer: lidongsjtu 
Committed: Thu Mar 10 18:58:37 2016 +0800

--
 .../java/org/apache/kylin/cube/cuboid/Cuboid.java| 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/b7db093f/core-cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java 
b/core-cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
index 2cd96a6..c4e373b 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
@@ -143,9 +143,18 @@ public class Cuboid implements Comparable {
 long fullMask = hierarchyMask.fullMask;
 long intersect = cuboidID & fullMask;
 if (intersect != 0 && intersect != fullMask) {
-long lsb = Long.lowestOneBit(intersect);
-long fillMask = fullMask & ~(lsb - 1);
-cuboidID |= fillMask;
+
+boolean startToFill = false;
+for (int i = hierarchyMask.dims.length - 1; i >= 0; i--) {
+if (startToFill) {
+cuboidID |= hierarchyMask.dims[i];
+} else {
+if ((cuboidID & hierarchyMask.dims[i]) != 0) {
+startToFill = true;
+cuboidID |= hierarchyMask.dims[i];
+}
+}
+}
 }
 }
 

kylin git commit: bug fix in ResourceTool

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/2.0-rc a09df13d3 -> fdba83ed4


bug fix in ResourceTool


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

Branch: refs/heads/2.0-rc
Commit: fdba83ed4db98f4d927e75e13a1748bed928128c
Parents: a09df13
Author: honma 
Authored: Mon Jan 18 12:15:36 2016 +0800
Committer: honma 
Committed: Mon Jan 18 12:15:55 2016 +0800

--
 .../java/org/apache/kylin/common/persistence/ResourceTool.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/fdba83ed/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java
--
diff --git 
a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java
 
b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java
index f13b723..4a23ba3 100644
--- 
a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java
+++ 
b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java
@@ -131,7 +131,7 @@ public class ResourceTool {
 private static void resetR(ResourceStore store, String path) throws 
IOException {
 ArrayList children = store.listResources(path);
 if (children == null) { // path is a resource (not a folder)
-if (matchFilter(path) == false) {
+if (matchFilter(path)) {
 store.deleteResource(path);
 }
 } else {

[1/2] kylin git commit: bug fix: remove checkDupByInfo in merge dict

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/2.0-rc ea702c8a0 -> 5516466b3


bug fix: remove checkDupByInfo in merge dict


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

Branch: refs/heads/2.0-rc
Commit: 5516466b30d0db8a38a64d622877e3b81bfa55f2
Parents: 1dc361c
Author: honma 
Authored: Tue Jan 5 16:11:29 2016 +0800
Committer: honma 
Committed: Wed Jan 6 10:05:29 2016 +0800

--
 .../java/org/apache/kylin/dict/DictionaryManager.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/5516466b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
--
diff --git 
a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java 
b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
index 981e19a..78b4307 100644
--- a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
+++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
@@ -199,11 +199,11 @@ public class DictionaryManager {
 signature.setLastModifiedTime(System.currentTimeMillis());
 signature.setPath("merged_with_no_original_path");
 
-String dupDict = checkDupByInfo(newDictInfo);
-if (dupDict != null) {
-logger.info("Identical dictionary input " + newDictInfo.getInput() 
+ ", reuse existing dictionary at " + dupDict);
-return getDictionaryInfo(dupDict);
-}
+//String dupDict = checkDupByInfo(newDictInfo);
+//if (dupDict != null) {
+//logger.info("Identical dictionary input " + 
newDictInfo.getInput() + ", reuse existing dictionary at " + dupDict);
+//return getDictionaryInfo(dupDict);
+//}
 
 //check for cases where merging dicts are actually same
 boolean identicalSourceDicts = true;