[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/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() {