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/04 05:46:50 UTC
[09/15] incubator-kylin git commit: KYLIN-922 Enforce same code style
for both intellij and eclipse user
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/CubeDescUpgrader.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeDescUpgrader.java b/cube/src/main/java/org/apache/kylin/cube/CubeDescUpgrader.java
index 9353cfc..cdc1e51 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeDescUpgrader.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeDescUpgrader.java
@@ -18,34 +18,35 @@
package org.apache.kylin.cube;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.Serializer;
+import org.apache.kylin.cube.model.DimensionDesc;
import org.apache.kylin.cube.model.HierarchyDesc;
import org.apache.kylin.cube.model.RowKeyColDesc;
import org.apache.kylin.cube.model.RowKeyDesc;
-import org.apache.kylin.cube.model.DimensionDesc;
import org.apache.kylin.cube.model.v1.CubeDesc;
import org.apache.kylin.cube.model.v1.CubePartitionDesc;
import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.metadata.model.JoinDesc;
import org.apache.kylin.metadata.model.LookupDesc;
-import org.apache.kylin.metadata.model.TableDesc;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kylin.metadata.model.PartitionDesc;
+import org.apache.kylin.metadata.model.TableDesc;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
public class CubeDescUpgrader {
@@ -84,7 +85,7 @@ public class CubeDescUpgrader {
for (LookupDesc lookupDesc : modelDesc.getLookups()) {
if (lookupDesc.getJoin() != null) {
JoinDesc join = lookupDesc.getJoin();
- for (int i=0; i< join.getForeignKey().length; i++) {
+ for (int i = 0; i < join.getForeignKey().length; i++) {
pkToFK.put(join.getPrimaryKey()[i], join.getForeignKey()[i]);
}
}
@@ -101,14 +102,13 @@ public class CubeDescUpgrader {
}
for (String[] aggregationGroup : rowKey.getAggregationGroups()) {
- for (int i=0; i< aggregationGroup.length; i++) {
+ for (int i = 0; i < aggregationGroup.length; i++) {
if (pkToFK.containsKey(aggregationGroup[i])) {
aggregationGroup[i] = pkToFK.get(aggregationGroup[i]);
}
}
}
-
}
private void copyUnChangedProperties(CubeDesc oldModel, org.apache.kylin.cube.model.CubeDesc newModel) {
@@ -155,7 +155,7 @@ public class CubeDescUpgrader {
//column on fact table
newDim = newDimensionDesc(dim, dimId++, dim.getName());
newDimensions.add(newDim);
- newDim.setColumn(new String[]{dim.getColumn()});
+ newDim.setColumn(new String[] { dim.getColumn() });
needNameSuffix = true;
} else if (ArrayUtils.isEmpty(dim.getDerived()) && ArrayUtils.isEmpty(dim.getHierarchy())) {
// user defines a lookup table, but didn't use any column other than the pk, in this case, convert to use fact table's fk
@@ -227,7 +227,6 @@ public class CubeDescUpgrader {
dm.setFilterCondition(oldModel.getFilterCondition());
updatePartitionDesc(oldModel, dm);
-
if (oldModel.getCapacity() == CubeDesc.CubeCapacity.SMALL) {
dm.setCapacity(DataModelDesc.RealizationCapacity.SMALL);
} else if (oldModel.getCapacity() == CubeDesc.CubeCapacity.MEDIUM) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/CubeDimensionDeriver.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeDimensionDeriver.java b/cube/src/main/java/org/apache/kylin/cube/CubeDimensionDeriver.java
index dcdcfd5..f088767 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeDimensionDeriver.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeDimensionDeriver.java
@@ -18,11 +18,11 @@
package org.apache.kylin.cube;
-import org.apache.kylin.metadata.model.TblColRef;
-
import java.util.Collection;
import java.util.HashSet;
+import org.apache.kylin.metadata.model.TblColRef;
+
/**
* Created by Hongbin Ma(Binmahone) on 1/8/15.
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java b/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 7accada..ad0bb28 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -88,9 +88,9 @@ public class CubeInstance extends RootPersistentEntity implements IRealization {
@JsonProperty("retention_range")
private long retentionRange = 0;
-
+
private String projectName;
-
+
public List<CubeSegment> getBuildingSegments() {
List<CubeSegment> buildingSegments = new ArrayList<CubeSegment>();
if (null != segments) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 6994e02..df0d0d5 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -18,18 +18,25 @@
package org.apache.kylin.cube;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.lang3.StringUtils;
-import org.apache.kylin.common.util.Pair;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.Serializer;
import org.apache.kylin.common.restclient.Broadcaster;
import org.apache.kylin.common.restclient.CaseInsensitiveStringCache;
+import org.apache.kylin.common.util.Pair;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.DimensionDesc;
@@ -46,14 +53,17 @@ import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.metadata.project.ProjectManager;
-import org.apache.kylin.metadata.realization.*;
+import org.apache.kylin.metadata.realization.IRealization;
+import org.apache.kylin.metadata.realization.IRealizationConstants;
+import org.apache.kylin.metadata.realization.IRealizationProvider;
+import org.apache.kylin.metadata.realization.RealizationStatusEnum;
+import org.apache.kylin.metadata.realization.RealizationType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
/**
* @author yangli9
@@ -286,7 +296,6 @@ public class CubeManager implements IRealizationProvider {
return newSegment;
}
-
public CubeSegment refreshSegment(CubeInstance cube, long startDate, long endDate) throws IOException {
checkNoBuildingSegment(cube);
@@ -550,7 +559,7 @@ public class CubeManager implements IRealizationProvider {
CubeSegment firstSeg = tobe.get(0);
firstSeg.validate();
- for (int i = 0, j = 1; j < tobe.size(); ) {
+ for (int i = 0, j = 1; j < tobe.size();) {
CubeSegment is = tobe.get(i);
CubeSegment js = tobe.get(j);
js.validate();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeSegment.java b/cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 00821a4..a3edcd9 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -24,17 +24,18 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ConcurrentHashMap;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Objects;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.dict.ISegment;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TblColRef;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class CubeSegment implements Comparable<CubeSegment>, ISegment {
@@ -176,7 +177,6 @@ public class CubeSegment implements Comparable<CubeSegment>, ISegment {
this.lastBuildJobID = lastBuildJobID;
}
-
public long getCreateTimeUTC() {
return createTimeUTC;
}
@@ -327,7 +327,6 @@ public class CubeSegment implements Comparable<CubeSegment>, ISegment {
return Objects.toStringHelper(this).add("uuid", uuid).add("create_time_utc:", createTimeUTC).add("name", name).add("last_build_job_id", lastBuildJobID).add("status", status).toString();
}
-
public void setDictionaries(ConcurrentHashMap<String, String> dictionaries) {
this.dictionaries = dictionaries;
}
@@ -335,5 +334,5 @@ public class CubeSegment implements Comparable<CubeSegment>, ISegment {
public void setSnapshots(ConcurrentHashMap<String, String> snapshots) {
this.snapshots = snapshots;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java b/cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
index feb0f1a..c8b58bf 100644
--- a/cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
+++ b/cube/src/main/java/org/apache/kylin/cube/cli/DictionaryGeneratorCLI.java
@@ -20,16 +20,15 @@ package org.apache.kylin.cube.cli;
import java.io.IOException;
-import org.apache.kylin.cube.model.DimensionDesc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.cube.CubeSegment;
+import org.apache.kylin.cube.model.DimensionDesc;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TblColRef;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DictionaryGeneratorCLI {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/common/RowKeySplitter.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/common/RowKeySplitter.java b/cube/src/main/java/org/apache/kylin/cube/common/RowKeySplitter.java
index 48db0d8..7e379dd 100644
--- a/cube/src/main/java/org/apache/kylin/cube/common/RowKeySplitter.java
+++ b/cube/src/main/java/org/apache/kylin/cube/common/RowKeySplitter.java
@@ -18,9 +18,8 @@
package org.apache.kylin.cube.common;
-import org.apache.kylin.common.util.SplittedBytes;
import org.apache.kylin.common.util.Bytes;
-
+import org.apache.kylin.common.util.SplittedBytes;
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.kv.RowConstants;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
index 488091a..8a2fb79 100644
--- a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
+++ b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
@@ -28,7 +28,6 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.kylin.common.util.Bytes;
-
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.RowKeyColDesc;
import org.apache.kylin.cube.model.RowKeyDesc;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/cuboid/CuboidScheduler.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/cuboid/CuboidScheduler.java b/cube/src/main/java/org/apache/kylin/cube/cuboid/CuboidScheduler.java
index 6f64116..ad0ca32 100644
--- a/cube/src/main/java/org/apache/kylin/cube/cuboid/CuboidScheduler.java
+++ b/cube/src/main/java/org/apache/kylin/cube/cuboid/CuboidScheduler.java
@@ -22,6 +22,7 @@ package org.apache.kylin.cube.cuboid;
* @author George Song (ysong1)
*
*/
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/estimation/CubeSizeEstimationCLI.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/estimation/CubeSizeEstimationCLI.java b/cube/src/main/java/org/apache/kylin/cube/estimation/CubeSizeEstimationCLI.java
index 9a654b7..4057c82 100644
--- a/cube/src/main/java/org/apache/kylin/cube/estimation/CubeSizeEstimationCLI.java
+++ b/cube/src/main/java/org/apache/kylin/cube/estimation/CubeSizeEstimationCLI.java
@@ -33,9 +33,9 @@ import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.DimensionDesc;
import org.apache.kylin.cube.model.HierarchyDesc;
import org.apache.kylin.cube.model.RowKeyColDesc;
-import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.cube.model.RowKeyDesc;
import org.apache.kylin.metadata.model.DataType;
+import org.apache.kylin.metadata.model.MeasureDesc;
/**
* Created by honma on 9/1/14.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/kv/AbstractRowKeyEncoder.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/kv/AbstractRowKeyEncoder.java b/cube/src/main/java/org/apache/kylin/cube/kv/AbstractRowKeyEncoder.java
index ddfbab3..f566f5c 100644
--- a/cube/src/main/java/org/apache/kylin/cube/kv/AbstractRowKeyEncoder.java
+++ b/cube/src/main/java/org/apache/kylin/cube/kv/AbstractRowKeyEncoder.java
@@ -22,13 +22,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.metadata.model.TblColRef;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyColumnIO.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyColumnIO.java b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyColumnIO.java
index ccbc686..2bf101e 100644
--- a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyColumnIO.java
+++ b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyColumnIO.java
@@ -20,14 +20,13 @@ package org.apache.kylin.cube.kv;
import java.util.Arrays;
-import org.apache.kylin.dict.ISegment;
import org.apache.kylin.common.util.Bytes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.kylin.common.util.BytesUtil;
import org.apache.kylin.dict.Dictionary;
+import org.apache.kylin.dict.ISegment;
import org.apache.kylin.metadata.model.TblColRef;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Read/Write column values from/into bytes
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyDecoder.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyDecoder.java b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyDecoder.java
index b3bf7f2..f34e675 100644
--- a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyDecoder.java
+++ b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyDecoder.java
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.kylin.common.util.SplittedBytes;
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.common.RowKeySplitter;
-import org.apache.kylin.common.util.SplittedBytes;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.metadata.model.TblColRef;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyEncoder.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyEncoder.java b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyEncoder.java
index 5b6cd91..7f8bbd3 100644
--- a/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyEncoder.java
+++ b/cube/src/main/java/org/apache/kylin/cube/kv/RowKeyEncoder.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import org.apache.kylin.common.util.Bytes;
-
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.metadata.model.TblColRef;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/kv/RowValueDecoder.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/kv/RowValueDecoder.java b/cube/src/main/java/org/apache/kylin/cube/kv/RowValueDecoder.java
index eeffdf5..9ec98f3 100644
--- a/cube/src/main/java/org/apache/kylin/cube/kv/RowValueDecoder.java
+++ b/cube/src/main/java/org/apache/kylin/cube/kv/RowValueDecoder.java
@@ -28,11 +28,10 @@ import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
-
import org.apache.kylin.cube.model.HBaseColumnDesc;
import org.apache.kylin.metadata.measure.MeasureCodec;
-import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index ff0ca04..172a924 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.net.util.Base64;
@@ -56,6 +55,7 @@ import org.apache.kylin.metadata.model.TblColRef;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.collect.Lists;
@@ -118,7 +118,7 @@ public class CubeDesc extends RootPersistentEntity {
/*
* this field will not be serialized ,can be deserialized to front javascript
*/
- private long retentionRange;
+ private long retentionRange;
private Map<String, Map<String, TblColRef>> columnMap = new HashMap<String, Map<String, TblColRef>>();
private LinkedHashSet<TblColRef> allColumns = new LinkedHashSet<TblColRef>();
@@ -626,7 +626,7 @@ public class CubeDesc extends RootPersistentEntity {
if (m.getDependentMeasureRef() != null) {
m.setDependentMeasureRef(m.getDependentMeasureRef().toUpperCase());
}
-
+
FunctionDesc f = m.getFunction();
f.setExpression(f.getExpression().toUpperCase());
f.initReturnDataType();
@@ -645,7 +645,7 @@ public class CubeDesc extends RootPersistentEntity {
if (colRefs.isEmpty() == false)
p.setColRefs(colRefs);
}
-
+
// verify holistic count distinct as a dependent measure
if (m.isHolisticCountDistinct() && StringUtils.isBlank(m.getDependentMeasureRef())) {
throw new IllegalStateException(m + " is a holistic count distinct but it has no DependentMeasureRef defined!");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
index 85fe45b..981fdc6 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java
@@ -23,15 +23,16 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.kylin.common.util.StringUtil;
import org.apache.kylin.metadata.model.JoinDesc;
import org.apache.kylin.metadata.model.LookupDesc;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.TblColRef;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Created with IntelliJ IDEA. User: lukhan Date: 9/24/13 Time: 10:40 AM To
* change this template use File | Settings | File Templates.
@@ -107,7 +108,7 @@ public class DimensionDesc {
if (derived != null) {
StringUtil.toUpperCaseArray(derived, derived);
}
-
+
if (derived != null && join == null) {
throw new IllegalStateException("Derived can only be defined on lookup table, cube " + cubeDesc + ", " + this);
}
@@ -123,7 +124,7 @@ public class DimensionDesc {
}
return false;
}
-
+
public boolean isDerived() {
return derived != null;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/HBaseColumnDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/HBaseColumnDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/HBaseColumnDesc.java
index f31c289..3e3481c 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/HBaseColumnDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/HBaseColumnDesc.java
@@ -20,11 +20,12 @@ package org.apache.kylin.cube.model;
import java.util.Arrays;
+import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.metadata.model.MeasureDesc;
-import org.apache.kylin.metadata.model.FunctionDesc;
/**
* Created with IntelliJ IDEA. User: lukhan Date: 9/30/13 Time: 10:57 AM To
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
index f7eb20e..6b46824 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
@@ -22,12 +22,13 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
+import org.apache.kylin.common.util.StringUtil;
+import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.common.util.StringUtil;
-import org.apache.kylin.metadata.model.MeasureDesc;
-import org.apache.kylin.metadata.model.FunctionDesc;
/**
* Created with IntelliJ IDEA. User: lukhan Date: 9/24/13 Time: 10:44 AM To
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/HierarchyDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/HierarchyDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/HierarchyDesc.java
index 588c2f3..81d2509 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/HierarchyDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/HierarchyDesc.java
@@ -18,10 +18,11 @@
package org.apache.kylin.cube.model;
+import org.apache.kylin.metadata.model.TblColRef;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.metadata.model.TblColRef;
/**
* Created with IntelliJ IDEA. User: lukhan Date: 9/24/13 Time: 10:46 AM To
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
index b3a2253..17c75b8 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
@@ -18,10 +18,11 @@
package org.apache.kylin.cube.model;
+import org.apache.kylin.metadata.model.TblColRef;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.metadata.model.TblColRef;
/**
* @author yangli9
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
index 0d2c238..1ebe88d 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
@@ -27,12 +27,12 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
+import org.apache.kylin.common.util.StringUtil;
+import org.apache.kylin.metadata.model.TblColRef;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.common.util.StringUtil;
-import org.apache.kylin.metadata.model.TblColRef;
/**
* Created by lukhan on 1/2/14.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeInstance.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeInstance.java b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeInstance.java
index 65547e2..5ee6544 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeInstance.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeInstance.java
@@ -22,6 +22,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.kylin.common.KylinConfig;
+import org.apache.kylin.common.persistence.ResourceStore;
+import org.apache.kylin.common.persistence.RootPersistentEntity;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -29,9 +33,6 @@ import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.persistence.ResourceStore;
-import org.apache.kylin.common.persistence.RootPersistentEntity;
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class CubeInstance extends RootPersistentEntity {
@@ -163,10 +164,9 @@ public class CubeInstance extends RootPersistentEntity {
}
}
-// public CubeDesc getDescriptor() {
-// return CubeDescManager.getInstance(config).getCubeDesc(descName);
-// }
-
+ // public CubeDesc getDescriptor() {
+ // return CubeDescManager.getInstance(config).getCubeDesc(descName);
+ // }
public boolean isReady() {
return getStatus() == CubeStatusEnum.READY;
@@ -361,7 +361,7 @@ public class CubeInstance extends RootPersistentEntity {
public long[] getDateRange() {
List<CubeSegment> readySegments = getSegment(CubeSegmentStatusEnum.READY);
if (readySegments.isEmpty()) {
- return new long[]{0L, 0L};
+ return new long[] { 0L, 0L };
}
long start = Long.MAX_VALUE;
long end = Long.MIN_VALUE;
@@ -373,55 +373,55 @@ public class CubeInstance extends RootPersistentEntity {
end = segment.getDateRangeEnd();
}
}
- return new long[]{start, end};
- }
-
-// private boolean appendOnHll() {
-// CubePartitionDesc cubePartitionDesc = getDescriptor().getCubePartitionDesc();
-// if (cubePartitionDesc == null) {
-// return false;
-// }
-// if (cubePartitionDesc.getPartitionDateColumn() == null) {
-// return false;
-// }
-// if (cubePartitionDesc.getCubePartitionType() != CubePartitionDesc.CubePartitionType.APPEND) {
-// return false;
-// }
-// return getDescriptor().hasHolisticCountDistinctMeasures();
-// }
-
-// public boolean appendBuildOnHllMeasure(long startDate, long endDate) {
-// if (!appendOnHll()) {
-// return false;
-// }
-// List<CubeSegment> readySegments = getSegment(CubeSegmentStatusEnum.READY);
-// if (readySegments.isEmpty()) {
-// return false;
-// }
-// for (CubeSegment readySegment: readySegments) {
-// if (readySegment.getDateRangeStart() == startDate && readySegment.getDateRangeEnd() == endDate) {
-// //refresh build
-// return false;
-// }
-// }
-// return true;
-// }
-
-// public boolean needMergeImmediatelyAfterBuild(CubeSegment segment) {
-// if (!appendOnHll()) {
-// return false;
-// }
-// List<CubeSegment> readySegments = getSegment(CubeSegmentStatusEnum.READY);
-// if (readySegments.isEmpty()) {
-// return false;
-// }
-// for (CubeSegment readySegment: readySegments) {
-// if (readySegment.getDateRangeEnd() > segment.getDateRangeStart()) {
-// //has overlap and not refresh
-// return true;
-// }
-// }
-// return false;
-// }
+ return new long[] { start, end };
+ }
+
+ // private boolean appendOnHll() {
+ // CubePartitionDesc cubePartitionDesc = getDescriptor().getCubePartitionDesc();
+ // if (cubePartitionDesc == null) {
+ // return false;
+ // }
+ // if (cubePartitionDesc.getPartitionDateColumn() == null) {
+ // return false;
+ // }
+ // if (cubePartitionDesc.getCubePartitionType() != CubePartitionDesc.CubePartitionType.APPEND) {
+ // return false;
+ // }
+ // return getDescriptor().hasHolisticCountDistinctMeasures();
+ // }
+
+ // public boolean appendBuildOnHllMeasure(long startDate, long endDate) {
+ // if (!appendOnHll()) {
+ // return false;
+ // }
+ // List<CubeSegment> readySegments = getSegment(CubeSegmentStatusEnum.READY);
+ // if (readySegments.isEmpty()) {
+ // return false;
+ // }
+ // for (CubeSegment readySegment: readySegments) {
+ // if (readySegment.getDateRangeStart() == startDate && readySegment.getDateRangeEnd() == endDate) {
+ // //refresh build
+ // return false;
+ // }
+ // }
+ // return true;
+ // }
+
+ // public boolean needMergeImmediatelyAfterBuild(CubeSegment segment) {
+ // if (!appendOnHll()) {
+ // return false;
+ // }
+ // List<CubeSegment> readySegments = getSegment(CubeSegmentStatusEnum.READY);
+ // if (readySegments.isEmpty()) {
+ // return false;
+ // }
+ // for (CubeSegment readySegment: readySegments) {
+ // if (readySegment.getDateRangeEnd() > segment.getDateRangeStart()) {
+ // //has overlap and not refresh
+ // return true;
+ // }
+ // }
+ // return false;
+ // }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/v1/CubePartitionDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubePartitionDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubePartitionDesc.java
index a5818ca..89bf70d 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubePartitionDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubePartitionDesc.java
@@ -20,10 +20,11 @@ package org.apache.kylin.cube.model.v1;
import java.util.Map;
+import org.apache.kylin.metadata.model.TblColRef;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.metadata.model.TblColRef;
/**
* @author xduo
@@ -57,7 +58,7 @@ public class CubePartitionDesc {
}
}
}
-
+
public boolean isPartitioned() {
return partitionDateColumnRef != null;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeSegment.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeSegment.java b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeSegment.java
index 392642b..aea429d 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeSegment.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/v1/CubeSegment.java
@@ -24,12 +24,13 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.kylin.metadata.model.TblColRef;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;
-import org.apache.kylin.metadata.model.TblColRef;
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class CubeSegment implements Comparable<CubeSegment> {
@@ -70,9 +71,9 @@ public class CubeSegment implements Comparable<CubeSegment> {
@JsonProperty("snapshots")
private ConcurrentHashMap<String, String> snapshots; // table name ==> snapshot resource path
-// public CubeDesc getCubeDesc() {
-// return getCubeInstance().getDescriptor();
-// }
+ // public CubeDesc getCubeDesc() {
+ // return getCubeInstance().getDescriptor();
+ // }
/**
* @param startDate
@@ -93,7 +94,6 @@ public class CubeSegment implements Comparable<CubeSegment> {
// ============================================================================
-
public String getUuid() {
return uuid;
}
@@ -298,12 +298,6 @@ public class CubeSegment implements Comparable<CubeSegment> {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("uuid", uuid)
- .add("create_time:", createTime)
- .add("name", name)
- .add("last_build_job_id", lastBuildJobID)
- .add("status", status)
- .toString();
+ return Objects.toStringHelper(this).add("uuid", uuid).add("create_time:", createTime).add("name", name).add("last_build_job_id", lastBuildJobID).add("status", status).toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/v1/DimensionDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/v1/DimensionDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/v1/DimensionDesc.java
index da0d0fa..de6233c 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/v1/DimensionDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/v1/DimensionDesc.java
@@ -21,15 +21,16 @@ package org.apache.kylin.cube.model.v1;
import java.util.Arrays;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.kylin.common.util.StringUtil;
import org.apache.kylin.cube.model.HierarchyDesc;
import org.apache.kylin.metadata.model.JoinDesc;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.TblColRef;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Created with IntelliJ IDEA. User: lukhan Date: 9/24/13 Time: 10:40 AM To
* change this template use File | Settings | File Templates.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/v1/ProjectInstance.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/v1/ProjectInstance.java b/cube/src/main/java/org/apache/kylin/cube/model/v1/ProjectInstance.java
index 16d193e..e8757b1 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/v1/ProjectInstance.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/v1/ProjectInstance.java
@@ -23,13 +23,14 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.RootPersistentEntity;
import org.apache.kylin.metadata.project.ProjectStatusEnum;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Project is a concept in Kylin similar to schema in DBMS
*/
@@ -47,7 +48,6 @@ public class ProjectInstance extends RootPersistentEntity {
@JsonProperty("tables")
private Set<String> tables;
-
@JsonProperty("owner")
private String owner;
@@ -162,7 +162,6 @@ public class ProjectInstance extends RootPersistentEntity {
return cubes;
}
-
public void setCubes(List<String> cubes) {
this.cubes = cubes;
}
@@ -216,7 +215,6 @@ public class ProjectInstance extends RootPersistentEntity {
this.lastUpdateTime = formatTime(timeMillis);
}
-
public void init() {
if (name == null)
name = ProjectInstance.DEFAULT_PROJECT_NAME;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
index 70f0b2f..80bd2f7 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
@@ -25,19 +25,18 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.cube.model.validation.IValidatorRule;
import org.apache.kylin.cube.model.validation.ResultLevel;
import org.apache.kylin.cube.model.validation.ValidateContext;
-import org.apache.kylin.metadata.model.MeasureDesc;
-import org.apache.kylin.cube.model.validation.IValidatorRule;
import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.ColumnDesc;
import org.apache.kylin.metadata.model.DataType;
-import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.model.ParameterDesc;
+import org.apache.kylin.metadata.model.TableDesc;
/**
* Validate function parameter. Ticket:
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/MandatoryColumnRule.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/MandatoryColumnRule.java b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/MandatoryColumnRule.java
index 0057a7f..4585900 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/MandatoryColumnRule.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/MandatoryColumnRule.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang.ArrayUtils;
-
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.RowKeyColDesc;
import org.apache.kylin.cube.model.validation.IValidatorRule;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/RowKeyAttrRule.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/RowKeyAttrRule.java b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/RowKeyAttrRule.java
index 5cd0343..e90f6cd 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/RowKeyAttrRule.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/validation/rule/RowKeyAttrRule.java
@@ -19,7 +19,6 @@
package org.apache.kylin.cube.model.validation.rule;
import org.apache.commons.lang.StringUtils;
-
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.RowKeyColDesc;
import org.apache.kylin.cube.model.RowKeyDesc;
@@ -55,17 +54,17 @@ public class RowKeyAttrRule implements IValidatorRule<CubeDesc> {
context.addResult(ResultLevel.ERROR, "Rowkey columns do not exist");
return;
}
- if(rcd.length == 0){
+ if (rcd.length == 0) {
context.addResult(ResultLevel.ERROR, "Rowkey columns is empty");
- return;
+ return;
}
for (int i = 0; i < rcd.length; i++) {
RowKeyColDesc rd = rcd[i];
- if (rd.getLength() != 0 && (!StringUtils.isEmpty(rd.getDictionary())&&!rd.getDictionary().equals("false"))) {
+ if (rd.getLength() != 0 && (!StringUtils.isEmpty(rd.getDictionary()) && !rd.getDictionary().equals("false"))) {
context.addResult(ResultLevel.ERROR, "Rowkey column " + rd.getColumn() + " must not have both 'length' and 'dictionary' attribute");
}
- if (rd.getLength() == 0 && (StringUtils.isEmpty(rd.getDictionary())||rd.getDictionary().equals("false"))) {
+ if (rd.getLength() == 0 && (StringUtils.isEmpty(rd.getDictionary()) || rd.getDictionary().equals("false"))) {
context.addResult(ResultLevel.ERROR, "Rowkey column " + rd.getColumn() + " must not have both 'length' and 'dictionary' empty");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/AggregationGroupSizeRuleTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/AggregationGroupSizeRuleTest.java b/cube/src/test/java/org/apache/kylin/cube/AggregationGroupSizeRuleTest.java
index 57d710c..e7914c7 100644
--- a/cube/src/test/java/org/apache/kylin/cube/AggregationGroupSizeRuleTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/AggregationGroupSizeRuleTest.java
@@ -18,17 +18,17 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.cube.model.validation.IValidatorRule;
import org.apache.kylin.cube.model.validation.ValidateContext;
import org.apache.kylin.cube.model.validation.rule.AggregationGroupSizeRule;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.JsonUtil;
-import org.apache.kylin.cube.model.validation.IValidatorRule;
-
/**
* @author jianliu
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java b/cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java
index c130337..13fcd4a 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java
@@ -21,6 +21,8 @@ package org.apache.kylin.cube;
import java.util.HashMap;
import java.util.Map;
+import org.apache.kylin.common.util.JsonUtil;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.model.CubeDesc;
import org.junit.After;
import org.junit.Assert;
@@ -28,8 +30,6 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.Maps;
-import org.apache.kylin.common.util.JsonUtil;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
/**
* @author yangli9
@@ -60,22 +60,22 @@ public class CubeDescTest extends LocalFileMetadataTestCase {
CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()).getCubeDesc("test_kylin_cube_with_slr_desc");
Assert.assertNotNull(cubeDesc);
}
-
+
@Test
- public void testSerializeMap() throws Exception {
+ public void testSerializeMap() throws Exception {
Map<String, String> map = Maps.newHashMap();
map.put("key1", "value1");
map.put("key2", "value2");
-
+
String mapStr = JsonUtil.writeValueAsString(map);
-
+
System.out.println(mapStr);
-
+
Map<?, ?> map2 = JsonUtil.readValue(mapStr, HashMap.class);
-
+
Assert.assertEquals(map, map2);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/CubeManagerCacheTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeManagerCacheTest.java b/cube/src/test/java/org/apache/kylin/cube/CubeManagerCacheTest.java
index 5e64e01..ecdaada 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeManagerCacheTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeManagerCacheTest.java
@@ -18,19 +18,18 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import org.apache.kylin.common.persistence.ResourceStore;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.project.ProjectManager;
import org.apache.kylin.metadata.realization.RealizationStatusEnum;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.persistence.ResourceStore;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
-import org.apache.kylin.metadata.MetadataManager;
-
/**
* @author yangli9
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java b/cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
index 5c4d824..88f5e47 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
@@ -18,7 +18,8 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.ResourceStore;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java b/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
index 7afd1e3..dbd7c4e 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
@@ -18,12 +18,13 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.kylin.common.util.Pair;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.apache.kylin.common.util.Pair;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.junit.After;
import org.junit.Before;
@@ -72,7 +73,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
assertEquals(0, seg2.getDateRangeStart());
assertEquals(Long.MAX_VALUE, seg2.getDateRangeEnd());
assertEquals(2, cube.getSegments().size());
-
+
// non-partitioned cannot merge, throw exception
mgr.mergeSegments(cube, 0, Long.MAX_VALUE, false);
}
@@ -97,7 +98,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
assertEquals(2000, seg2.getDateRangeEnd());
assertEquals(SegmentStatusEnum.NEW, seg2.getStatus());
seg2.setStatus(SegmentStatusEnum.READY);
-
+
// merge first and second
CubeSegment merge = mgr.mergeSegments(cube, 0, 2000, true);
@@ -105,15 +106,15 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
assertEquals(0, merge.getDateRangeStart());
assertEquals(2000, merge.getDateRangeEnd());
assertEquals(SegmentStatusEnum.NEW, merge.getStatus());
-
+
// segments are strictly ordered
assertEquals(seg1, cube.getSegments().get(0));
assertEquals(merge, cube.getSegments().get(1));
assertEquals(seg2, cube.getSegments().get(2));
-
+
// drop the merge
cube.getSegments().remove(merge);
-
+
// try merge at start/end at middle of segments
CubeSegment merge2 = mgr.mergeSegments(cube, 500, 1500, true);
assertEquals(3, cube.getSegments().size());
@@ -135,7 +136,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
} catch (IllegalStateException ex) {
// expected, append and merge requires at least one segment
}
-
+
// append first
CubeSegment seg1 = mgr.appendSegments(cube, 1000);
seg1.setStatus(SegmentStatusEnum.READY);
@@ -152,13 +153,13 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
assertEquals(2000, seg2.getDateRangeEnd());
assertEquals(0, merge.getDateRangeStart());
assertEquals(2000, merge.getDateRangeEnd());
-
+
// segments are strictly ordered
assertEquals(seg1, cube.getSegments().get(0));
assertEquals(merge, cube.getSegments().get(1));
assertEquals(seg2, cube.getSegments().get(2));
}
-
+
private void discard(Object o) {
// throw away input parameter
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/CubeSizeEstimationCLITest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeSizeEstimationCLITest.java b/cube/src/test/java/org/apache/kylin/cube/CubeSizeEstimationCLITest.java
index 46773e7..04eb9b1 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeSizeEstimationCLITest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeSizeEstimationCLITest.java
@@ -18,14 +18,13 @@
package org.apache.kylin.cube;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.estimation.CubeSizeEstimationCLI;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.metadata.MetadataManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Created by honma on 9/1/14.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/DictionaryManagerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/DictionaryManagerTest.java b/cube/src/test/java/org/apache/kylin/cube/DictionaryManagerTest.java
index 246cd74..d7feb56 100644
--- a/cube/src/test/java/org/apache/kylin/cube/DictionaryManagerTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/DictionaryManagerTest.java
@@ -18,15 +18,11 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.HashSet;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.model.CubeDesc;
@@ -34,6 +30,10 @@ import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.dict.DictionaryInfo;
import org.apache.kylin.dict.DictionaryManager;
import org.apache.kylin.metadata.model.TblColRef;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class DictionaryManagerTest extends LocalFileMetadataTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/MandatoryColumnRuleTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/MandatoryColumnRuleTest.java b/cube/src/test/java/org/apache/kylin/cube/MandatoryColumnRuleTest.java
index 662694d..29b7183 100644
--- a/cube/src/test/java/org/apache/kylin/cube/MandatoryColumnRuleTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/MandatoryColumnRuleTest.java
@@ -18,16 +18,15 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
-
-import org.apache.kylin.cube.model.validation.ValidateContext;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.validation.IValidatorRule;
+import org.apache.kylin.cube.model.validation.ValidateContext;
import org.apache.kylin.cube.model.validation.rule.MandatoryColumnRule;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author jianliu
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/RowKeyAttrRuleTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/RowKeyAttrRuleTest.java b/cube/src/test/java/org/apache/kylin/cube/RowKeyAttrRuleTest.java
index d07c72a..000fa1d 100644
--- a/cube/src/test/java/org/apache/kylin/cube/RowKeyAttrRuleTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/RowKeyAttrRuleTest.java
@@ -18,17 +18,16 @@
package org.apache.kylin.cube;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import org.apache.kylin.common.util.JsonUtil;
+import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.cube.model.validation.IValidatorRule;
import org.apache.kylin.cube.model.validation.ValidateContext;
import org.apache.kylin.cube.model.validation.rule.RowKeyAttrRule;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.JsonUtil;
-import org.apache.kylin.cube.model.CubeDesc;
-import org.apache.kylin.cube.model.validation.IValidatorRule;
-
/**
* @author jianliu
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/common/BytesSplitterTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/common/BytesSplitterTest.java b/cube/src/test/java/org/apache/kylin/cube/common/BytesSplitterTest.java
index 916d84d..074d973 100644
--- a/cube/src/test/java/org/apache/kylin/cube/common/BytesSplitterTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/common/BytesSplitterTest.java
@@ -18,7 +18,7 @@
package org.apache.kylin.cube.common;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.apache.kylin.common.util.BytesSplitter;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/common/RowKeySplitterTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/common/RowKeySplitterTest.java b/cube/src/test/java/org/apache/kylin/cube/common/RowKeySplitterTest.java
index 92a3e37..9a7970c 100644
--- a/cube/src/test/java/org/apache/kylin/cube/common/RowKeySplitterTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/common/RowKeySplitterTest.java
@@ -18,16 +18,15 @@
package org.apache.kylin.cube.common;
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.metadata.MetadataManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/cuboid/CombinationTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/cuboid/CombinationTest.java b/cube/src/test/java/org/apache/kylin/cube/cuboid/CombinationTest.java
index 198f104..a69f179 100644
--- a/cube/src/test/java/org/apache/kylin/cube/cuboid/CombinationTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/cuboid/CombinationTest.java
@@ -18,7 +18,7 @@
package org.apache.kylin.cube.cuboid;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java b/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java
index ad60caa..83e8d94 100644
--- a/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java
@@ -18,21 +18,22 @@
package org.apache.kylin.cube.cuboid;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeDescManager;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.metadata.MetadataManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidTest.java b/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidTest.java
index 4914448..235edf2 100644
--- a/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidTest.java
@@ -18,17 +18,17 @@
package org.apache.kylin.cube.cuboid;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeDescManager;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.metadata.MetadataManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
-import org.apache.kylin.metadata.MetadataManager;
-
/**
* @author yangli9
*/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyDecoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyDecoderTest.java b/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyDecoderTest.java
index 968e8ab..a8dd965 100644
--- a/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyDecoderTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyDecoderTest.java
@@ -18,22 +18,21 @@
package org.apache.kylin.cube.kv;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.List;
import org.apache.kylin.common.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.metadata.MetadataManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyEncoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyEncoderTest.java b/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyEncoderTest.java
index c8164e4..c50b8c9 100644
--- a/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyEncoderTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/kv/RowKeyEncoderTest.java
@@ -18,22 +18,23 @@
package org.apache.kylin.cube.kv;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import org.apache.kylin.common.util.Bytes;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
+import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.metadata.MetadataManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.kylin.common.util.LocalFileMetadataTestCase;
-import org.apache.kylin.cube.cuboid.Cuboid;
-import org.apache.kylin.metadata.MetadataManager;
-
/**
* @author George Song (ysong1)
*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/kv/RowValueDecoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/kv/RowValueDecoderTest.java b/cube/src/test/java/org/apache/kylin/cube/kv/RowValueDecoderTest.java
index c61eb29..4e44d13 100644
--- a/cube/src/test/java/org/apache/kylin/cube/kv/RowValueDecoderTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/kv/RowValueDecoderTest.java
@@ -18,7 +18,7 @@
package org.apache.kylin.cube.kv;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
@@ -26,18 +26,17 @@ import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.io.LongWritable;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.cube.CubeManager;
-import org.apache.kylin.metadata.measure.MeasureCodec;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.HBaseColumnDesc;
-import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.MetadataManager;
+import org.apache.kylin.metadata.measure.MeasureCodec;
import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author George Song (ysong1)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/cube/project/ProjectManagerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/project/ProjectManagerTest.java b/cube/src/test/java/org/apache/kylin/cube/project/ProjectManagerTest.java
index 20f976b..faea24f 100644
--- a/cube/src/test/java/org/apache/kylin/cube/project/ProjectManagerTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/project/ProjectManagerTest.java
@@ -18,15 +18,12 @@
package org.apache.kylin.cube.project;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Set;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
@@ -38,6 +35,9 @@ import org.apache.kylin.metadata.project.ProjectInstance;
import org.apache.kylin.metadata.project.ProjectManager;
import org.apache.kylin.metadata.realization.IRealization;
import org.apache.kylin.metadata.realization.RealizationType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author xduo
@@ -69,7 +69,7 @@ public class ProjectManagerTest extends LocalFileMetadataTestCase {
ProjectManager prjMgr = ProjectManager.getInstance(getTestConfig());
CubeManager cubeMgr = CubeManager.getInstance(getTestConfig());
CubeDescManager cubeDescMgr = CubeDescManager.getInstance(getTestConfig());
-
+
int originalProjectCount = prjMgr.listAllProjects().size();
int originalCubeCount = cubeMgr.listAllCubes().size();
int originalCubeCountInDefault = prjMgr.listAllRealizations("default").size();
@@ -117,7 +117,7 @@ public class ProjectManagerTest extends LocalFileMetadataTestCase {
ProjectManager prjMgr = ProjectManager.getInstance(getTestConfig());
CubeManager cubeMgr = CubeManager.getInstance(getTestConfig());
CubeDescManager cubeDescMgr = CubeDescManager.getInstance(getTestConfig());
-
+
int originalProjectCount = prjMgr.listAllProjects().size();
int originalCubeCount = cubeMgr.listAllCubes().size();
ResourceStore store = getStore();
@@ -146,7 +146,7 @@ public class ProjectManagerTest extends LocalFileMetadataTestCase {
public void testProjectsDrop() throws IOException {
ProjectManager prjMgr = ProjectManager.getInstance(getTestConfig());
CubeManager cubeMgr = CubeManager.getInstance(getTestConfig());
-
+
CubeInstance cube = cubeMgr.getCube("test_kylin_cube_with_slr_empty");
assertTrue(prjMgr.getRealizationsByTable("default", "default.test_kylin_fact").contains(cube));
assertTrue(prjMgr.listAllRealizations("default").contains(cube));
@@ -161,7 +161,7 @@ public class ProjectManagerTest extends LocalFileMetadataTestCase {
public void testProjectsLoadAfterProjectChange() throws IOException {
ProjectManager prjMgr = ProjectManager.getInstance(getTestConfig());
CubeManager cubeMgr = CubeManager.getInstance(getTestConfig());
-
+
CubeInstance cube = cubeMgr.getCube("test_kylin_cube_with_slr_empty");
assertTrue(prjMgr.getRealizationsByTable("default", "default.test_kylin_fact").contains(cube));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/metadata/MetadataUpgradeTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/metadata/MetadataUpgradeTest.java b/cube/src/test/java/org/apache/kylin/metadata/MetadataUpgradeTest.java
index e8feb87..6eff233 100644
--- a/cube/src/test/java/org/apache/kylin/metadata/MetadataUpgradeTest.java
+++ b/cube/src/test/java/org/apache/kylin/metadata/MetadataUpgradeTest.java
@@ -20,15 +20,6 @@ package org.apache.kylin.metadata;
import java.util.List;
-import org.apache.kylin.metadata.model.DataModelDesc;
-import org.apache.kylin.metadata.model.TableDesc;
-import org.apache.kylin.metadata.project.ProjectManager;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
@@ -37,6 +28,13 @@ import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.DimensionDesc;
+import org.apache.kylin.metadata.model.DataModelDesc;
+import org.apache.kylin.metadata.model.TableDesc;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* Test the data model upgrade
@@ -63,8 +61,8 @@ public class MetadataUpgradeTest extends LocalFileMetadataTestCase {
MetadataManager.getInstance(config).reload();
CubeDescManager.clearCache();
CubeDescManager.getInstance(config);
-// CubeManager cubeManager = CubeManager.getInstance(config);
-// ProjectManager.getInstance(config);
+ // CubeManager cubeManager = CubeManager.getInstance(config);
+ // ProjectManager.getInstance(config);
}
@@ -73,23 +71,22 @@ public class MetadataUpgradeTest extends LocalFileMetadataTestCase {
MetadataManager metaMgr = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv());
TableDesc fact = metaMgr.getTableDesc("default.test_kylin_fact");
-
+
@SuppressWarnings("deprecation")
String oldResLocation = fact.getResourcePathV1();
String newResLocation = fact.getResourcePath();
-
+
ResourceStore store = ResourceStore.getStore(KylinConfig.getInstanceFromEnv());
-
+
Assert.assertTrue(store.exists(newResLocation));
Assert.assertTrue(!store.exists(oldResLocation));
-
-
+
String oldExdResLocation = TableDesc.concatExdResourcePath("test_kylin_fact".toUpperCase());
String newExdResLocation = TableDesc.concatExdResourcePath("default.test_kylin_fact".toUpperCase());
-
+
Assert.assertTrue(store.exists(newExdResLocation));
Assert.assertTrue(!store.exists(oldExdResLocation));
-
+
}
private void checkCubeDesc(String descName) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java b/cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
index ddb624e..be19c8e 100644
--- a/cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
+++ b/cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
@@ -18,7 +18,7 @@
package org.apache.kylin.metadata.measure;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
@@ -26,12 +26,11 @@ import java.util.Arrays;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.LongWritable;
-import org.junit.Test;
-
import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
import org.apache.kylin.cube.kv.RowConstants;
-import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.model.FunctionDesc;
+import org.apache.kylin.metadata.model.MeasureDesc;
+import org.junit.Test;
/**
* @author yangli9
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java b/dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java
index 3b5e88d..6476d68 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java
@@ -22,7 +22,6 @@ import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import org.apache.hadoop.io.Writable;
-
import org.apache.kylin.common.util.BytesUtil;
/**
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
index fc01b78..c2eb927 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
@@ -164,7 +164,7 @@ public class DictionaryManager {
logger.info("Use one of the merging dictionaries directly");
return dicts.get(0);
}
-
+
Dictionary<?> newDict = DictionaryGenerator.mergeDictionaries(newDictInfo, dicts);
return trySaveNewDict(newDict, newDictInfo);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/ISegment.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/ISegment.java b/dictionary/src/main/java/org/apache/kylin/dict/ISegment.java
index 872ae2d..b48a321 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/ISegment.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/ISegment.java
@@ -28,8 +28,8 @@ public interface ISegment {
public abstract int getColumnLength(TblColRef col);
public abstract Dictionary<?> getDictionary(TblColRef col);
-
+
public String getName();
-
+
public String getUuid();
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/FileTableReader.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/FileTableReader.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/FileTableReader.java
index 8674852..49cb6d3 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/FileTableReader.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/FileTableReader.java
@@ -29,17 +29,17 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.kylin.common.util.Bytes;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.Reader;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.util.ReflectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.common.util.HadoopUtil;
import org.apache.kylin.common.util.StringSplitter;
import org.apache.kylin.dict.lookup.ReadableTable.TableReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tables are typically CSV or SEQ file.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/HiveTable.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/HiveTable.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/HiveTable.java
index 2941861..73fb4f6 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/HiveTable.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/HiveTable.java
@@ -57,14 +57,14 @@ public class HiveTable implements ReadableTable {
Pair<Long, Long> sizeAndLastModified = FileTable.getSizeAndLastModified(path);
long size = sizeAndLastModified.getFirst();
long lastModified = sizeAndLastModified.getSecond();
-
+
// for non-native hive table, cannot rely on size & last modified on HDFS
if (getHiveClient().isNativeTable(database, hiveTable) == false) {
lastModified = System.currentTimeMillis(); // assume table is ever changing
}
return new TableSignature(path, size, lastModified);
-
+
} catch (Exception e) {
if (e instanceof IOException)
throw (IOException) e;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupBytesTable.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupBytesTable.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupBytesTable.java
index 701c2dd..2004ac6 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupBytesTable.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupBytesTable.java
@@ -20,9 +20,8 @@ package org.apache.kylin.dict.lookup;
import java.io.IOException;
-import org.apache.kylin.common.util.Bytes;
-
import org.apache.kylin.common.util.ByteArray;
+import org.apache.kylin.common.util.Bytes;
import org.apache.kylin.metadata.model.TableDesc;
/**
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupTable.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupTable.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupTable.java
index 7e83197..192abdf 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupTable.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/LookupTable.java
@@ -25,14 +25,13 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.kylin.common.util.Pair;
-
-import com.google.common.collect.Sets;
-
import org.apache.kylin.common.util.Array;
+import org.apache.kylin.common.util.Pair;
import org.apache.kylin.dict.lookup.ReadableTable.TableReader;
import org.apache.kylin.metadata.model.TableDesc;
+import com.google.common.collect.Sets;
+
/**
* An in-memory lookup table, in which each cell is an object of type T. The
* table is indexed by specified PK for fast lookup.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/ReadableTable.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/ReadableTable.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/ReadableTable.java
index fa4d9e3..03998a5 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/ReadableTable.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/ReadableTable.java
@@ -22,8 +22,8 @@ import java.io.Closeable;
import java.io.IOException;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
*/
@@ -44,11 +44,11 @@ public interface ReadableTable {
/** Get the current row. */
public String[] getRow();
-
+
}
-
+
// ============================================================================
-
+
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class TableSignature {
@@ -94,7 +94,6 @@ public interface ReadableTable {
return lastModifiedTime;
}
-
@Override
public int hashCode() {
final int prime = 31;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java b/dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java
index af2d2a0..8a61d76 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/lookup/SnapshotManager.java
@@ -22,13 +22,13 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.dict.lookup.ReadableTable.TableSignature;
import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.TableDesc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author yangli9