You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/07/24 12:32:49 UTC
[1/2] kylin git commit: KYLIN-1911 NPE when extended column has NULL
value
Repository: kylin
Updated Branches:
refs/heads/master 0f81ed283 -> 57569a7dc
KYLIN-1911 NPE when extended column has NULL value
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/57569a7d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/57569a7d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/57569a7d
Branch: refs/heads/master
Commit: 57569a7dc3144a82873941e20c4139d008e9512d
Parents: 22f09c1
Author: Hongbin Ma <ma...@apache.org>
Authored: Sun Jul 24 20:19:34 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Sun Jul 24 20:19:40 2016 +0800
----------------------------------------------------------------------
.../kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/57569a7d/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
index d566331..dc718d1 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
@@ -147,6 +147,11 @@ public class ExtendedColumnMeasureType extends MeasureType<ByteArray> {
@Override
public void reload(Object measureValue) {
+ if (measureValue == null) {
+ value = null;
+ return;
+ }
+
ByteArray byteArray = (ByteArray) measureValue;
//the array in ByteArray is guaranteed to be completed owned by the ByteArray
value = Bytes.toString(byteArray.array());
[2/2] kylin git commit: KYLIN-1913 fix bug
Posted by ma...@apache.org.
KYLIN-1913 fix bug
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/22f09c18
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/22f09c18
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/22f09c18
Branch: refs/heads/master
Commit: 22f09c18214df9239b4b546eb44ea164cf10334b
Parents: 0f81ed2
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Jul 22 17:45:27 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Sun Jul 24 20:19:40 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/util/QueryUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/22f09c18/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
index 0f9807f..a2d0402 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
@@ -102,7 +102,7 @@ public class QueryUtil {
public static String massageSql(SQLRequest sqlRequest) {
String sql = sqlRequest.getSql();
sql = sql.trim();
- sql = sql.replace("\r", "").replace("\n", System.getProperty("line.separator"));
+ sql = sql.replace("\r", " ").replace("\n", System.getProperty("line.separator"));
while (sql.endsWith(";"))
sql = sql.substring(0, sql.length() - 1);