You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 02:33:36 UTC
[13/19] incubator-kylin git commit: fix NPE in IIKeyValueCodec
fix NPE in IIKeyValueCodec
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/fff4a305
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/fff4a305
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/fff4a305
Branch: refs/heads/KYLIN-1112-2
Commit: fff4a3054a976626d142849e885032fe6a760745
Parents: 662d163
Author: shaofengshi <sh...@apache.org>
Authored: Mon Nov 2 11:25:29 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 09:24:17 2015 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java | 1 -
.../org/apache/kylin/invertedindex/model/IIKeyValueCodec.java | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/fff4a305/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index d97b644..b64a7c5 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -105,7 +105,6 @@ public class BuildIIWithStreamTest {
kylinConfig = KylinConfig.getInstanceFromEnv();
iiManager = IIManager.getInstance(kylinConfig);
- iiManager = IIManager.getInstance(kylinConfig);
for (String iiInstance : II_NAME) {
IIInstance ii = iiManager.getII(iiInstance);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/fff4a305/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIKeyValueCodec.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIKeyValueCodec.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIKeyValueCodec.java
index 4f3ab80..7e54a98 100644
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIKeyValueCodec.java
+++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIKeyValueCodec.java
@@ -19,6 +19,7 @@
package org.apache.kylin.invertedindex.model;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -70,7 +71,7 @@ public class IIKeyValueCodec implements KeyValueCodec {
private IIRow collectKeyValues(Slice slice, int col, CompressedValueContainer container) {
ImmutableBytesWritable key = encodeKey(slice.getShard(), slice.getTimestamp(), col);
ImmutableBytesWritable value = container.toBytes();
- final Dictionary<?> dictionary = slice.getLocalDictionaries()[col];
+ final Dictionary<?> dictionary = slice.getLocalDictionaries() != null ? slice.getLocalDictionaries()[col] : null;
if (dictionary == null) {
return new IIRow(key, value, new ImmutableBytesWritable(BytesUtil.EMPTY_BYTE_ARRAY));
} else {