You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/08/13 16:24:14 UTC
[05/17] incubator-kylin git commit: reformat code
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/spark/src/test/java/org/apache/kylin/engine/spark/SparkCubingJobBuilder.java
----------------------------------------------------------------------
diff --git a/spark/src/test/java/org/apache/kylin/engine/spark/SparkCubingJobBuilder.java b/spark/src/test/java/org/apache/kylin/engine/spark/SparkCubingJobBuilder.java
index 2f897f9..d0f8d2c 100644
--- a/spark/src/test/java/org/apache/kylin/engine/spark/SparkCubingJobBuilder.java
+++ b/spark/src/test/java/org/apache/kylin/engine/spark/SparkCubingJobBuilder.java
@@ -1,8 +1,11 @@
package org.apache.kylin.engine.spark;
import org.apache.kylin.cube.CubeSegment;
-import org.apache.kylin.cube.model.CubeJoinedFlatTableDesc;
-import org.apache.kylin.engine.mr.*;
+import org.apache.kylin.engine.mr.CubingJob;
+import org.apache.kylin.engine.mr.IMRInput;
+import org.apache.kylin.engine.mr.IMROutput2;
+import org.apache.kylin.engine.mr.JobBuilderSupport;
+import org.apache.kylin.engine.mr.MRUtil;
import org.apache.kylin.job.execution.DefaultChainedExecutable;
import org.apache.kylin.job.spark.SparkCubing;
import org.apache.kylin.job.spark.SparkExecutable;
@@ -13,7 +16,7 @@ public class SparkCubingJobBuilder extends JobBuilderSupport {
private final IMRInput.IMRBatchCubingInputSide inputSide;
private final IMROutput2.IMRBatchCubingOutputSide2 outputSide;
-
+
public SparkCubingJobBuilder(CubeSegment seg, String submitter) {
super(seg, submitter);
this.inputSide = MRUtil.getBatchCubingInputSide(seg);
@@ -23,13 +26,13 @@ public class SparkCubingJobBuilder extends JobBuilderSupport {
public DefaultChainedExecutable build() {
final CubingJob result = CubingJob.createBuildJob(seg, submitter, config);
final String jobId = result.getId();
-
-// inputSide.addStepPhase1_CreateFlatTable(result);
-// final CubeJoinedFlatTableDesc joinedFlatTableDesc = new CubeJoinedFlatTableDesc(seg.getCubeDesc(), seg);
-// final String tableName = joinedFlatTableDesc.getTableName();
-// logger.info("intermediate table:" + tableName);
- final String tableName = "kylin_intermediate_test_kylin_cube_with_slr_left_join_desc_19700101000000_20501112000000";
+ // inputSide.addStepPhase1_CreateFlatTable(result);
+ // final CubeJoinedFlatTableDesc joinedFlatTableDesc = new CubeJoinedFlatTableDesc(seg.getCubeDesc(), seg);
+ // final String tableName = joinedFlatTableDesc.getTableName();
+ // logger.info("intermediate table:" + tableName);
+
+ final String tableName = "kylin_intermediate_test_kylin_cube_with_slr_left_join_desc_19700101000000_20501112000000";
final SparkExecutable sparkExecutable = new SparkExecutable();
sparkExecutable.setClassName(SparkCubing.class.getName());
sparkExecutable.setParam("hiveTable", tableName);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/spark/src/test/java/org/apache/kylin/job/spark/BuildCubeWithSparkTest.java
----------------------------------------------------------------------
diff --git a/spark/src/test/java/org/apache/kylin/job/spark/BuildCubeWithSparkTest.java b/spark/src/test/java/org/apache/kylin/job/spark/BuildCubeWithSparkTest.java
index 9092756..99745fa 100644
--- a/spark/src/test/java/org/apache/kylin/job/spark/BuildCubeWithSparkTest.java
+++ b/spark/src/test/java/org/apache/kylin/job/spark/BuildCubeWithSparkTest.java
@@ -18,7 +18,13 @@
package org.apache.kylin.job.spark;
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.TimeZone;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.kylin.common.KylinConfig;
@@ -44,13 +50,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.TimeZone;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.google.common.collect.Lists;
public class BuildCubeWithSparkTest {
@@ -88,7 +88,7 @@ public class BuildCubeWithSparkTest {
HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA);
DeployUtil.initCliWorkDir();
-// DeployUtil.deployMetadata();
+ // DeployUtil.deployMetadata();
DeployUtil.overrideJobJarLocations();
final KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
@@ -114,22 +114,22 @@ public class BuildCubeWithSparkTest {
@Test
public void test() throws Exception {
-// DeployUtil.prepareTestDataForNormalCubes("test_kylin_cube_with_slr_left_join_empty");
-// KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
-// assertTrue(new File(kylinConfig.getKylinSparkJobJarPath()).exists());
-// assertTrue(new File(kylinConfig.getSparkHome()).exists());
-// final SparkExecutable sparkExecutable = new SparkExecutable();
-// sparkExecutable.setClassName(SparkCountDemo.class.getName());
-// jobService.addJob(sparkExecutable);
-// waitForJob(sparkExecutable.getId());
-// assertEquals(ExecutableState.SUCCEED, jobService.getOutput(sparkExecutable.getId()).getState());
+ // DeployUtil.prepareTestDataForNormalCubes("test_kylin_cube_with_slr_left_join_empty");
+ // KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
+ // assertTrue(new File(kylinConfig.getKylinSparkJobJarPath()).exists());
+ // assertTrue(new File(kylinConfig.getSparkHome()).exists());
+ // final SparkExecutable sparkExecutable = new SparkExecutable();
+ // sparkExecutable.setClassName(SparkCountDemo.class.getName());
+ // jobService.addJob(sparkExecutable);
+ // waitForJob(sparkExecutable.getId());
+ // assertEquals(ExecutableState.SUCCEED, jobService.getOutput(sparkExecutable.getId()).getState());
final CubeSegment segment = createSegment();
System.out.println(segment.getName());
final DefaultChainedExecutable cubingJob = new SparkBatchCubingEngine().createBatchCubingJob(segment, "BuildCubeWithSpark");
jobService.addJob(cubingJob);
waitForJob(cubingJob.getId());
assertEquals(ExecutableState.SUCCEED, jobService.getOutput(cubingJob.getId()).getState());
-
+
}
private void clearSegment(String cubeName) throws Exception {
@@ -140,7 +140,6 @@ public class BuildCubeWithSparkTest {
cubeManager.updateCube(cubeBuilder);
}
-
private CubeSegment createSegment() throws Exception {
String cubeName = "test_kylin_cube_with_slr_left_join_empty";
clearSegment(cubeName);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseCuboidWriter.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseCuboidWriter.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseCuboidWriter.java
index 81ab084..b25cdaa 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseCuboidWriter.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseCuboidWriter.java
@@ -33,7 +33,11 @@
*/
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.List;
+
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Put;
@@ -51,10 +55,7 @@ import org.apache.kylin.storage.hbase.steps.InMemKeyValueCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-import java.util.List;
+import com.google.common.collect.Lists;
/**
*/
@@ -95,7 +96,7 @@ public final class HBaseCuboidWriter implements ICuboidWriter {
private ByteBuffer createKey(Long cuboidId, GTRecord record) {
byteBuffer.clear();
byteBuffer.put(Bytes.toBytes(cuboidId));
- final int cardinality = BitSet.valueOf(new long[]{cuboidId}).cardinality();
+ final int cardinality = BitSet.valueOf(new long[] { cuboidId }).cardinality();
for (int i = 0; i < cardinality; i++) {
final ByteArray byteArray = record.get(i);
byteBuffer.put(byteArray.array(), byteArray.offset(), byteArray.length());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseMROutput2.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseMROutput2.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseMROutput2.java
index 4f8c0e9..55a2507 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseMROutput2.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseMROutput2.java
@@ -163,7 +163,7 @@ public class HBaseMROutput2 implements IMROutput2 {
public void configureInput(Class<? extends Mapper> mapper, Class<? extends WritableComparable> outputKeyClass, Class<? extends Writable> outputValueClass, Job job) throws IOException {
Configuration conf = job.getConfiguration();
HBaseConfiguration.merge(conf, HBaseConfiguration.create(conf));
-
+
List<Scan> scans = new ArrayList<Scan>();
for (String htable : htables) {
Scan scan = new Scan();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
index 1df9c30..59f9e84 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
@@ -18,14 +18,28 @@
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Lists;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.HConnection;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.RawResource;
@@ -36,8 +50,7 @@ import org.apache.kylin.engine.mr.HadoopUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
-import java.util.*;
+import com.google.common.collect.Lists;
public class HBaseResourceStore extends ResourceStore {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
index b028391..5059a37 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
@@ -73,7 +73,7 @@ public class BulkLoadJob extends AbstractHadoopJob {
Path columnFamilyPath = new Path(input + cfName);
// File may have already been auto-loaded (in the case of MapR DB)
- if(fs.exists(columnFamilyPath)) {
+ if (fs.exists(columnFamilyPath)) {
fs.setPermission(columnFamilyPath, permission);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java
index baa3efe..f082128 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java
@@ -164,9 +164,8 @@ public class CreateHTableJob extends AbstractHadoopJob {
return retValue.length == 0 ? null : retValue;
}
-
@SuppressWarnings("deprecation")
- public static byte[][] getSplitsFromCuboidStatistics(Configuration conf, KylinConfig kylinConfig, List<Integer> rowkeyColumnSize, CubeSegment cubeSegment) throws IOException {
+ public static byte[][] getSplitsFromCuboidStatistics(Configuration conf, KylinConfig kylinConfig, List<Integer> rowkeyColumnSize, CubeSegment cubeSegment) throws IOException {
CubeDesc cubeDesc = cubeSegment.getCubeDesc();
DataModelDesc.RealizationCapacity cubeCapacity = cubeDesc.getModel().getCapacity();
@@ -241,7 +240,6 @@ public class CreateHTableJob extends AbstractHadoopJob {
List<Long> regionSplit = Lists.newArrayList();
-
long size = 0;
int regionIndex = 0;
int cuboidCount = 0;
@@ -259,7 +257,6 @@ public class CreateHTableJob extends AbstractHadoopJob {
cuboidCount++;
}
-
byte[][] result = new byte[regionSplit.size()][];
for (int i = 0; i < regionSplit.size(); i++) {
result[i] = Bytes.toBytes(regionSplit.get(i));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
index e42f709..64374e6 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
@@ -15,14 +15,14 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
public class HBaseMRSteps extends JobBuilderSupport {
-
+
public HBaseMRSteps(CubeSegment seg) {
super(seg, null);
}
public void addSaveCuboidToHTableSteps(DefaultChainedExecutable jobFlow, String cuboidRootPath) {
String jobId = jobFlow.getId();
-
+
// calculate key distribution
jobFlow.addTask(createRangeRowkeyDistributionStep(cuboidRootPath + "*", jobId));
// create htable step
@@ -52,11 +52,11 @@ public class HBaseMRSteps extends JobBuilderSupport {
public HadoopShellExecutable createCreateHTableStep(String jobId) {
return createCreateHTableStep(jobId, false);
}
-
+
public HadoopShellExecutable createCreateHTableStepWithStats(String jobId) {
return createCreateHTableStep(jobId, true);
}
-
+
private HadoopShellExecutable createCreateHTableStep(String jobId, boolean withStats) {
HadoopShellExecutable createHtableStep = new HadoopShellExecutable();
createHtableStep.setName(ExecutableConstants.STEP_NAME_CREATE_HBASE_TABLE);
@@ -106,7 +106,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
return bulkLoadStep;
}
-
+
public MergeGCStep createMergeGCStep() {
MergeGCStep result = new MergeGCStep();
result.setName(ExecutableConstants.STEP_NAME_GARBAGE_COLLECTION);
@@ -123,7 +123,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
}
return mergingHTables;
}
-
+
public String getHFilePath(String jobId) {
return getJobWorkingDir(jobId) + "/" + seg.getCubeInstance().getName() + "/hfile/";
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/InMemKeyValueCreator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/InMemKeyValueCreator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/InMemKeyValueCreator.java
index b2d691e..d96dfcc 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/InMemKeyValueCreator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/InMemKeyValueCreator.java
@@ -18,7 +18,6 @@ public class InMemKeyValueCreator {
byte[] qBytes;
long timestamp;
-
MeasureCodec codec;
Object[] colValues;
ByteBuffer valueBuf = ByteBuffer.allocate(RowConstants.ROWVALUE_BUFFER_SIZE);
@@ -57,7 +56,6 @@ public class InMemKeyValueCreator {
return create(keyBytes, keyOffset, keyLength, valueBuf.array(), 0, valueBuf.position());
}
-
public KeyValue create(byte[] keyBytes, int keyOffset, int keyLength, byte[] value, int voffset, int vlen) {
return new KeyValue(keyBytes, keyOffset, keyLength, //
cfBytes, 0, cfBytes.length, //
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
index 3e49e27..a24fe39 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
@@ -1,18 +1,18 @@
package org.apache.kylin.storage.hbase.steps;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.kylin.common.util.Bytes;
import org.apache.hadoop.io.Text;
+import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.cube.kv.RowConstants;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.HBaseColumnDesc;
import org.apache.kylin.metadata.measure.MeasureCodec;
import org.apache.kylin.metadata.model.MeasureDesc;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-
/**
* @author George Song (ysong1)
*/
@@ -72,7 +72,6 @@ public class KeyValueCreator {
return create(keyBytes, keyOffset, keyLength, valueBuf.array(), 0, valueBuf.position());
}
-
public KeyValue create(byte[] keyBytes, int keyOffset, int keyLength, byte[] value, int voffset, int vlen) {
return new KeyValue(keyBytes, keyOffset, keyLength, //
cfBytes, 0, cfBytes.length, //
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/RowValueDecoder.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/RowValueDecoder.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/RowValueDecoder.java
index 877b71b..9fd4e22 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/RowValueDecoder.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/RowValueDecoder.java
@@ -18,6 +18,10 @@
package org.apache.kylin.storage.hbase.steps;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.Collection;
+
import org.apache.hadoop.hbase.client.Result;
import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.cube.model.HBaseColumnDesc;
@@ -27,10 +31,6 @@ import org.apache.kylin.metadata.measure.MeasureCodec;
import org.apache.kylin.metadata.model.FunctionDesc;
import org.apache.kylin.metadata.model.MeasureDesc;
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-import java.util.Collection;
-
/**
*/
public class RowValueDecoder implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/LZOSupportnessChecker.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/LZOSupportnessChecker.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/LZOSupportnessChecker.java
index 593dc52..16e9ea5 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/LZOSupportnessChecker.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/LZOSupportnessChecker.java
@@ -18,12 +18,12 @@
package org.apache.kylin.storage.hbase.util;
+import java.io.File;
+
import org.apache.hadoop.hbase.util.CompressionTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
/**
*/
public class LZOSupportnessChecker {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/CreateHTableTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/CreateHTableTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/CreateHTableTest.java
index 8b09f05..073df50 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/CreateHTableTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/CreateHTableTest.java
@@ -18,15 +18,16 @@
package org.apache.kylin.storage.hbase;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.apache.kylin.storage.hbase.steps.CreateHTableJob;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
-import org.apache.kylin.storage.hbase.steps.CreateHTableJob;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMetadataTestCase.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMetadataTestCase.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMetadataTestCase.java
index 7226793..f07010e 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMetadataTestCase.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMetadataTestCase.java
@@ -74,7 +74,7 @@ public class HBaseMetadataTestCase extends AbstractKylinTestCase {
if (StringUtils.isEmpty(useSandbox)) {
return true;
}
-
+
return Boolean.parseBoolean(useSandbox);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMiniclusterHelper.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMiniclusterHelper.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMiniclusterHelper.java
index 1402530..50d20aa 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMiniclusterHelper.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HBaseMiniclusterHelper.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.storage.hbase.HBaseResourceStore;
/**
* a helper class to start and shutdown hbase mini cluster
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HbaseImporter.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HbaseImporter.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HbaseImporter.java
index 00285ab..78a4b6e 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HbaseImporter.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/HbaseImporter.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.mapreduce.Import;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.storage.hbase.HBaseConnection;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
index 2560bc2..d734473 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
@@ -18,6 +18,16 @@
package org.apache.kylin.storage.hbase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -28,18 +38,10 @@ import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.RootPersistentEntity;
import org.apache.kylin.common.persistence.Serializer;
import org.apache.kylin.engine.mr.HadoopUtil;
-import org.apache.kylin.storage.hbase.HBaseResourceStore;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import static org.junit.Assert.*;
-
public class ITHBaseResourceStoreTest extends HBaseMetadataTestCase {
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHdfsOpsTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHdfsOpsTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHdfsOpsTest.java
index 5381187..bfeb783 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHdfsOpsTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/ITHdfsOpsTest.java
@@ -18,6 +18,8 @@
package org.apache.kylin.storage.hbase;
+import java.io.IOException;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -27,8 +29,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-
/**
*/
public class ITHdfsOpsTest extends HBaseMetadataTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/RowValueDecoderTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/RowValueDecoderTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/RowValueDecoderTest.java
index 1f45059..0fbdb34 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/RowValueDecoderTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/RowValueDecoderTest.java
@@ -65,7 +65,7 @@ public class RowValueDecoderTest extends LocalFileMetadataTestCase {
LongMutable count = new LongMutable(2);
LongMutable item_count = new LongMutable(100);
ByteBuffer buf = ByteBuffer.allocate(RowConstants.ROWVALUE_BUFFER_SIZE);
- codec.encode(new Object[] { sum, min, max, count ,item_count}, buf);
+ codec.encode(new Object[] { sum, min, max, count, item_count }, buf);
buf.flip();
byte[] valueBytes = new byte[buf.limit()];
@@ -96,7 +96,7 @@ public class RowValueDecoderTest extends LocalFileMetadataTestCase {
LongWritable count = new LongWritable(2);
LongMutable item_count = new LongMutable(100);
ByteBuffer buf = ByteBuffer.allocate(RowConstants.ROWVALUE_BUFFER_SIZE);
- codec.encode(new Object[] { sum, min, max, count ,item_count}, buf);
+ codec.encode(new Object[] { sum, min, max, count, item_count }, buf);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/SandboxMetastoreCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/SandboxMetastoreCLI.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/SandboxMetastoreCLI.java
index aee065c..fab9c7b 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/SandboxMetastoreCLI.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/SandboxMetastoreCLI.java
@@ -16,17 +16,16 @@
* limitations under the License.
*/
-
package org.apache.kylin.storage.hbase;
+import java.io.File;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.ResourceTool;
import org.apache.kylin.common.util.ClassUtil;
-import java.io.File;
-
/**
* This is a helper class for developer to directly manipulate the metadata store in sandbox
* This is designed to run in IDE(i.e. not on sandbox hadoop CLI)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapper2Test.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapper2Test.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapper2Test.java
index 733de1d..81fa3a6 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapper2Test.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapper2Test.java
@@ -18,7 +18,7 @@
package org.apache.kylin.storage.hbase.steps;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapperTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapperTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapperTest.java
index 0c148e7..f8282d3 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapperTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/CubeHFileMapperTest.java
@@ -18,7 +18,7 @@
package org.apache.kylin.storage.hbase.steps;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.List;
@@ -28,11 +28,10 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mrunit.mapreduce.MapDriver;
import org.apache.hadoop.mrunit.types.Pair;
+import org.apache.kylin.engine.mr.common.BatchConstants;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.apache.kylin.engine.mr.common.BatchConstants;
-import org.apache.kylin.storage.hbase.steps.CubeHFileMapper;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionJobTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionJobTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionJobTest.java
index 8fb3f9c..793834a 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionJobTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionJobTest.java
@@ -18,18 +18,18 @@
package org.apache.kylin.storage.hbase.steps;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.apache.kylin.engine.mr.steps.RangeKeyDistributionJob;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
-import org.apache.kylin.engine.mr.steps.RangeKeyDistributionJob;
/**
* @author ysong1
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionMapperTest.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionMapperTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionMapperTest.java
index 97fe4ac..ca716c3 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionMapperTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/RangeKeyDistributionMapperTest.java
@@ -18,7 +18,8 @@
package org.apache.kylin.storage.hbase.steps;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/StorageFactory.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/StorageFactory.java b/storage/src/main/java/org/apache/kylin/storage/StorageFactory.java
index f3dd900..c05aa9b 100644
--- a/storage/src/main/java/org/apache/kylin/storage/StorageFactory.java
+++ b/storage/src/main/java/org/apache/kylin/storage/StorageFactory.java
@@ -40,7 +40,7 @@ import com.google.common.base.Preconditions;
* @author xjiang
*/
public class StorageFactory {
-
+
private static boolean allowStorageLayerCache = true;
public static IStorageQuery createQuery(IRealization realization) {
@@ -81,5 +81,5 @@ public class StorageFactory {
Preconditions.checkArgument(partitionColRef != null, "getPartitionDateColumnRef for " + realization + " is null");
return partitionColRef;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedDynamicStorageEngine.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedDynamicStorageEngine.java b/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedDynamicStorageEngine.java
index 86e2e88..b0cc733 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedDynamicStorageEngine.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedDynamicStorageEngine.java
@@ -1,17 +1,20 @@
package org.apache.kylin.storage.cache;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
+import java.util.List;
+
import net.sf.ehcache.Cache;
import net.sf.ehcache.Element;
+
import org.apache.kylin.common.util.RangeUtil;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.metadata.realization.SQLDigest;
import org.apache.kylin.metadata.realization.SQLDigestUtil;
import org.apache.kylin.metadata.realization.StreamSQLDigest;
-import org.apache.kylin.metadata.tuple.*;
+import org.apache.kylin.metadata.tuple.CompoundTupleIterator;
+import org.apache.kylin.metadata.tuple.ITuple;
+import org.apache.kylin.metadata.tuple.ITupleIterator;
+import org.apache.kylin.metadata.tuple.SimpleTupleIterator;
+import org.apache.kylin.metadata.tuple.TeeTupleIterator;
import org.apache.kylin.storage.ICachableStorageQuery;
import org.apache.kylin.storage.StorageContext;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.TsConditionExtractor;
@@ -19,7 +22,10 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Range;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedStaticStorageEngine.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedStaticStorageEngine.java b/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedStaticStorageEngine.java
index 1e95722..9e2287f 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedStaticStorageEngine.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cache/CacheFledgedStaticStorageEngine.java
@@ -1,8 +1,10 @@
package org.apache.kylin.storage.cache;
-import com.google.common.collect.Ranges;
+import java.util.List;
+
import net.sf.ehcache.Cache;
import net.sf.ehcache.Element;
+
import org.apache.kylin.metadata.realization.SQLDigest;
import org.apache.kylin.metadata.realization.StreamSQLDigest;
import org.apache.kylin.metadata.tuple.ITuple;
@@ -15,7 +17,7 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.collect.Ranges;
public class CacheFledgedStaticStorageEngine extends AbstractCacheFledgedStorageEngine {
private static final Logger logger = LoggerFactory.getLogger(CacheFledgedStaticStorageEngine.class);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java b/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
index 57dbd67..1ad7229 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
@@ -1,19 +1,21 @@
package org.apache.kylin.storage.cache;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Range;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NavigableMap;
+
+import javax.annotation.Nullable;
+
import org.apache.kylin.common.util.RangeUtil;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.metadata.tuple.ITuple;
import org.apache.kylin.storage.tuple.Tuple;
-import javax.annotation.Nullable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NavigableMap;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Range;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CellListIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CellListIterator.java b/storage/src/main/java/org/apache/kylin/storage/cube/CellListIterator.java
index d2c4191..7e48444 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CellListIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CellListIterator.java
@@ -24,5 +24,5 @@ import java.util.List;
import org.apache.hadoop.hbase.Cell;
-public interface CellListIterator extends Iterator<List<Cell>>, Closeable{
+public interface CellListIterator extends Iterator<List<Cell>>, Closeable {
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseEndpointRPC.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseEndpointRPC.java b/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseEndpointRPC.java
index 4c24d76..2057e0b 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseEndpointRPC.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseEndpointRPC.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
import org.apache.kylin.common.util.CompressionUtils;
import org.apache.kylin.common.util.ImmutableBitSet;
-import org.apache.kylin.storage.util.KryoUtils;
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.cuboid.Cuboid;
@@ -48,6 +47,7 @@ import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitPr
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos.CubeVisitRequest.Builder;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos.CubeVisitResponse;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos.CubeVisitService;
+import org.apache.kylin.storage.util.KryoUtils;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseRPC.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseRPC.java b/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseRPC.java
index d3c7b0c..d196d63 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseRPC.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CubeHBaseRPC.java
@@ -39,7 +39,7 @@ public abstract class CubeHBaseRPC {
final protected Cuboid cuboid;
final protected GTInfo fullGTInfo;
- public CubeHBaseRPC(CubeSegment cubeSeg, Cuboid cuboid,GTInfo fullGTInfo) {
+ public CubeHBaseRPC(CubeSegment cubeSeg, Cuboid cuboid, GTInfo fullGTInfo) {
this.cubeSeg = cubeSeg;
this.cuboid = cuboid;
this.fullGTInfo = fullGTInfo;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CubeScanner.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CubeScanner.java b/storage/src/main/java/org/apache/kylin/storage/cube/CubeScanner.java
index 2411a6c..71dea62 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CubeScanner.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CubeScanner.java
@@ -11,7 +11,6 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.kylin.common.util.ImmutableBitSet;
-import org.apache.kylin.storage.util.KryoUtils;
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.gridtable.CubeGridTable;
@@ -28,6 +27,7 @@ import org.apache.kylin.gridtable.IGTScanner;
import org.apache.kylin.metadata.filter.TupleFilter;
import org.apache.kylin.metadata.model.FunctionDesc;
import org.apache.kylin.metadata.model.TblColRef;
+import org.apache.kylin.storage.util.KryoUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -69,7 +69,7 @@ public class CubeScanner implements IGTScanner {
trimmedInfoBytes = KryoUtils.serialize(info);
info.setIGTCodeSystem(origin);
GTInfo trimmedInfo = KryoUtils.deserialize(this.trimmedInfoBytes, GTInfo.class);
-
+
for (GTScanRange range : scanRanges) {
scanRequests.add(new GTScanRequest(trimmedInfo, range, gtDimensions, gtAggrGroups, gtAggrMetrics, gtAggrFuncs, gtFilter, allowPreAggregate));
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CubeStorageQuery.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CubeStorageQuery.java b/storage/src/main/java/org/apache/kylin/storage/cube/CubeStorageQuery.java
index e9225f9..7427fc5 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CubeStorageQuery.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CubeStorageQuery.java
@@ -1,8 +1,11 @@
package org.apache.kylin.storage.cube;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
-import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
@@ -29,7 +32,9 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Range;
+import com.google.common.collect.Sets;
public class CubeStorageQuery implements ICachableStorageQuery {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/CubeTupleConverter.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/CubeTupleConverter.java b/storage/src/main/java/org/apache/kylin/storage/cube/CubeTupleConverter.java
index aefff7a..993efbf 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/CubeTupleConverter.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/CubeTupleConverter.java
@@ -18,7 +18,11 @@
package org.apache.kylin.storage.cube;
-import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
import org.apache.kylin.common.util.Array;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.cube.CubeSegment;
@@ -32,10 +36,7 @@ import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.storage.tuple.Tuple;
import org.apache.kylin.storage.tuple.TupleInfo;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import com.google.common.collect.Lists;
/**
* convert GTRecord to tuple
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/SequentialCubeTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/SequentialCubeTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/cube/SequentialCubeTupleIterator.java
index 366e3c3..a55f1d0 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/SequentialCubeTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/SequentialCubeTupleIterator.java
@@ -27,7 +27,7 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
private final TupleInfo tupleInfo;
private final Tuple tuple;
private final Iterator<CubeScanner> scannerIterator;
-
+
private CubeScanner curScanner;
private Iterator<GTRecord> curRecordIterator;
private CubeTupleConverter curTupleConverter;
@@ -47,7 +47,7 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
public boolean hasNext() {
if (next != null)
return true;
-
+
if (curScanner == null) {
if (scannerIterator.hasNext()) {
curScanner = scannerIterator.next();
@@ -57,7 +57,7 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
return false;
}
}
-
+
if (curRecordIterator.hasNext()) {
curTupleConverter.translateResult(curRecordIterator.next(), tuple);
next = tuple;
@@ -94,12 +94,12 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
public void close() {
if (curScanner != null)
close(curScanner);
-
+
while (scannerIterator.hasNext()) {
close(scannerIterator.next());
}
}
-
+
private void close(CubeScanner scanner) {
try {
scanner.close();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/cube/SerializedCubeTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cube/SerializedCubeTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/cube/SerializedCubeTupleIterator.java
index 7b9286c..e0605b4 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cube/SerializedCubeTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cube/SerializedCubeTupleIterator.java
@@ -1,10 +1,10 @@
package org.apache.kylin.storage.cube;
+import java.util.List;
+
import org.apache.kylin.metadata.tuple.ITuple;
import org.apache.kylin.metadata.tuple.ITupleIterator;
-import java.util.List;
-
public class SerializedCubeTupleIterator implements ITupleIterator {
public SerializedCubeTupleIterator(List<CubeScanner> scanners) {
@@ -34,5 +34,4 @@ public class SerializedCubeTupleIterator implements ITupleIterator {
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/CubeSegmentTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeSegmentTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeSegmentTupleIterator.java
index 1a804cd..987ebb9 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeSegmentTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeSegmentTupleIterator.java
@@ -18,9 +18,18 @@
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Lists;
-
-import org.apache.hadoop.hbase.client.*;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.apache.hadoop.hbase.client.HConnection;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.metrics.ScanMetrics;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
@@ -42,8 +51,7 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.text.MessageFormat;
-import java.util.*;
+import com.google.common.collect.Lists;
/**
* @author xjiang
@@ -100,7 +108,6 @@ public class CubeSegmentTupleIterator implements ITupleIterator {
}
}
-
@Override
public boolean hasNext() {
if (next != null)
@@ -222,7 +229,7 @@ public class CubeSegmentTupleIterator implements ITupleIterator {
private List<org.apache.hadoop.hbase.util.Pair<byte[], byte[]>> convertToHBasePair(List<org.apache.kylin.common.util.Pair<byte[], byte[]>> pairList) {
List<org.apache.hadoop.hbase.util.Pair<byte[], byte[]>> result = Lists.newArrayList();
- for(org.apache.kylin.common.util.Pair pair : pairList) {
+ for (org.apache.kylin.common.util.Pair pair : pairList) {
org.apache.hadoop.hbase.util.Pair element = new org.apache.hadoop.hbase.util.Pair(pair.getFirst(), pair.getSecond());
result.add(element);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageQuery.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageQuery.java b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageQuery.java
index 459e72d..35e4839 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageQuery.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageQuery.java
@@ -18,10 +18,17 @@
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Range;
-import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.kylin.common.util.Bytes;
@@ -55,7 +62,10 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Range;
+import com.google.common.collect.Sets;
/**
* @author xjiang, yangli9
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/CubeTupleConverter.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeTupleConverter.java b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeTupleConverter.java
index 08c3784..64d1951 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/CubeTupleConverter.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/CubeTupleConverter.java
@@ -135,12 +135,12 @@ public class CubeTupleConverter {
private IDerivedColumnFiller newDerivedColumnFiller(TblColRef[] hostCols, final DeriveInfo deriveInfo) {
List<TblColRef> rowColumns = cuboid.getColumns();
-
+
final int[] hostColIdx = new int[hostCols.length];
for (int i = 0; i < hostCols.length; i++) {
hostColIdx[i] = rowColumns.indexOf(hostCols[i]);
}
-
+
boolean needCopyDerived = false;
final int[] derivedTupleIdx = new int[deriveInfo.columns.length];
for (int i = 0; i < deriveInfo.columns.length; i++) {
@@ -148,10 +148,10 @@ public class CubeTupleConverter {
derivedTupleIdx[i] = tupleInfo.hasColumn(col) ? tupleInfo.getColumnIndex(col) : -1;
needCopyDerived = needCopyDerived || derivedTupleIdx[i] >= 0;
}
-
+
if (needCopyDerived == false)
return null;
-
+
switch (deriveInfo.type) {
case LOOKUP:
return new IDerivedColumnFiller() {
@@ -159,7 +159,7 @@ public class CubeTupleConverter {
LookupStringTable lookupTable = cubeMgr.getLookupTable(cubeSeg, deriveInfo.dimension);
int[] derivedColIdx = initDerivedColIdx();
Array<String> lookupKey = new Array<String>(new String[hostColIdx.length]);
-
+
private int[] initDerivedColIdx() {
int[] idx = new int[deriveInfo.columns.length];
for (int i = 0; i < idx.length; i++) {
@@ -167,7 +167,7 @@ public class CubeTupleConverter {
}
return idx;
}
-
+
@Override
public void fillDerivedColumns(List<String> rowValues, Tuple tuple) {
for (int i = 0; i < hostColIdx.length; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/DerivedFilterTranslator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/DerivedFilterTranslator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/DerivedFilterTranslator.java
index ed24958..98103bd 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/DerivedFilterTranslator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/DerivedFilterTranslator.java
@@ -21,8 +21,8 @@ package org.apache.kylin.storage.hbase;
import java.util.List;
import java.util.Set;
-import org.apache.kylin.common.util.Pair;
import org.apache.kylin.common.util.Array;
+import org.apache.kylin.common.util.Pair;
import org.apache.kylin.cube.kv.RowKeyColumnOrder;
import org.apache.kylin.cube.model.CubeDesc.DeriveInfo;
import org.apache.kylin.cube.model.CubeDesc.DeriveType;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/FuzzyValueCombination.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/FuzzyValueCombination.java b/storage/src/main/java/org/apache/kylin/storage/hbase/FuzzyValueCombination.java
index 3857573..3081e1f 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/FuzzyValueCombination.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/FuzzyValueCombination.java
@@ -28,10 +28,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.apache.kylin.metadata.model.TblColRef;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.kylin.metadata.model.TblColRef;
/**
* @author yangli9
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/HBaseKeyRange.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/HBaseKeyRange.java b/storage/src/main/java/org/apache/kylin/storage/hbase/HBaseKeyRange.java
index 51789ce..efd733c 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/HBaseKeyRange.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/HBaseKeyRange.java
@@ -18,8 +18,12 @@
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.kylin.common.debug.BackdoorToggles;
import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.common.util.BytesUtil;
@@ -36,7 +40,8 @@ import org.apache.kylin.metadata.model.TblColRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/InvertedIndexStorageQuery.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/InvertedIndexStorageQuery.java b/storage/src/main/java/org/apache/kylin/storage/hbase/InvertedIndexStorageQuery.java
index d203078..9aa2baa 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/InvertedIndexStorageQuery.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/InvertedIndexStorageQuery.java
@@ -18,7 +18,7 @@
package org.apache.kylin.storage.hbase;
-import com.google.common.collect.Range;
+import java.util.ArrayList;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.kylin.invertedindex.IIInstance;
@@ -32,7 +32,7 @@ import org.apache.kylin.storage.tuple.TupleInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
+import com.google.common.collect.Range;
/**
* @author yangli9
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/SerializedHBaseTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/SerializedHBaseTupleIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/SerializedHBaseTupleIterator.java
index 96e4df6..2eba0e3 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/SerializedHBaseTupleIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/SerializedHBaseTupleIterator.java
@@ -18,9 +18,12 @@
package org.apache.kylin.storage.hbase;
-import java.util.*;
-
-import com.google.common.collect.Range;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.kylin.cube.CubeInstance;
@@ -92,7 +95,7 @@ public class SerializedHBaseTupleIterator implements ITupleIterator {
public boolean hasNext() {
if (next != null)
return true;
-
+
// 1. check limit
if (context.isLimitEnabled() && scanCount >= context.getLimit()) {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggrKey.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggrKey.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggrKey.java
index ae62959..9e8c4a0 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggrKey.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggrKey.java
@@ -40,16 +40,15 @@ public class AggrKey implements Comparable<AggrKey> {
this.hashcode = hashcode;
}
- private int calculateHash()
- {
+ private int calculateHash() {
int hash = 1;
for (int i = 0; i < groupByMaskSet.length; i++) {
byte t = data[offset + groupByMaskSet[i]];
- if(t!= RowConstants.ROWKEY_PLACE_HOLDER_BYTE) {
+ if (t != RowConstants.ROWKEY_PLACE_HOLDER_BYTE) {
hash = (31 * hash) + t;
}
}
- return hash;
+ return hash;
}
public byte[] get() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggregationCache.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggregationCache.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggregationCache.java
index d540084..b7cee9f 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggregationCache.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/AggregationCache.java
@@ -18,11 +18,12 @@
package org.apache.kylin.storage.hbase.coprocessor;
-import com.google.common.collect.Maps;
+import java.util.Map;
+
import org.apache.kylin.common.util.MemoryBudgetController;
import org.apache.kylin.metadata.measure.MeasureAggregator;
-import java.util.Map;
+import com.google.common.collect.Maps;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorFilter.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorFilter.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorFilter.java
index b3b06a7..feb36ca 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorFilter.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorFilter.java
@@ -18,6 +18,8 @@
package org.apache.kylin.storage.hbase.coprocessor;
+import java.util.Set;
+
import org.apache.kylin.common.util.BytesUtil;
import org.apache.kylin.dict.IDictionaryAware;
import org.apache.kylin.metadata.filter.TupleFilter;
@@ -25,8 +27,6 @@ import org.apache.kylin.metadata.filter.TupleFilterSerializer;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.metadata.tuple.IEvaluatableTuple;
-import java.util.Set;
-
/**
* @author yangli9
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorProjector.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorProjector.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorProjector.java
index 2129cdb..2821a6c 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorProjector.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorProjector.java
@@ -97,7 +97,7 @@ public class CoprocessorProjector {
public CoprocessorProjector deserialize(ByteBuffer in) {
byte[] mask = BytesUtil.readByteArray(in);
boolean hasGroupBy = BytesUtil.readVInt(in) == 1;
- return new CoprocessorProjector(mask,hasGroupBy);
+ return new CoprocessorProjector(mask, hasGroupBy);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorRowType.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorRowType.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorRowType.java
index 84b8837..11cb4e8 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorRowType.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/CoprocessorRowType.java
@@ -22,8 +22,6 @@ import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
-import com.google.common.collect.Maps;
-
import org.apache.kylin.common.util.BytesSerializer;
import org.apache.kylin.common.util.BytesUtil;
import org.apache.kylin.cube.CubeSegment;
@@ -35,6 +33,8 @@ import org.apache.kylin.metadata.model.ColumnDesc;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.TblColRef;
+import com.google.common.collect.Maps;
+
/**
* @author yangli9
*/
@@ -129,7 +129,6 @@ public class CoprocessorRowType {
return columnIdxMap.get(colRef);
}
-
private void init() {
int[] offsets = new int[columns.length];
int o = RowConstants.ROWKEY_CUBOIDID_LEN;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/DictCodeSystem.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/DictCodeSystem.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/DictCodeSystem.java
index f4fd65d..d4e2713 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/DictCodeSystem.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/DictCodeSystem.java
@@ -14,7 +14,7 @@ import org.apache.kylin.metadata.filter.IFilterCodeSystem;
public class DictCodeSystem implements IFilterCodeSystem<String> {
public static final DictCodeSystem INSTANCE = new DictCodeSystem();
-
+
private DictCodeSystem() {
// singleton
}
@@ -23,7 +23,7 @@ public class DictCodeSystem implements IFilterCodeSystem<String> {
public boolean isNull(String value) {
if (value == null)
return true;
-
+
String v = value;
for (int i = 0, n = v.length(); i < n; i++) {
if ((byte) v.charAt(i) != Dictionary.NULL)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/FilterDecorator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/FilterDecorator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/FilterDecorator.java
index 7729e8c..350b167 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/FilterDecorator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/FilterDecorator.java
@@ -1,16 +1,20 @@
package org.apache.kylin.storage.hbase.coprocessor;
-import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Set;
import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.cube.kv.RowKeyColumnIO;
import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.dict.IDictionaryAware;
-import org.apache.kylin.metadata.filter.*;
+import org.apache.kylin.metadata.filter.ColumnTupleFilter;
+import org.apache.kylin.metadata.filter.CompareTupleFilter;
+import org.apache.kylin.metadata.filter.ConstantTupleFilter;
+import org.apache.kylin.metadata.filter.TupleFilter;
+import org.apache.kylin.metadata.filter.TupleFilterSerializer;
import org.apache.kylin.metadata.model.TblColRef;
-import java.util.Collection;
-import java.util.Set;
+import com.google.common.collect.Sets;
/**
*/
@@ -34,10 +38,9 @@ public class FilterDecorator implements TupleFilterSerializer.Decorator {
return inevaluableColumns;
}
-
private TupleFilter replaceConstantsWithLocalDict(CompareTupleFilter oldCompareFilter, CompareTupleFilter newCompareFilter) {
//TODO localdict: (performance issue) transalte() with roundingflag 0 will use try catch exceptions to deal with non-existing entries
- return replaceConstantsWithGlobalDict(oldCompareFilter,newCompareFilter);
+ return replaceConstantsWithGlobalDict(oldCompareFilter, newCompareFilter);
}
private TupleFilter replaceConstantsWithGlobalDict(CompareTupleFilter oldCompareFilter, CompareTupleFilter newCompareFilter) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/ClearTextDictionary.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/ClearTextDictionary.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/ClearTextDictionary.java
index e9a3780..f2c19d9 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/ClearTextDictionary.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/ClearTextDictionary.java
@@ -34,7 +34,8 @@
package org.apache.kylin.storage.hbase.coprocessor.endpoint;
-import com.google.common.collect.Maps;
+import java.util.Map;
+
import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.dict.IDictionaryAware;
import org.apache.kylin.invertedindex.index.TableRecordInfo;
@@ -42,7 +43,7 @@ import org.apache.kylin.invertedindex.index.TableRecordInfoDigest;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.storage.hbase.coprocessor.CoprocessorRowType;
-import java.util.Map;
+import com.google.common.collect.Maps;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/CubeVisitService.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/CubeVisitService.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/CubeVisitService.java
index c1a242d..3ece09e 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/CubeVisitService.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/CubeVisitService.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.kylin.common.util.CompressionUtils;
-import org.apache.kylin.storage.util.KryoUtils;
import org.apache.kylin.cube.kv.RowConstants;
import org.apache.kylin.gridtable.GTRawScanner;
import org.apache.kylin.gridtable.GTRecord;
@@ -49,6 +48,7 @@ import org.apache.kylin.storage.cube.RawScan;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos.CubeVisitResponse.Builder;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.CubeVisitProtos.CubeVisitResponse.Stats;
+import org.apache.kylin.storage.util.KryoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregationCache.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregationCache.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregationCache.java
index 3ab3934..40d80ae 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregationCache.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregationCache.java
@@ -18,13 +18,13 @@
package org.apache.kylin.storage.hbase.coprocessor.endpoint;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.kylin.metadata.measure.MeasureAggregator;
import org.apache.kylin.storage.hbase.coprocessor.AggrKey;
import org.apache.kylin.storage.hbase.coprocessor.AggregationCache;
-import java.util.Map;
-import java.util.Set;
-
/**
*/
public class EndpointAggregationCache extends AggregationCache {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregators.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregators.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregators.java
index 91fe961..8c3a8bc 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregators.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/EndpointAggregators.java
@@ -41,7 +41,7 @@ import com.google.common.collect.Lists;
/**
* @author honma
*/
-@SuppressWarnings({"rawtypes", "unchecked"})
+@SuppressWarnings({ "rawtypes", "unchecked" })
public class EndpointAggregators {
private enum MetricType {
@@ -153,7 +153,6 @@ public class EndpointAggregators {
return aggrs;
}
-
/**
* this method is heavily called at coprocessor side,
* Make sure as little object creation as possible
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
index 5952a1f..c186f5e 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
@@ -18,7 +18,12 @@
package org.apache.kylin.storage.hbase.coprocessor.endpoint;
-import com.google.common.collect.Lists;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
@@ -26,11 +31,7 @@ import org.apache.kylin.invertedindex.model.IIRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import com.google.common.collect.Lists;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
index 5010680..9f9e79f 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
@@ -50,7 +50,12 @@ import org.apache.kylin.invertedindex.model.IIKeyValueCodec;
import org.apache.kylin.metadata.measure.MeasureAggregator;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.storage.filter.BitMapFilterEvaluator;
-import org.apache.kylin.storage.hbase.coprocessor.*;
+import org.apache.kylin.storage.hbase.coprocessor.AggrKey;
+import org.apache.kylin.storage.hbase.coprocessor.CoprocessorConstants;
+import org.apache.kylin.storage.hbase.coprocessor.CoprocessorFilter;
+import org.apache.kylin.storage.hbase.coprocessor.CoprocessorProjector;
+import org.apache.kylin.storage.hbase.coprocessor.CoprocessorRowType;
+import org.apache.kylin.storage.hbase.coprocessor.FilterDecorator;
import org.apache.kylin.storage.hbase.coprocessor.endpoint.generated.IIProtos;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +84,7 @@ public class IIEndpoint extends IIProtos.RowsService implements Coprocessor, Cop
private Scan prepareScan(IIProtos.IIRequest request, HRegion region) throws IOException {
Scan scan = new Scan();
-
+
scan.addColumn(IIDesc.HBASE_FAMILY_BYTES, IIDesc.HBASE_QUALIFIER_BYTES);
scan.addColumn(IIDesc.HBASE_FAMILY_BYTES, IIDesc.HBASE_DICTIONARY_BYTES);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/LocalDictionary.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/LocalDictionary.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/LocalDictionary.java
index 0848a5c..0fc0e08 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/LocalDictionary.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/LocalDictionary.java
@@ -6,8 +6,6 @@ import org.apache.kylin.invertedindex.index.TableRecordInfoDigest;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.storage.hbase.coprocessor.CoprocessorRowType;
-import java.util.Map;
-
/**
*/
public class LocalDictionary implements IDictionaryAware {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/SliceBitMapProvider.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/SliceBitMapProvider.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/SliceBitMapProvider.java
index 09327eb..130a015 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/SliceBitMapProvider.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/SliceBitMapProvider.java
@@ -39,10 +39,9 @@ public class SliceBitMapProvider implements BitMapFilterEvaluator.BitMapProvider
this.type = type;
}
-
@Override
public ConciseSet getBitMap(TblColRef col, Integer startId, Integer endId) {
- return slice.getColumnValueContainer(type.getColIndexByTblColRef(col)).getBitMap(startId,endId);
+ return slice.getColumnValueContainer(type.getColIndexByTblColRef(col)).getBitMap(startId, endId);
}
@Override