http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHFileMapper.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHFileMapper.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHFileMapper.java index 0e0a8ce..545d058 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHFileMapper.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHFileMapper.java @@ -63,10 +63,9 @@ public class IICreateHFileMapper extends KylinMapper<ImmutableBytesWritable, Imm timestamp, Type.Put, // buffer.array(), buffer.position() + valueLength, dictionaryLength); - // write dictionary context.write(key, kv); - + } }
http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java index 9c96f21..8099276 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java @@ -32,12 +32,12 @@ import org.apache.hadoop.hbase.security.User; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.BytesUtil; import org.apache.kylin.engine.mr.common.AbstractHadoopJob; -import org.apache.kylin.storage.hbase.util.IIDeployCoprocessorCLI; import org.apache.kylin.invertedindex.IIInstance; import org.apache.kylin.invertedindex.IIManager; import org.apache.kylin.invertedindex.model.IIDesc; import org.apache.kylin.invertedindex.model.IIKeyValueCodec; import org.apache.kylin.metadata.realization.IRealizationConstants; +import org.apache.kylin.storage.hbase.util.IIDeployCoprocessorCLI; /** * @author George Song (ysong1) @@ -61,7 +61,6 @@ public class IICreateHTableJob extends AbstractHadoopJob { IIInstance ii = iiManager.getII(iiName); int sharding = ii.getDescriptor().getSharding(); - Configuration conf = HBaseConfiguration.create(getConf()); // check if the table already exists admin = new HBaseAdmin(conf); @@ -74,7 +73,7 @@ public class IICreateHTableJob extends AbstractHadoopJob { return 1; } } - + // table doesn't exist, need to create HTableDescriptor tableDesc = new HTableDescriptor(TableName.valueOf(tableName)); @@ -123,7 +122,6 @@ public class IICreateHTableJob extends AbstractHadoopJob { IIDeployCoprocessorCLI.deployCoprocessor(tableDesc); - // create table byte[][] splitKeys = getSplits(sharding); if (splitKeys.length == 0) http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregationCache.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregationCache.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregationCache.java index 5b82aa4..affb284 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregationCache.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregationCache.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Set; import org.apache.kylin.measure.MeasureAggregator; -import org.apache.kylin.storage.hbase.common.coprocessor.AggregationCache; import org.apache.kylin.storage.hbase.common.coprocessor.AggrKey; +import org.apache.kylin.storage.hbase.common.coprocessor.AggregationCache; /** */ http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregators.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregators.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregators.java index fa7d81e..e481272 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregators.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointAggregators.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import java.util.List; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.kylin.measure.hllc.HyperLogLogPlusCounter; import org.apache.kylin.common.util.BytesSerializer; import org.apache.kylin.common.util.BytesUtil; import org.apache.kylin.invertedindex.index.RawTableRecord; @@ -31,6 +30,7 @@ import org.apache.kylin.invertedindex.index.TableRecordInfoDigest; import org.apache.kylin.invertedindex.measure.FixedLenMeasureCodec; import org.apache.kylin.measure.MeasureAggregator; import org.apache.kylin.measure.hllc.HLLCMeasureType; +import org.apache.kylin.measure.hllc.HyperLogLogPlusCounter; import org.apache.kylin.metadata.datatype.DataType; import org.apache.kylin.metadata.datatype.LongMutable; import org.apache.kylin.metadata.model.FunctionDesc; http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointTupleIterator.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointTupleIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointTupleIterator.java index 4ec421b..e197e3e 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointTupleIterator.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/EndpointTupleIterator.java @@ -169,11 +169,11 @@ public class EndpointTupleIterator implements ITupleIterator { public Long apply(IIProtos.IIResponseInternal input) { IIProtos.IIResponseInternal.Stats status = input.getStats(); - logger.info("Endpoints all returned, stats from shard {}: start moment:{}, finish moment: {}, elapsed ms: {}, scanned slices: {}, latest slice time is {}",// - new Object[] { String.valueOf(status.getMyShard()),// - DateFormat.formatToTimeStr(status.getServiceStartTime()),// - DateFormat.formatToTimeStr(status.getServiceEndTime()),// - String.valueOf(status.getServiceEndTime() - status.getServiceStartTime()),// + logger.info("Endpoints all returned, stats from shard {}: start moment:{}, finish moment: {}, elapsed ms: {}, scanned slices: {}, latest slice time is {}", // + new Object[] { String.valueOf(status.getMyShard()), // + DateFormat.formatToTimeStr(status.getServiceStartTime()), // + DateFormat.formatToTimeStr(status.getServiceEndTime()), // + String.valueOf(status.getServiceEndTime() - status.getServiceStartTime()), // String.valueOf(status.getScannedSlices()), DateFormat.formatToTimeStr(status.getLatestDataTime()) }); return status.getLatestDataTime(); http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/IIEndpoint.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/IIEndpoint.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/IIEndpoint.java index 4a40240..ef7de3a 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/IIEndpoint.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/IIEndpoint.java @@ -18,8 +18,6 @@ package org.apache.kylin.storage.hbase.ii.coprocessor.endpoint; -import it.uniroma3.mat.extendedset.intset.ConciseSet; - import java.io.IOException; import java.util.Arrays; import java.util.Iterator; @@ -69,6 +67,8 @@ import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; import com.google.protobuf.Service; +import it.uniroma3.mat.extendedset.intset.ConciseSet; + /** */ public class IIEndpoint extends IIProtos.RowsService implements Coprocessor, CoprocessorService { http://git-wip-us.apache.org/repos/asf/kylin/blob/5d4982e2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/LocalDictionary.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/LocalDictionary.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/LocalDictionary.java index 26a4917..6bf261f 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/LocalDictionary.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/LocalDictionary.java @@ -63,7 +63,7 @@ public class LocalDictionary implements IDimensionEncodingMap { } return result; } - + @SuppressWarnings("unchecked") @Override public Dictionary<String> getDictionary(TblColRef col) {