You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/21 01:27:11 UTC
[06/50] [abbrv] incubator-kylin git commit: fix ci
fix ci
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/26953451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/26953451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/26953451
Branch: refs/heads/streaming-localdict
Commit: 2695345179129382d160ac32f30988a88039ada8
Parents: 2fce2ba
Author: qianhao.zhou <qi...@ebay.com>
Authored: Wed Mar 18 17:42:54 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Wed Mar 18 17:42:54 2015 +0800
----------------------------------------------------------------------
.../kylin/invertedindex/index/TableRecordInfoDigest.java | 11 +++++++++--
.../coprocessor/endpoint/EndpointTupleIterator.java | 9 ++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/26953451/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfoDigest.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfoDigest.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfoDigest.java
index 12f88bf..832a39d 100644
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfoDigest.java
+++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfoDigest.java
@@ -41,6 +41,7 @@ public class TableRecordInfoDigest {
private int[] dictMaxIds;// max id for each of the dict
private int[] lengths;// length of each encoded dict
private boolean[] isMetric;// whether it's metric or dict
+ private FixedLenMeasureCodec[] measureCodecs;
public TableRecordInfoDigest(int nColumns, int byteFormLen, int[] offsets,
int[] dictMaxIds, int[] lengths, boolean[] isMetric,
@@ -52,7 +53,13 @@ public class TableRecordInfoDigest {
this.lengths = lengths;
this.isMetric = isMetric;
this.metricDataTypes = metricDataTypes;
- }
+ this.measureCodecs = new FixedLenMeasureCodec[nColumns];
+ for (int i = 0; i < isMetric.length; i++) {
+ if (isMetric[i]) {
+ measureCodecs[i] = FixedLenMeasureCodec.get(DataType.getInstance(metricDataTypes[i]));
+ }
+ }
+ }
private TableRecordInfoDigest() {
}
@@ -120,7 +127,7 @@ public class TableRecordInfoDigest {
@SuppressWarnings("unchecked")
public FixedLenMeasureCodec<LongWritable> codec(int col) {
// yes, all metrics are long currently
- return (FixedLenMeasureCodec<LongWritable>) FixedLenMeasureCodec.get(DataType.getInstance(metricDataTypes[col]));
+ return measureCodecs[col];
}
public static byte[] serialize(TableRecordInfoDigest o) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/26953451/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
index 31631cb..805b490 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointTupleIterator.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
import org.apache.kylin.cube.kv.RowKeyColumnIO;
+import org.apache.kylin.metadata.measure.fixedlen.FixedPointLongCodec;
import org.apache.kylin.storage.StorageContext;
import org.apache.kylin.storage.hbase.coprocessor.CoprocessorProjector;
import org.apache.kylin.storage.hbase.coprocessor.CoprocessorRowType;
@@ -333,7 +334,13 @@ public class EndpointTupleIterator implements ITupleIterator {
if (!tuple.hasColumn(column)) {
continue;
}
- tuple.setDimensionValue(columnNames.get(i), columnValues.get(i));
+ final String columnName = columnNames.get(i);
+ if (tableRecordInfo.getDigest().isMetrics(i)) {
+ logger.info("column name:" + columnName + " column value:" + tableRecord.getValueString(i));
+ tuple.setMeasureValue(columnName, tableRecord.getValueString(i));
+ } else {
+ tuple.setDimensionValue(columnName, columnValues.get(i));
+ }
}
if (measureValues != null) {