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:16 UTC
[07/17] incubator-kylin git commit: reformat code
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/job/streaming/PeriodicalStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/streaming/PeriodicalStreamBuilderTest.java b/job/src/test/java/org/apache/kylin/job/streaming/PeriodicalStreamBuilderTest.java
index abfc699..dc6d312 100644
--- a/job/src/test/java/org/apache/kylin/job/streaming/PeriodicalStreamBuilderTest.java
+++ b/job/src/test/java/org/apache/kylin/job/streaming/PeriodicalStreamBuilderTest.java
@@ -1,23 +1,34 @@
package org.apache.kylin.job.streaming;
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.common.util.TimeUtil;
-import org.apache.kylin.streaming.*;
+import org.apache.kylin.streaming.MicroStreamBatch;
+import org.apache.kylin.streaming.MicroStreamBatchConsumer;
+import org.apache.kylin.streaming.ParsedStreamMessage;
+import org.apache.kylin.streaming.StreamBuilder;
+import org.apache.kylin.streaming.StreamMessage;
+import org.apache.kylin.streaming.StreamParser;
+import org.apache.kylin.streaming.StreamingManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-
-import static org.junit.Assert.assertEquals;
+import com.google.common.collect.Lists;
/**
*/
@@ -37,7 +48,7 @@ public class PeriodicalStreamBuilderTest extends LocalFileMetadataTestCase {
}
private List<StreamMessage> prepareTestData(long start, long end, int count) {
- double step = (double)(end - start) / (count - 1);
+ double step = (double) (end - start) / (count - 1);
long ts = start;
int offset = 0;
ArrayList<StreamMessage> result = Lists.newArrayList();
@@ -47,8 +58,8 @@ public class PeriodicalStreamBuilderTest extends LocalFileMetadataTestCase {
}
result.add(new StreamMessage(offset++, String.valueOf(end).getBytes()));
assertEquals(count, result.size());
- assertEquals(start+"", new String(result.get(0).getRawData()));
- assertEquals(end+"", new String(result.get(count - 1).getRawData()));
+ assertEquals(start + "", new String(result.get(0).getRawData()));
+ assertEquals(end + "", new String(result.get(count - 1).getRawData()));
return result;
}
@@ -83,7 +94,7 @@ public class PeriodicalStreamBuilderTest extends LocalFileMetadataTestCase {
streamBuilder.setStreamParser(new StreamParser() {
@Override
public ParsedStreamMessage parse(StreamMessage streamMessage) {
- return new ParsedStreamMessage(Collections.<String>emptyList(), streamMessage.getOffset(), Long.parseLong(new String(streamMessage.getRawData())), true);
+ return new ParsedStreamMessage(Collections.<String> emptyList(), streamMessage.getOffset(), Long.parseLong(new String(streamMessage.getRawData())), true);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/job/streaming/StreamingTableDataGenerator.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/streaming/StreamingTableDataGenerator.java b/job/src/test/java/org/apache/kylin/job/streaming/StreamingTableDataGenerator.java
index 0a93469..075a048 100644
--- a/job/src/test/java/org/apache/kylin/job/streaming/StreamingTableDataGenerator.java
+++ b/job/src/test/java/org/apache/kylin/job/streaming/StreamingTableDataGenerator.java
@@ -1,12 +1,9 @@
package org.apache.kylin.job.streaming;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.SortedMultiset;
-import com.google.common.collect.TreeMultiset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.ColumnDesc;
@@ -15,9 +12,13 @@ import org.apache.kylin.metadata.model.TableDesc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.SortedMultiset;
+import com.google.common.collect.TreeMultiset;
/**
* this is for generating fact table data for test_streaming_table (cube streaming)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/job/tools/ColumnCardinalityReducerTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/tools/ColumnCardinalityReducerTest.java b/job/src/test/java/org/apache/kylin/job/tools/ColumnCardinalityReducerTest.java
index 867ee82..cb69763 100644
--- a/job/src/test/java/org/apache/kylin/job/tools/ColumnCardinalityReducerTest.java
+++ b/job/src/test/java/org/apache/kylin/job/tools/ColumnCardinalityReducerTest.java
@@ -18,7 +18,8 @@
package org.apache.kylin.job.tools;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -27,26 +28,25 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.kylin.common.util.Bytes;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.mrunit.mapreduce.ReduceDriver;
import org.apache.hadoop.mrunit.types.Pair;
+import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
+import org.apache.kylin.common.util.Bytes;
+import org.apache.kylin.cube.kv.RowConstants;
import org.apache.kylin.job.hadoop.cardinality.ColumnCardinalityMapper;
import org.apache.kylin.job.hadoop.cardinality.ColumnCardinalityReducer;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
-import org.apache.kylin.cube.kv.RowConstants;
-
/**
* @author ysong1
*
*/
public class ColumnCardinalityReducerTest {
-
+
public final static String strArr = "abc,tests,test,test,as,sts,test,tss,sets";
ReduceDriver<IntWritable, BytesWritable, IntWritable, LongWritable> reduceDriver;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java b/job/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java
index 019dc56..c2cf383 100644
--- a/job/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java
+++ b/job/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Set;
import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.source.hive.HiveSourceTableLoader;
import org.apache.kylin.storage.hbase.HBaseMetadataTestCase;
import org.junit.After;
import org.junit.Before;
@@ -38,7 +37,7 @@ public class ITHiveSourceTableLoaderTest extends HBaseMetadataTestCase {
}
@After
- public void after() throws Exception {
+ public void after() throws Exception {
super.cleanupTestMetadata();
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/source/hive/ITHiveTableReaderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/source/hive/ITHiveTableReaderTest.java b/job/src/test/java/org/apache/kylin/source/hive/ITHiveTableReaderTest.java
index ac2275a..cd4cdc6 100644
--- a/job/src/test/java/org/apache/kylin/source/hive/ITHiveTableReaderTest.java
+++ b/job/src/test/java/org/apache/kylin/source/hive/ITHiveTableReaderTest.java
@@ -18,13 +18,12 @@
package org.apache.kylin.source.hive;
-import org.apache.kylin.source.hive.HiveTableReader;
+import java.io.IOException;
+
import org.apache.kylin.storage.hbase.HBaseMetadataTestCase;
import org.junit.Assert;
import org.junit.Test;
-import java.io.IOException;
-
/**
* This test case need the hive runtime; Please run it with sandbox;
* @author shaoshi
@@ -33,7 +32,6 @@ import java.io.IOException;
*/
public class ITHiveTableReaderTest extends HBaseMetadataTestCase {
-
@Test
public void test() throws IOException {
HiveTableReader reader = new HiveTableReader("default", "test_kylin_fact");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/job/src/test/java/org/apache/kylin/source/hive/ITSnapshotManagerTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/source/hive/ITSnapshotManagerTest.java b/job/src/test/java/org/apache/kylin/source/hive/ITSnapshotManagerTest.java
index 2b44f9d..2e47953 100644
--- a/job/src/test/java/org/apache/kylin/source/hive/ITSnapshotManagerTest.java
+++ b/job/src/test/java/org/apache/kylin/source/hive/ITSnapshotManagerTest.java
@@ -18,7 +18,8 @@
package org.apache.kylin.source.hive;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import org.apache.kylin.dict.lookup.SnapshotManager;
import org.apache.kylin.dict.lookup.SnapshotTable;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java b/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java
index 2badd30..9e59f93 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java
@@ -18,6 +18,11 @@
package org.apache.kylin.query.enumerator;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.calcite.linq4j.Enumerator;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
@@ -30,11 +35,6 @@ import org.apache.kylin.query.schema.OLAPTable;
import org.apache.kylin.storage.hybrid.HybridInstance;
import org.apache.kylin.storage.tuple.Tuple;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
/**
*/
public class LookupTableEnumerator implements Enumerator<Object[]> {
@@ -52,7 +52,7 @@ public class LookupTableEnumerator implements Enumerator<Object[]> {
if (olapContext.realization instanceof CubeInstance)
cube = (CubeInstance) olapContext.realization;
else if (olapContext.realization instanceof HybridInstance) {
- final HybridInstance hybridInstance = (HybridInstance)olapContext.realization;
+ final HybridInstance hybridInstance = (HybridInstance) olapContext.realization;
final IRealization latestRealization = hybridInstance.getLatestRealization();
if (latestRealization instanceof CubeInstance) {
cube = (CubeInstance) latestRealization;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/optrule/OLAPAggregateRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/optrule/OLAPAggregateRule.java b/query/src/main/java/org/apache/kylin/query/optrule/OLAPAggregateRule.java
index b80a483..6fa2731 100644
--- a/query/src/main/java/org/apache/kylin/query/optrule/OLAPAggregateRule.java
+++ b/query/src/main/java/org/apache/kylin/query/optrule/OLAPAggregateRule.java
@@ -24,8 +24,8 @@ import org.apache.calcite.rel.InvalidRelException;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.convert.ConverterRule;
import org.apache.calcite.rel.logical.LogicalAggregate;
-import org.apache.kylin.query.relnode.OLAPRel;
import org.apache.kylin.query.relnode.OLAPAggregateRel;
+import org.apache.kylin.query.relnode.OLAPRel;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/optrule/OLAPFilterRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/optrule/OLAPFilterRule.java b/query/src/main/java/org/apache/kylin/query/optrule/OLAPFilterRule.java
index 3dcbbd7..33f3ea8 100644
--- a/query/src/main/java/org/apache/kylin/query/optrule/OLAPFilterRule.java
+++ b/query/src/main/java/org/apache/kylin/query/optrule/OLAPFilterRule.java
@@ -41,7 +41,7 @@ public class OLAPFilterRule extends RelOptRule {
RelTraitSet origTraitSet = filter.getTraitSet();
RelTraitSet traitSet = origTraitSet.replace(OLAPRel.CONVENTION).simplify();
-
+
OLAPFilterRel olapFilter = new OLAPFilterRel(filter.getCluster(), traitSet, convert(filter.getInput(), traitSet), filter.getCondition());
call.transformTo(olapFilter);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/optrule/OLAPLimitRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/optrule/OLAPLimitRule.java b/query/src/main/java/org/apache/kylin/query/optrule/OLAPLimitRule.java
index 5eb1ff8..76c2baf 100644
--- a/query/src/main/java/org/apache/kylin/query/optrule/OLAPLimitRule.java
+++ b/query/src/main/java/org/apache/kylin/query/optrule/OLAPLimitRule.java
@@ -42,7 +42,7 @@ public class OLAPLimitRule extends RelOptRule {
if (sort.offset == null && sort.fetch == null) {
return;
}
-
+
RelTraitSet origTraitSet = sort.getTraitSet();
RelTraitSet traitSet = origTraitSet.replace(OLAPRel.CONVENTION).simplify();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
index d8a94f8..378221c 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
@@ -18,6 +18,14 @@
package org.apache.kylin.query.relnode;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.kylin.metadata.filter.TupleFilter;
@@ -30,8 +38,6 @@ import org.apache.kylin.query.schema.OLAPSchema;
import org.apache.kylin.storage.StorageContext;
import org.apache.kylin.storage.tuple.TupleInfo;
-import java.util.*;
-
/**
*/
public class OLAPContext {
@@ -124,8 +130,7 @@ public class OLAPContext {
return sqlDigest;
}
- public void resetSQLDigest()
- {
+ public void resetSQLDigest() {
this.sqlDigest = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
index 840c277..ceae9b8 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
@@ -229,9 +229,9 @@ public class OLAPJoinRel extends EnumerableJoin implements OLAPRel {
@Override
public Result implement(EnumerableRelImplementor implementor, Prefer pref) {
-
+
context.setReturnTupleInfo(rowType, columnRowType);
-
+
PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), getRowType(), pref.preferArray());
RelOptTable factTable = context.firstTableScan.getTable();
MethodCallExpression exprCall = Expressions.call(factTable.getExpression(OLAPTable.class), "executeOLAPQuery", implementor.getRootExpression(), Expressions.constant(context.id));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
index f58aa64..b0436e2 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
@@ -156,7 +156,7 @@ public class OLAPProjectRel extends Project implements OLAPRel {
}
return null;
}
-
+
private TblColRef translateRexInputRef(RexInputRef inputRef, ColumnRowType inputColumnRowType, String fieldName, Set<TblColRef> sourceCollector) {
int index = inputRef.getIndex();
// check it for rewrite count
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
index 19eb7f9..0cda106 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
@@ -90,7 +90,7 @@ public class OLAPToEnumerableConverter extends ConverterImpl implements Enumerab
OLAPRel.JavaImplementor impl = new OLAPRel.JavaImplementor(enumImplementor);
EnumerableRel inputAsEnum = impl.createEnumerable((OLAPRel) getInput());
this.replaceInput(0, inputAsEnum);
-
+
if (System.getProperty("calcite.debug") != null) {
String dumpPlan = RelOptUtil.dumpPlan("", this, false, SqlExplainLevel.DIGEST_ATTRIBUTES);
System.out.println("EXECUTION PLAN AFTER REWRITE");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/routing/QueryRouter.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/QueryRouter.java b/query/src/main/java/org/apache/kylin/query/routing/QueryRouter.java
index 14db363..7f2bb49 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/QueryRouter.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/QueryRouter.java
@@ -18,7 +18,8 @@
package org.apache.kylin.query.routing;
-import com.google.common.collect.Lists;
+import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.metadata.project.ProjectManager;
import org.apache.kylin.metadata.realization.IRealization;
@@ -26,7 +27,7 @@ import org.apache.kylin.query.relnode.OLAPContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.collect.Lists;
/**
* @author xjiang
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java b/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
index a24bc4e..d80763c 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/RoutingRule.java
@@ -21,14 +21,16 @@ package org.apache.kylin.query.routing;
import java.util.Iterator;
import java.util.List;
-import org.apache.kylin.query.routing.RoutingRules.*;
+import org.apache.kylin.metadata.realization.IRealization;
+import org.apache.kylin.metadata.realization.RealizationType;
+import org.apache.kylin.query.relnode.OLAPContext;
+import org.apache.kylin.query.routing.RoutingRules.AdjustForWeaklyMatchedRealization;
+import org.apache.kylin.query.routing.RoutingRules.RealizationSortRule;
+import org.apache.kylin.query.routing.RoutingRules.RemoveUncapableRealizationsRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
-import org.apache.kylin.metadata.realization.IRealization;
-import org.apache.kylin.metadata.realization.RealizationType;
-import org.apache.kylin.query.relnode.OLAPContext;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/AdjustForWeaklyMatchedRealization.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/AdjustForWeaklyMatchedRealization.java b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/AdjustForWeaklyMatchedRealization.java
index 9fdc35d..1c1dce5 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/AdjustForWeaklyMatchedRealization.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/AdjustForWeaklyMatchedRealization.java
@@ -18,6 +18,10 @@
package org.apache.kylin.query.routing.RoutingRules;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.kylin.cube.CubeCapabilityChecker;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.model.CubeDesc;
@@ -32,10 +36,6 @@ import org.apache.kylin.storage.hybrid.HybridInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
/**
*/
public class AdjustForWeaklyMatchedRealization extends RoutingRule {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationPriorityRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationPriorityRule.java b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationPriorityRule.java
index 4389263..6e196d9 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationPriorityRule.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationPriorityRule.java
@@ -18,14 +18,18 @@
package org.apache.kylin.query.routing.RoutingRules;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
-import com.google.common.collect.Maps;
import org.apache.kylin.metadata.realization.IRealization;
import org.apache.kylin.metadata.realization.RealizationType;
import org.apache.kylin.query.relnode.OLAPContext;
import org.apache.kylin.query.routing.RoutingRule;
+import com.google.common.collect.Maps;
+
/**
*/
public class RealizationPriorityRule extends RoutingRule {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationSortRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationSortRule.java b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationSortRule.java
index f9a250e..d101288 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationSortRule.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/RoutingRules/RealizationSortRule.java
@@ -18,15 +18,15 @@
package org.apache.kylin.query.routing.RoutingRules;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
import org.apache.kylin.metadata.realization.IRealization;
import org.apache.kylin.query.relnode.OLAPContext;
import org.apache.kylin.query.routing.RoutingRule;
import org.apache.kylin.storage.hybrid.HybridInstance;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
/**
*/
public class RealizationSortRule extends RoutingRule {
@@ -60,7 +60,6 @@ public class RealizationSortRule extends RoutingRule {
}
});
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/main/java/org/apache/kylin/query/sqlfunc/HLLDistinctCountAggFunc.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/sqlfunc/HLLDistinctCountAggFunc.java b/query/src/main/java/org/apache/kylin/query/sqlfunc/HLLDistinctCountAggFunc.java
index 356c1e3..7881c42 100644
--- a/query/src/main/java/org/apache/kylin/query/sqlfunc/HLLDistinctCountAggFunc.java
+++ b/query/src/main/java/org/apache/kylin/query/sqlfunc/HLLDistinctCountAggFunc.java
@@ -21,11 +21,10 @@ package org.apache.kylin.query.sqlfunc;
import java.io.IOException;
import java.nio.ByteBuffer;
+import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
-
/**
* @author xjiang
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/test/java/org/apache/kylin/query/test/H2Database.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/H2Database.java b/query/src/test/java/org/apache/kylin/query/test/H2Database.java
index c807bfe..54e0914 100644
--- a/query/src/test/java/org/apache/kylin/query/test/H2Database.java
+++ b/query/src/test/java/org/apache/kylin/query/test/H2Database.java
@@ -18,13 +18,6 @@
package org.apache.kylin.query.test;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.metadata.MetadataManager;
-import org.apache.kylin.metadata.model.ColumnDesc;
-import org.apache.kylin.metadata.model.TableDesc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -35,6 +28,13 @@ import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.metadata.MetadataManager;
+import org.apache.kylin.metadata.model.ColumnDesc;
+import org.apache.kylin.metadata.model.TableDesc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class H2Database {
private static final Logger logger = LoggerFactory.getLogger(H2Database.class);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/test/java/org/apache/kylin/query/test/ITCombinationTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITCombinationTest.java b/query/src/test/java/org/apache/kylin/query/test/ITCombinationTest.java
index a38e85c..2106c06 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITCombinationTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITCombinationTest.java
@@ -18,16 +18,16 @@
package org.apache.kylin.query.test;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+
import org.apache.kylin.storage.hbase.coprocessor.observer.ObserverEnabler;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-
/**
*/
@RunWith(Parameterized.class)
@@ -50,8 +50,8 @@ public class ITCombinationTest extends ITKylinQueryTest {
*/
@Parameterized.Parameters
public static Collection<Object[]> configs() {
-// return Arrays.asList(new Object[][] { { "inner", "unset" }, { "left", "unset" }, { "inner", "off" }, { "left", "off" }, { "inner", "on" }, { "left", "on" }, });
- return Arrays.asList(new Object[][]{{"inner", "on"}, {"left", "on"}});
+ // return Arrays.asList(new Object[][] { { "inner", "unset" }, { "left", "unset" }, { "inner", "off" }, { "left", "off" }, { "inner", "on" }, { "left", "on" }, });
+ return Arrays.asList(new Object[][] { { "inner", "on" }, { "left", "on" } });
}
public ITCombinationTest(String joinType, String coprocessorToggle) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
index 492b9bf..b7b5aca 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
@@ -18,7 +18,10 @@
package org.apache.kylin.query.test;
-import com.google.common.collect.Maps;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
import org.apache.kylin.metadata.realization.RealizationType;
import org.apache.kylin.query.routing.RoutingRules.RealizationPriorityRule;
import org.junit.AfterClass;
@@ -27,9 +30,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
+import com.google.common.collect.Maps;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
index 1ba2125..ce8d3ee 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
@@ -18,6 +18,13 @@
package org.apache.kylin.query.test;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.sql.DriverManager;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.metadata.project.ProjectInstance;
@@ -33,13 +40,6 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import java.io.File;
-import java.sql.DriverManager;
-import java.util.List;
-import java.util.Properties;
-
-import static org.junit.Assert.assertTrue;
-
@Ignore("KylinQueryTest is contained by ITCombinationTest")
public class ITKylinQueryTest extends KylinTestBase {
@@ -164,7 +164,7 @@ public class ITKylinQueryTest extends KylinTestBase {
@Test
public void testStreamingTableQuery() throws Exception {
- execAndCompQuery("src/test/resources/query/sql_streaming",null,true);
+ execAndCompQuery("src/test/resources/query/sql_streaming", null, true);
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
index de049d2..0399f8c 100644
--- a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
+++ b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
@@ -18,7 +18,30 @@
package org.apache.kylin.query.test;
-import com.google.common.io.Files;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.LogManager;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.dbunit.Assertion;
@@ -34,11 +57,7 @@ import org.dbunit.ext.h2.H2Connection;
import org.dbunit.ext.h2.H2DataTypeFactory;
import org.junit.Assert;
-import java.io.*;
-import java.nio.charset.Charset;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.LogManager;
+import com.google.common.io.Files;
/**
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
index b2d7f60..e0f7487 100644
--- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
+++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
@@ -18,6 +18,10 @@
package org.apache.kylin.rest;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
import org.apache.catalina.Context;
import org.apache.catalina.core.AprLifecycleListener;
import org.apache.catalina.core.StandardServer;
@@ -27,10 +31,6 @@ import org.apache.hadoop.util.Shell;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.rest.util.ClasspathUtil;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
public class DebugTomcat {
public static void setupDebugEnv() {
@@ -41,11 +41,11 @@ public class DebugTomcat {
overrideDevJobJarLocations();
System.setProperty("spring.profiles.active", "testing");
-
+
//avoid log permission issue
if (System.getProperty("catalina.home") == null)
- System.setProperty("catalina.home", ".");
-
+ System.setProperty("catalina.home", ".");
+
if (System.getProperty("hdp.version") == null)
System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/AccessController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/AccessController.java b/server/src/main/java/org/apache/kylin/rest/controller/AccessController.java
index d0d2b66..461aa3f 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/AccessController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/AccessController.java
@@ -21,6 +21,7 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.List;
+import org.apache.kylin.common.persistence.AclEntity;
import org.apache.kylin.rest.request.AccessRequest;
import org.apache.kylin.rest.response.AccessEntryResponse;
import org.apache.kylin.rest.security.AclPermissionFactory;
@@ -36,8 +37,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.apache.kylin.common.persistence.AclEntity;
-
/**
* @author xduo
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/AdminController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/AdminController.java b/server/src/main/java/org/apache/kylin/rest/controller/AdminController.java
index b855827..de3c4b4 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/AdminController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/AdminController.java
@@ -18,6 +18,8 @@
package org.apache.kylin.rest.controller;
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.rest.request.MetricsRequest;
import org.apache.kylin.rest.request.UpdateConfigRequest;
import org.apache.kylin.rest.response.GeneralResponse;
import org.apache.kylin.rest.response.MetricsResponse;
@@ -30,9 +32,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.rest.request.MetricsRequest;
-
/**
* Admin Controller is defined as Restful API entrance for UI.
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/BasicController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/BasicController.java b/server/src/main/java/org/apache/kylin/rest/controller/BasicController.java
index 521a6a1..0e4a70c 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/BasicController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/BasicController.java
@@ -18,22 +18,19 @@
package org.apache.kylin.rest.controller;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.kylin.rest.exception.BadRequestException;
import org.apache.kylin.rest.exception.ForbiddenException;
import org.apache.kylin.rest.exception.NotFoundException;
import org.apache.kylin.rest.response.ErrorResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.kylin.rest.exception.BadRequestException;
-import org.apache.kylin.rest.exception.NotFoundException;
-
/**
*/
public class BasicController {
@@ -47,7 +44,6 @@ public class BasicController {
logger.error("", ex);
return new ErrorResponse(req.getRequestURL().toString(), ex);
}
-
@ResponseStatus(HttpStatus.FORBIDDEN)
@ExceptionHandler(ForbiddenException.class)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java b/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
index 912d5bc..845ffe0 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
@@ -18,6 +18,8 @@
package org.apache.kylin.rest.controller;
+import java.io.IOException;
+
import org.apache.kylin.common.restclient.Broadcaster;
import org.apache.kylin.common.restclient.Broadcaster.EVENT;
import org.apache.kylin.rest.service.CacheService;
@@ -30,8 +32,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import java.io.IOException;
-
/**
* CubeController is defined as Restful API entrance for UI.
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
index ebe6b91..14c231b 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
@@ -20,14 +20,17 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.cube.CubeInstance;
-import org.apache.kylin.cube.CubeUpdate;
import org.apache.kylin.cube.CubeSegment;
+import org.apache.kylin.cube.CubeUpdate;
import org.apache.kylin.cube.model.CubeBuildTypeEnum;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.CubeJoinedFlatTableDesc;
@@ -54,7 +57,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -398,8 +406,7 @@ public class CubeController extends BasicController {
return hbase;
}
-
- @RequestMapping(value = "/{cubeName}/segments", method = {RequestMethod.POST})
+ @RequestMapping(value = "/{cubeName}/segments", method = { RequestMethod.POST })
@ResponseBody
public CubeSegmentRequest appendSegment(@PathVariable String cubeName, @RequestBody CubeSegmentRequest cubeSegmentRequest) {
CubeInstance cube = cubeService.getCubeManager().getCube(cubeName);
@@ -446,7 +453,6 @@ public class CubeController extends BasicController {
return segment;
}
-
private CubeDesc deserializeCubeDesc(CubeRequest cubeRequest) {
CubeDesc desc = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
index 23480d1..395365e 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
@@ -20,6 +20,8 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
+import org.apache.kylin.cube.CubeInstance;
+import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.rest.service.CubeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -28,9 +30,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.apache.kylin.cube.CubeInstance;
-import org.apache.kylin.cube.model.CubeDesc;
-
/**
* @author xduo
*
@@ -54,7 +53,7 @@ public class CubeDescController {
@ResponseBody
public CubeDesc[] getCube(@PathVariable String cubeName) {
CubeInstance cubeInstance = cubeService.getCubeManager().getCube(cubeName);
- if (cubeInstance == null){
+ if (cubeInstance == null) {
return null;
}
CubeDesc cSchema = cubeInstance.getDescriptor();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/JobController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/JobController.java b/server/src/main/java/org/apache/kylin/rest/controller/JobController.java
index 5e40e12..6fb2813 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/JobController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/JobController.java
@@ -18,6 +18,14 @@
package org.apache.kylin.rest.controller;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.job.JobInstance;
import org.apache.kylin.job.constant.JobStatusEnum;
@@ -38,9 +46,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import java.io.IOException;
-import java.util.*;
-
/**
* @author ysong1
* @author Jack
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java b/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
index 8a54442..b8af9d6 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
@@ -17,10 +17,12 @@
*/
package org.apache.kylin.rest.controller;
+
+import java.io.IOException;
import java.util.Iterator;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
+import java.util.List;
+import java.util.UUID;
+
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.metadata.model.DataModelDesc;
@@ -36,11 +38,16 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
-import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
/**
* ModelController is defined as Restful API entrance for UI.
@@ -55,13 +62,12 @@ public class ModelController extends BasicController {
@Autowired
private ModelService modelService;
- @RequestMapping(value = "", method = {RequestMethod.GET})
+ @RequestMapping(value = "", method = { RequestMethod.GET })
@ResponseBody
- public List<DataModelDesc> getModels(@RequestParam(value = "modelName", required = false) String modelName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value="limit",required=false) Integer limit, @RequestParam(value="offset",required=false) Integer offset) {
- try{
+ public List<DataModelDesc> getModels(@RequestParam(value = "modelName", required = false) String modelName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) {
+ try {
return modelService.getModels(modelName, projectName, limit, offset);
- }
- catch (IOException e){
+ } catch (IOException e) {
logger.error("Failed to deal with the request:" + e.getLocalizedMessage(), e);
throw new InternalErrorException("Failed to deal with the request: " + e.getLocalizedMessage());
}
@@ -72,7 +78,7 @@ public class ModelController extends BasicController {
* create model
* @throws java.io.IOException
*/
- @RequestMapping(value = "", method = {RequestMethod.POST})
+ @RequestMapping(value = "", method = { RequestMethod.POST })
@ResponseBody
public ModelRequest saveModelDesc(@RequestBody ModelRequest modelRequest) {
//Update Model
@@ -101,7 +107,7 @@ public class ModelController extends BasicController {
return modelRequest;
}
- @RequestMapping(value = "", method = {RequestMethod.PUT})
+ @RequestMapping(value = "", method = { RequestMethod.PUT })
@ResponseBody
public ModelRequest updateModelDesc(@RequestBody ModelRequest modelRequest) throws JsonProcessingException {
DataModelDesc modelDesc = deserializeDataModelDesc(modelRequest);
@@ -109,10 +115,10 @@ public class ModelController extends BasicController {
return modelRequest;
}
try {
- modelDesc = modelService.updateModelAndDesc(modelDesc);
+ modelDesc = modelService.updateModelAndDesc(modelDesc);
} catch (AccessDeniedException accessDeniedException) {
throw new ForbiddenException("You don't have right to update this cube.");
- } catch (Exception e) {
+ } catch (Exception e) {
logger.error("Failed to deal with the request:" + e.getLocalizedMessage(), e);
throw new InternalErrorException("Failed to deal with the request: " + e.getLocalizedMessage());
}
@@ -128,7 +134,7 @@ public class ModelController extends BasicController {
return modelRequest;
}
- @RequestMapping(value = "/{modelName}", method = {RequestMethod.DELETE})
+ @RequestMapping(value = "/{modelName}", method = { RequestMethod.DELETE })
@ResponseBody
public void deleteModel(@PathVariable String modelName) {
DataModelDesc desc = modelService.getMetadataManager().getDataModelDesc(modelName);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/ModelDescController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ModelDescController.java b/server/src/main/java/org/apache/kylin/rest/controller/ModelDescController.java
index fda7927..4171afd 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/ModelDescController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/ModelDescController.java
@@ -20,26 +20,22 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
-import org.apache.kylin.rest.service.CubeService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.metadata.MetadataManager;
+import org.apache.kylin.metadata.model.DataModelDesc;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.metadata.MetadataManager;
-import org.apache.kylin.metadata.model.DataModelDesc;
-
/**
* @author jiazhong
*
*/
@Controller
@RequestMapping(value = "/model")
-public class ModelDescController extends BasicController{
-
+public class ModelDescController extends BasicController {
/**
* Get detail information of the "Model ID"
@@ -52,10 +48,10 @@ public class ModelDescController extends BasicController{
@RequestMapping(value = "/{model_name}", method = { RequestMethod.GET })
@ResponseBody
public DataModelDesc getModel(@PathVariable String model_name) {
- MetadataManager metaManager= MetadataManager.getInstance(KylinConfig.getInstanceFromEnv());
+ MetadataManager metaManager = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv());
DataModelDesc modeDesc = metaManager.getDataModelDesc(model_name);
return modeDesc;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java b/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
index 2795987..a561e97 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
@@ -21,8 +21,8 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.List;
-import org.apache.kylin.metadata.project.ProjectInstance;
import org.apache.commons.lang.StringUtils;
+import org.apache.kylin.metadata.project.ProjectInstance;
import org.apache.kylin.rest.exception.InternalErrorException;
import org.apache.kylin.rest.request.CreateProjectRequest;
import org.apache.kylin.rest.request.UpdateProjectRequest;
@@ -89,7 +89,7 @@ public class ProjectController extends BasicController {
ProjectInstance updatedProj = null;
try {
ProjectInstance currentProject = projectService.getProjectManager().getProject(projectRequest.getFormerProjectName());
- updatedProj = projectService.updateProject(projectRequest,currentProject);
+ updatedProj = projectService.updateProject(projectRequest, currentProject);
} catch (Exception e) {
logger.error("Failed to deal with the request.", e);
throw new InternalErrorException(e.getLocalizedMessage());
@@ -104,7 +104,7 @@ public class ProjectController extends BasicController {
try {
ProjectInstance project = projectService.getProjectManager().getProject(projectName);
- projectService.deleteProject(projectName,project);
+ projectService.deleteProject(projectName, project);
} catch (Exception e) {
logger.error(e.getLocalizedMessage(), e);
throw new InternalErrorException("Failed to delete project. " + " Caused by: " + e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 4280c73..8cc1ea1 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -18,10 +18,20 @@
package org.apache.kylin.rest.controller;
-import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
+
import org.apache.commons.io.IOUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.debug.BackdoorToggles;
@@ -46,19 +56,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.supercsv.io.CsvListWriter;
import org.supercsv.io.ICsvListWriter;
import org.supercsv.prefs.CsvPreference;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import com.google.common.base.Preconditions;
/**
* Handle query requests.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
index 631ac4e..133b5ad 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
@@ -18,6 +18,14 @@
package org.apache.kylin.rest.controller;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.metadata.MetadataConstants;
import org.apache.kylin.metadata.model.ColumnDesc;
@@ -31,10 +39,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
/**
* @author xduo
@@ -53,7 +63,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "", method = {RequestMethod.GET})
+ @RequestMapping(value = "", method = { RequestMethod.GET })
@ResponseBody
public List<TableDesc> getHiveTables(@RequestParam(value = "ext", required = false) boolean withExt, @RequestParam(value = "project", required = false) String project) {
long start = System.currentTimeMillis();
@@ -80,7 +90,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableName}", method = {RequestMethod.GET})
+ @RequestMapping(value = "/{tableName}", method = { RequestMethod.GET })
@ResponseBody
public TableDesc getHiveTable(@PathVariable String tableName) {
return cubeMgmtService.getMetadataManager().getTableDesc(tableName);
@@ -92,21 +102,21 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableName}/exd-map", method = {RequestMethod.GET})
+ @RequestMapping(value = "/{tableName}/exd-map", method = { RequestMethod.GET })
@ResponseBody
public Map<String, String> getHiveTableExd(@PathVariable String tableName) {
Map<String, String> tableExd = cubeMgmtService.getMetadataManager().getTableDescExd(tableName);
return tableExd;
}
- @RequestMapping(value = "/reload", method = {RequestMethod.PUT})
+ @RequestMapping(value = "/reload", method = { RequestMethod.PUT })
@ResponseBody
public String reloadSourceTable() {
cubeMgmtService.getMetadataManager().reload();
return "ok";
}
- @RequestMapping(value = "/{tables}/{project}", method = {RequestMethod.POST})
+ @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST })
@ResponseBody
public Map<String, String[]> loadHiveTable(@PathVariable String tables, @PathVariable String project) throws IOException {
String submitter = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -115,7 +125,7 @@ public class TableController extends BasicController {
cubeMgmtService.syncTableToProject(loaded, project);
Map<String, String[]> result = new HashMap<String, String[]>();
result.put("result.loaded", loaded);
- result.put("result.unloaded", new String[]{});
+ result.put("result.unloaded", new String[] {});
return result;
}
@@ -125,7 +135,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableNames}/cardinality", method = {RequestMethod.PUT})
+ @RequestMapping(value = "/{tableNames}/cardinality", method = { RequestMethod.PUT })
@ResponseBody
public CardinalityRequest generateCardinality(@PathVariable String tableNames, @RequestBody CardinalityRequest request) {
String submitter = SecurityContextHolder.getContext().getAuthentication().getName();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/UserController.java b/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
index d093ff1..94a4808 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
@@ -20,6 +20,7 @@ package org.apache.kylin.rest.controller;
import java.util.List;
+import org.apache.kylin.rest.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -28,8 +29,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.apache.kylin.rest.service.UserService;
-
/**
* Handle user authentication request to protected kylin rest resources by
* spring security.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/filter/RequestLoggingFilter.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/filter/RequestLoggingFilter.java b/server/src/main/java/org/apache/kylin/rest/filter/RequestLoggingFilter.java
index d58287d..d1bcd4e 100644
--- a/server/src/main/java/org/apache/kylin/rest/filter/RequestLoggingFilter.java
+++ b/server/src/main/java/org/apache/kylin/rest/filter/RequestLoggingFilter.java
@@ -1,12 +1,11 @@
package org.apache.kylin.rest.filter;
+import javax.servlet.http.HttpServletRequest;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.filter.AbstractRequestLoggingFilter;
-import javax.servlet.http.HttpServletRequest;
-
/**
* Created by jiazhong on 2015/4/14.
*/
@@ -16,15 +15,14 @@ public class RequestLoggingFilter extends AbstractRequestLoggingFilter {
@Override
protected void beforeRequest(HttpServletRequest request, String message) {
-// String user = SecurityContextHolder.getContext().getAuthentication().getName();
-// logger.info("USER:"+user+"requestURI:"+request.getRequestURI());
+ // String user = SecurityContextHolder.getContext().getAuthentication().getName();
+ // logger.info("USER:"+user+"requestURI:"+request.getRequestURI());
}
@Override
- protected void afterRequest(HttpServletRequest request, String message)
- {
+ protected void afterRequest(HttpServletRequest request, String message) {
logger.info(message);
-// logger.info("["+"uri="+request.getRequestURI()+",user="+request.getRemoteUser()+request.get);
+ // logger.info("["+"uri="+request.getRequestURI()+",user="+request.getRemoteUser()+request.get);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/request/CubeRequest.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/request/CubeRequest.java b/server/src/main/java/org/apache/kylin/rest/request/CubeRequest.java
index 32f80c7..74712a7 100644
--- a/server/src/main/java/org/apache/kylin/rest/request/CubeRequest.java
+++ b/server/src/main/java/org/apache/kylin/rest/request/CubeRequest.java
@@ -69,7 +69,7 @@ public class CubeRequest {
public CubeRequest() {
}
- public CubeRequest( String cubeName, String cubeDescData) {
+ public CubeRequest(String cubeName, String cubeDescData) {
this.cubeName = cubeName;
this.cubeDescData = cubeDescData;
}
@@ -82,7 +82,6 @@ public class CubeRequest {
this.cubeDescData = cubeDescData;
}
-
/**
* @return the cubeDescName
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/request/CubeSegmentRequest.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/request/CubeSegmentRequest.java b/server/src/main/java/org/apache/kylin/rest/request/CubeSegmentRequest.java
index b3d57d0..17122ad 100644
--- a/server/src/main/java/org/apache/kylin/rest/request/CubeSegmentRequest.java
+++ b/server/src/main/java/org/apache/kylin/rest/request/CubeSegmentRequest.java
@@ -81,7 +81,6 @@ public class CubeSegmentRequest {
this.cubeSegmentData = cubeSegmentData;
}
-
/**
* @return the cubeDescName
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/request/ModelRequest.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/request/ModelRequest.java b/server/src/main/java/org/apache/kylin/rest/request/ModelRequest.java
index 15b62cf..dc8e06e 100644
--- a/server/src/main/java/org/apache/kylin/rest/request/ModelRequest.java
+++ b/server/src/main/java/org/apache/kylin/rest/request/ModelRequest.java
@@ -73,8 +73,6 @@ public class ModelRequest {
this.modelDescData = modelDescData;
}
-
-
public String getModelDescData() {
return modelDescData;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/request/SQLRequest.java b/server/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
index 901badd..a1d17f9 100644
--- a/server/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
+++ b/server/src/main/java/org/apache/kylin/rest/request/SQLRequest.java
@@ -28,7 +28,7 @@ public class SQLRequest {
private Integer limit = 0;
private boolean acceptPartial = true;
- private Map<String,String> backdoorToggles;
+ private Map<String, String> backdoorToggles;
public SQLRequest() {
}
@@ -41,7 +41,6 @@ public class SQLRequest {
this.backdoorToggles = backdoorToggles;
}
-
public String getProject() {
return project;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java b/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
index 302cb02..607d61a 100644
--- a/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
+++ b/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
@@ -87,16 +87,22 @@ public class HBaseResponse implements Serializable {
* @param segmentStartTime
* the segmentStartTime to set
*/
- public void setDateRangeStart(long dateRangeStart) { this.dateRangeStart = dateRangeStart; }
+ public void setDateRangeStart(long dateRangeStart) {
+ this.dateRangeStart = dateRangeStart;
+ }
/**
* @return the segmentEndTime
*/
- public long getDateRangeEnd() { return dateRangeEnd; }
+ public long getDateRangeEnd() {
+ return dateRangeEnd;
+ }
/**
* @param segmentEndTime
* the segmentEndTime to set
*/
- public void setDateRangeEnd(long dateRangeEnd) { this.dateRangeEnd = dateRangeEnd; }
+ public void setDateRangeEnd(long dateRangeEnd) {
+ this.dateRangeEnd = dateRangeEnd;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java b/server/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java
index f65e42a..fc663dd 100644
--- a/server/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java
+++ b/server/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java
@@ -21,9 +21,10 @@ package org.apache.kylin.rest.response;
import java.util.HashMap;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.kylin.metadata.model.TableDesc;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* A response class to wrap TableDesc
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/AclHBaseStorage.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/AclHBaseStorage.java b/server/src/main/java/org/apache/kylin/rest/security/AclHBaseStorage.java
index edddba1..f583408 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/AclHBaseStorage.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/AclHBaseStorage.java
@@ -1,9 +1,9 @@
package org.apache.kylin.rest.security;
-import org.apache.hadoop.hbase.client.HTableInterface;
-
import java.io.IOException;
+import org.apache.hadoop.hbase.client.HTableInterface;
+
/**
*/
public interface AclHBaseStorage {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java b/server/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
index 346b2fe..7983fc0 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
@@ -21,13 +21,12 @@ package org.apache.kylin.rest.security;
import java.util.HashSet;
import java.util.Set;
+import org.apache.kylin.rest.constant.Constant;
import org.springframework.ldap.core.ContextSource;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
-import org.apache.kylin.rest.constant.Constant;
-
/**
* @author xduo
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java b/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
index f8d9902..eb870cf 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
@@ -1,12 +1,12 @@
package org.apache.kylin.rest.security;
+import java.io.IOException;
+
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.kylin.rest.service.AclService;
import org.apache.kylin.rest.service.UserService;
import org.h2.util.StringUtils;
-import java.io.IOException;
-
/**
*/
public class MockAclHBaseStorage implements AclHBaseStorage {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/MockHTable.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/MockHTable.java b/server/src/main/java/org/apache/kylin/rest/security/MockHTable.java
index eb72f64..99737a0 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/MockHTable.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/MockHTable.java
@@ -12,25 +12,46 @@
package org.apache.kylin.rest.security;
-import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
-import com.google.protobuf.Service;
-import com.google.protobuf.ServiceException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.TreeMap;
+
import org.apache.commons.lang.NotImplementedException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.client.Append;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Durability;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Increment;
+import org.apache.hadoop.hbase.client.Mutation;
+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.Row;
+import org.apache.hadoop.hbase.client.RowMutations;
+import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.coprocessor.Batch;
import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
import org.apache.hadoop.hbase.util.Bytes;
-import java.io.IOException;
-import java.util.*;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.Message;
+import com.google.protobuf.Service;
+import com.google.protobuf.ServiceException;
/**
* MockHTable.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java b/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
index d034eca..b8ccbeb 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
@@ -24,13 +24,12 @@ import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.codec.binary.Base64;
+import org.apache.kylin.common.KylinConfig;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.apache.kylin.common.KylinConfig;
-
/**
* @author xduo
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java b/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
index 08b027b..0cf3822 100644
--- a/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
+++ b/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
@@ -1,5 +1,7 @@
package org.apache.kylin.rest.security;
+import java.io.IOException;
+
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.rest.service.AclService;
@@ -7,8 +9,6 @@ import org.apache.kylin.rest.service.UserService;
import org.apache.kylin.storage.hbase.HBaseConnection;
import org.h2.util.StringUtils;
-import java.io.IOException;
-
/**
*/
public class RealAclHBaseStorage implements AclHBaseStorage {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/service/AccessService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/AccessService.java b/server/src/main/java/org/apache/kylin/rest/service/AccessService.java
index 0bfd648..cd93eba 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/AccessService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/AccessService.java
@@ -18,6 +18,10 @@
package org.apache.kylin.rest.service;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.kylin.common.persistence.AclEntity;
import org.apache.kylin.common.persistence.RootPersistentEntity;
import org.apache.kylin.rest.constant.Constant;
@@ -30,17 +34,20 @@ import org.springframework.security.acls.domain.BasePermission;
import org.springframework.security.acls.domain.GrantedAuthoritySid;
import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid;
-import org.springframework.security.acls.model.*;
+import org.springframework.security.acls.model.AccessControlEntry;
+import org.springframework.security.acls.model.Acl;
+import org.springframework.security.acls.model.AlreadyExistsException;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.NotFoundException;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
/**
* @author xduo
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/service/AclService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/AclService.java b/server/src/main/java/org/apache/kylin/rest/service/AclService.java
index 981205c..58e093c 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/AclService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/AclService.java
@@ -18,10 +18,26 @@
package org.apache.kylin.rest.service;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+
+import javax.annotation.PostConstruct;
+
import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+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.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
import org.apache.kylin.common.util.Bytes;
@@ -30,19 +46,32 @@ import org.apache.kylin.rest.util.Serializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.acls.domain.*;
-import org.springframework.security.acls.model.*;
+import org.springframework.security.acls.domain.AccessControlEntryImpl;
+import org.springframework.security.acls.domain.AclAuthorizationStrategy;
+import org.springframework.security.acls.domain.AclImpl;
+import org.springframework.security.acls.domain.AuditLogger;
+import org.springframework.security.acls.domain.GrantedAuthoritySid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PermissionFactory;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.AccessControlEntry;
+import org.springframework.security.acls.model.Acl;
+import org.springframework.security.acls.model.AlreadyExistsException;
+import org.springframework.security.acls.model.ChildrenExistException;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.NotFoundException;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.PermissionGrantingStrategy;
+import org.springframework.security.acls.model.Sid;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.util.FieldUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
-import javax.annotation.PostConstruct;
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.*;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
/**
* @author xduo
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1ae21c00/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
index e5ab1f0..9df417a 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
@@ -26,16 +26,15 @@ import java.util.Properties;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.job.hadoop.cube.StorageCleanupJob;
+import org.apache.kylin.rest.constant.Constant;
import org.apache.kylin.rest.exception.InternalErrorException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.job.hadoop.cube.StorageCleanupJob;
-import org.apache.kylin.rest.constant.Constant;
-
/**
* @author jianliu
*/