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/02 10:20:17 UTC
incubator-kylin git commit: some revert
Repository: incubator-kylin
Updated Branches:
refs/heads/KYLIN-1112 ec9b57d24 -> 6ab480ce7
some revert
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6ab480ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6ab480ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6ab480ce
Branch: refs/heads/KYLIN-1112
Commit: 6ab480ce781693f29533b7e53d71f42c32717ce9
Parents: ec9b57d
Author: shaofengshi <sh...@apache.org>
Authored: Mon Nov 2 17:19:59 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Nov 2 17:19:59 2015 +0800
----------------------------------------------------------------------
.../kylin/engine/mr/invertedindex/InvertedIndexMapper.java | 2 +-
.../kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ab480ce/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexMapper.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexMapper.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexMapper.java
index 670972a..88249ed 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexMapper.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexMapper.java
@@ -76,7 +76,7 @@ public class InvertedIndexMapper<KEYIN> extends KylinMapper<KEYIN, Object, LongW
for (int i = 0; i < row.length; i++) {
Object fieldValue = row[i];
if (fieldValue != null)
- rec.setValueString(i, fieldValue == null ? null : fieldValue.toString());
+ rec.setValueString(i, fieldValue.toString());
}
outputKey.set(rec.getTimestamp());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ab480ce/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
index 24defef..8aace22 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
@@ -69,7 +69,6 @@ public class HBaseClientKVIterator implements Iterable<IIRow>, Closeable {
ImmutableBytesWritable value = new ImmutableBytesWritable();
ImmutableBytesWritable dict = new ImmutableBytesWritable();
IIRow pair = new IIRow(key, value, dict);
- final byte[] EMPTY_BYTES = new byte[0];
@Override
public boolean hasNext() {
@@ -83,11 +82,7 @@ public class HBaseClientKVIterator implements Iterable<IIRow>, Closeable {
key.set(c.getRowArray(), c.getRowOffset(), c.getRowLength());
value.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
c = r.getColumnLatestCell(IIDesc.HBASE_FAMILY_BYTES, IIDesc.HBASE_DICTIONARY_BYTES);
- if (c != null) {
- dict.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
- } else {
- dict.set(EMPTY_BYTES);
- }
+ dict.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
return pair;
}