This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 28b83a3c35f94a66405b7538cb528b1702758f9c Author: etherge <ethe...@163.com> AuthorDate: Fri Feb 14 17:34:04 2020 -0500 minor, toString() should not return null --- core-common/src/main/java/org/apache/kylin/common/util/ByteArray.java | 2 +- .../test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core-common/src/main/java/org/apache/kylin/common/util/ByteArray.java b/core-common/src/main/java/org/apache/kylin/common/util/ByteArray.java index f961501..5954e2c 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/ByteArray.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/ByteArray.java @@ -165,7 +165,7 @@ public class ByteArray implements Comparable<ByteArray>, Serializable { @Override public String toString() { if (data == null) - return null; + return ""; else return Bytes.toStringBinary(data, offset, length); } diff --git a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java index d80df78..a6a54ee 100644 --- a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java +++ b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java @@ -314,7 +314,7 @@ public class DictGridTableTest extends LocalFileMetadataTestCase { // note the unEvaluatable column 1 in filter is added to group by assertEquals( - "GTScanRequest [range=[[null, null]-[null, null]], columns={0, 1, 3}, filterPushDown=AND [UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.0 GT [\\x00\\x00\\x01J\\xE5\\xBD\\x5C\\x00], [null], [null]], aggrGroupBy={0, 1}, aggrMetrics={3}, aggrMetricsFuncs=[sum]]", + "GTScanRequest [range=[[null, null]-[null, null]], columns={0, 1, 3}, filterPushDown=AND [UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.0 GT [\\x00\\x00\\x01J\\xE5\\xBD\\x5C\\x00], [], []], aggrGroupBy={0, 1}, aggrMetrics={3}, aggrMetricsFuncs=[sum]]", req.toString()); doScanAndVerify(table, useDeserializedGTScanRequest(req), "[1421280000000, 20, null, 20, null]",