http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileAggFunc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileAggFunc.java b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileAggFunc.java index 2470891..d3cec8f 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileAggFunc.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileAggFunc.java @@ -20,7 +20,7 @@ package org.apache.kylin.measure.percentile; import org.apache.kylin.measure.ParamAsMeasureCount; -public class PercentileAggFunc implements ParamAsMeasureCount { +public class PercentileAggFunc implements ParamAsMeasureCount{ public static PercentileCounter init() { return null; }
http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileCounter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileCounter.java b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileCounter.java index dded4ce..f86a796 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileCounter.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileCounter.java @@ -107,7 +107,6 @@ public class PercentileCounter implements Serializable { out.writeInt(bound); out.write(buf.array(), 0, bound); } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); int bound = in.readInt(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileMeasureType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileMeasureType.java index b4ad5df..45ebe89 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileMeasureType.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/percentile/PercentileMeasureType.java @@ -71,8 +71,7 @@ public class PercentileMeasureType extends MeasureType<PercentileCounter> { PercentileCounter current = new PercentileCounter(dataType.getPrecision()); @Override - public PercentileCounter valueOf(String[] values, MeasureDesc measureDesc, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + public PercentileCounter valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> dictionaryMap) { PercentileCounter counter = current; counter.clear(); for (String v : values) { @@ -94,8 +93,7 @@ public class PercentileMeasureType extends MeasureType<PercentileCounter> { return true; } - static final Map<String, Class<?>> UDAF_MAP = ImmutableMap - .<String, Class<?>> of(PercentileMeasureType.FUNC_PERCENTILE, PercentileAggFunc.class); + static final Map<String, Class<?>> UDAF_MAP = ImmutableMap.<String, Class<?>> of(PercentileMeasureType.FUNC_PERCENTILE, PercentileAggFunc.class); @Override public Map<String, Class<?>> getRewriteCalciteAggrFunctions() { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawMeasureType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawMeasureType.java index c771e75..31f35e9 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawMeasureType.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawMeasureType.java @@ -108,8 +108,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> { //encode measure value to dictionary @Override - public List<ByteArray> valueOf(String[] values, MeasureDesc measureDesc, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + public List<ByteArray> valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> dictionaryMap) { if (values.length != 1) throw new IllegalArgumentException(); @@ -130,8 +129,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> { //merge measure dictionary @Override - public List<ByteArray> reEncodeDictionary(List<ByteArray> value, MeasureDesc measureDesc, - Map<TblColRef, Dictionary<String>> oldDicts, Map<TblColRef, Dictionary<String>> newDicts) { + public List<ByteArray> reEncodeDictionary(List<ByteArray> value, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> oldDicts, Map<TblColRef, Dictionary<String>> newDicts) { TblColRef colRef = getRawColumn(measureDesc.getFunction()); Dictionary<String> sourceDict = oldDicts.get(colRef); Dictionary<String> mergedDict = newDicts.get(colRef); @@ -169,8 +167,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> { return Collections.singletonList(literalCol); } - public CapabilityResult.CapabilityInfluence influenceCapabilityCheck(Collection<TblColRef> unmatchedDimensions, - Collection<FunctionDesc> unmatchedAggregations, SQLDigest digest, MeasureDesc measureDesc) { + public CapabilityResult.CapabilityInfluence influenceCapabilityCheck(Collection<TblColRef> unmatchedDimensions, Collection<FunctionDesc> unmatchedAggregations, SQLDigest digest, MeasureDesc measureDesc) { //is raw query if (!digest.isRawQuery) return null; @@ -231,8 +228,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> { } @Override - public IAdvMeasureFiller getAdvancedTupleFiller(FunctionDesc function, TupleInfo tupleInfo, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + public IAdvMeasureFiller getAdvancedTupleFiller(FunctionDesc function, TupleInfo tupleInfo, Map<TblColRef, Dictionary<String>> dictionaryMap) { final TblColRef literalCol = getRawColumn(function); final Dictionary<String> rawColDict = dictionaryMap.get(literalCol); final int literalTupleIdx = tupleInfo.hasColumn(literalCol) ? tupleInfo.getColumnIndex(literalCol) : -1; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawSerializer.java b/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawSerializer.java index b3cabfa..68a0273 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/raw/RawSerializer.java @@ -81,11 +81,9 @@ public class RawSerializer extends DataTypeSerializer<List<ByteArray>> { BytesUtil.writeVInt(values.size(), out); for (ByteArray array : values) { if (!out.hasRemaining() || out.remaining() < array.length()) { - throw new RuntimeException( - "BufferOverflow! Please use one higher cardinality column for dimension column when build RAW cube!"); + throw new RuntimeException("BufferOverflow! Please use one higher cardinality column for dimension column when build RAW cube!"); } - BytesUtil.writeByteArray( - BytesUtil.subarray(array.array(), array.offset(), array.offset() + array.length()), out); + BytesUtil.writeByteArray(BytesUtil.subarray(array.array(), array.offset(), array.offset() + array.length()), out); } } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/topn/Counter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/topn/Counter.java b/core-metadata/src/main/java/org/apache/kylin/measure/topn/Counter.java index 23f32e0..d8fdc6e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/topn/Counter.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/topn/Counter.java @@ -29,7 +29,7 @@ import java.io.Serializable; * * @param <T> */ -public class Counter<T> implements Externalizable, Serializable { +public class Counter<T> implements Externalizable, Serializable{ protected T item; protected double count; @@ -50,6 +50,7 @@ public class Counter<T> implements Externalizable, Serializable { this.count = count; } + public T getItem() { return item; } @@ -61,7 +62,6 @@ public class Counter<T> implements Externalizable, Serializable { public void setCount(double count) { this.count = count; } - @Override public String toString() { return item + ":" + count; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/measure/topn/TopNMeasureType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/topn/TopNMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/topn/TopNMeasureType.java index 7f74bed..f936cb8 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/topn/TopNMeasureType.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/topn/TopNMeasureType.java @@ -127,8 +127,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { private boolean needReEncode = true; @Override - public TopNCounter<ByteArray> valueOf(String[] values, MeasureDesc measureDesc, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + public TopNCounter<ByteArray> valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> dictionaryMap) { double counter = values[0] == null ? 0 : Double.parseDouble(values[0]); if (dimensionEncodings == null) { @@ -147,23 +146,20 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { int offset = 0; for (int i = 0; i < dimensionEncodings.length; i++) { if (values[i + 1] == null) { - Arrays.fill(key.array(), offset, offset + dimensionEncodings[i].getLengthOfEncoding(), - DimensionEncoding.NULL); + Arrays.fill(key.array(), offset, offset + dimensionEncodings[i].getLengthOfEncoding(), DimensionEncoding.NULL); } else { dimensionEncodings[i].encode(values[i + 1], key.array(), offset); } offset += dimensionEncodings[i].getLengthOfEncoding(); } - TopNCounter<ByteArray> topNCounter = new TopNCounter<ByteArray>( - dataType.getPrecision() * TopNCounter.EXTRA_SPACE_RATE); + TopNCounter<ByteArray> topNCounter = new TopNCounter<ByteArray>(dataType.getPrecision() * TopNCounter.EXTRA_SPACE_RATE); topNCounter.offer(key, counter); return topNCounter; } @Override - public TopNCounter<ByteArray> reEncodeDictionary(TopNCounter<ByteArray> value, MeasureDesc measureDesc, - Map<TblColRef, Dictionary<String>> oldDicts, Map<TblColRef, Dictionary<String>> newDicts) { + public TopNCounter<ByteArray> reEncodeDictionary(TopNCounter<ByteArray> value, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> oldDicts, Map<TblColRef, Dictionary<String>> newDicts) { TopNCounter<ByteArray> topNCounter = value; if (newDimensionEncodings == null) { @@ -200,8 +196,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { int offset = c.getItem().offset(); int innerBuffOffset = 0; for (int i = 0; i < dimensionEncodings.length; i++) { - String dimValue = dimensionEncodings[i].decode(c.getItem().array(), offset, - dimensionEncodings[i].getLengthOfEncoding()); + String dimValue = dimensionEncodings[i].decode(c.getItem().array(), offset, dimensionEncodings[i].getLengthOfEncoding()); newDimensionEncodings[i].encode(dimValue, newIdBuf, bufOffset + innerBuffOffset); innerBuffOffset += newDimensionEncodings[i].getLengthOfEncoding(); offset += dimensionEncodings[i].getLengthOfEncoding(); @@ -237,8 +232,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { } @Override - public CapabilityInfluence influenceCapabilityCheck(Collection<TblColRef> unmatchedDimensions, - Collection<FunctionDesc> unmatchedAggregations, SQLDigest digest, MeasureDesc topN) { + public CapabilityInfluence influenceCapabilityCheck(Collection<TblColRef> unmatchedDimensions, Collection<FunctionDesc> unmatchedAggregations, SQLDigest digest, MeasureDesc topN) { // TopN measure can (and only can) provide one numeric measure and one literal dimension // e.g. select seller, sum(gmv) from ... group by seller order by 2 desc limit 100 @@ -304,8 +298,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { if (sum.isSum() == false) return false; - if (sum.getParameter() == null || sum.getParameter().getColRefs() == null - || sum.getParameter().getColRefs().size() == 0) + if (sum.getParameter() == null || sum.getParameter().getColRefs() == null || sum.getParameter().getColRefs().size() == 0) return false; TblColRef sumCol = sum.getParameter().getColRefs().get(0); @@ -363,8 +356,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { } @Override - public IAdvMeasureFiller getAdvancedTupleFiller(FunctionDesc function, TupleInfo tupleInfo, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + public IAdvMeasureFiller getAdvancedTupleFiller(FunctionDesc function, TupleInfo tupleInfo, Map<TblColRef, Dictionary<String>> dictionaryMap) { final List<TblColRef> literalCols = getTopNLiteralColumn(function); final TblColRef numericCol = getTopNNumericColumn(function); final int[] literalTupleIdx = new int[literalCols.size()]; @@ -407,8 +399,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { Counter<ByteArray> counter = topNCounterIterator.next(); int offset = counter.getItem().offset(); for (int i = 0; i < dimensionEncodings.length; i++) { - String colValue = dimensionEncodings[i].decode(counter.getItem().array(), offset, - dimensionEncodings[i].getLengthOfEncoding()); + String colValue = dimensionEncodings[i].decode(counter.getItem().array(), offset, dimensionEncodings[i].getLengthOfEncoding()); tuple.setDimensionValue(literalTupleIdx[i], colValue); offset += dimensionEncodings[i].getLengthOfEncoding(); } @@ -417,8 +408,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { }; } - private static DimensionEncoding[] getDimensionEncodings(FunctionDesc function, List<TblColRef> literalCols, - Map<TblColRef, Dictionary<String>> dictionaryMap) { + private static DimensionEncoding[] getDimensionEncodings(FunctionDesc function, List<TblColRef> literalCols, Map<TblColRef, Dictionary<String>> dictionaryMap) { final DimensionEncoding[] dimensionEncodings = new DimensionEncoding[literalCols.size()]; for (int i = 0; i < literalCols.size(); i++) { TblColRef colRef = literalCols.get(i); @@ -434,17 +424,15 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { try { encodingVersion = Integer.parseInt(encodingVersionStr); } catch (NumberFormatException e) { - throw new RuntimeException(TopNMeasureType.CONFIG_ENCODING_VERSION_PREFIX + colRef.getName() - + " has to be an integer"); + throw new RuntimeException(TopNMeasureType.CONFIG_ENCODING_VERSION_PREFIX + colRef.getName() + " has to be an integer"); } } Object[] encodingConf = DimensionEncoding.parseEncodingConf(encoding); String encodingName = (String) encodingConf[0]; String[] encodingArgs = (String[]) encodingConf[1]; - encodingArgs = DateDimEnc.replaceEncodingArgs(encoding, encodingArgs, encodingName, - literalCols.get(i).getType()); - + encodingArgs = DateDimEnc.replaceEncodingArgs(encoding, encodingArgs, encodingName, literalCols.get(i).getType()); + dimensionEncodings[i] = DimensionEncodingFactory.create(encodingName, encodingArgs, encodingVersion); } } @@ -471,6 +459,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { return FUNC_TOP_N.equalsIgnoreCase(functionDesc.getExpression()); } + /** * Get the encoding name and version for the given col from Measure FunctionDesc * @param functionDesc @@ -479,12 +468,11 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> { */ public static final Pair<String, String> getEncoding(FunctionDesc functionDesc, TblColRef tblColRef) { String encoding = functionDesc.getConfiguration().get(CONFIG_ENCODING_PREFIX + tblColRef.getIdentity()); - String encodingVersion = functionDesc.getConfiguration() - .get(CONFIG_ENCODING_VERSION_PREFIX + tblColRef.getIdentity()); + String encodingVersion =functionDesc.getConfiguration().get(CONFIG_ENCODING_VERSION_PREFIX + tblColRef.getIdentity()); if (StringUtils.isEmpty(encoding)) { // for backward compatibility encoding = functionDesc.getConfiguration().get(CONFIG_ENCODING_PREFIX + tblColRef.getName()); - encodingVersion = functionDesc.getConfiguration().get(CONFIG_ENCODING_VERSION_PREFIX + tblColRef.getName()); + encodingVersion =functionDesc.getConfiguration().get(CONFIG_ENCODING_VERSION_PREFIX + tblColRef.getName()); } return new Pair<>(encoding, encodingVersion); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java index 4965eab..f8e6832 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@ -67,12 +67,9 @@ public class MetadataManager { private static final Logger logger = LoggerFactory.getLogger(MetadataManager.class); public static final Serializer<TableDesc> TABLE_SERIALIZER = new JsonSerializer<TableDesc>(TableDesc.class); - public static final Serializer<TableExtDesc> TABLE_EXT_SERIALIZER = new JsonSerializer<TableExtDesc>( - TableExtDesc.class); - public static final Serializer<DataModelDesc> MODELDESC_SERIALIZER = new JsonSerializer<DataModelDesc>( - DataModelDesc.class); - public static final Serializer<ExternalFilterDesc> EXTERNAL_FILTER_DESC_SERIALIZER = new JsonSerializer<ExternalFilterDesc>( - ExternalFilterDesc.class); + public static final Serializer<TableExtDesc> TABLE_EXT_SERIALIZER = new JsonSerializer<TableExtDesc>(TableExtDesc.class); + public static final Serializer<DataModelDesc> MODELDESC_SERIALIZER = new JsonSerializer<DataModelDesc>(DataModelDesc.class); + public static final Serializer<ExternalFilterDesc> EXTERNAL_FILTER_DESC_SERIALIZER = new JsonSerializer<ExternalFilterDesc>(ExternalFilterDesc.class); // static cached instances private static final ConcurrentMap<KylinConfig, MetadataManager> CACHE = new ConcurrentHashMap<KylinConfig, MetadataManager>(); @@ -324,8 +321,7 @@ public class MetadataManager { } @Override - public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) - throws IOException { + public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) throws IOException { if (event == Event.DROP) srcTableMap.removeLocal(cacheKey); else @@ -344,8 +340,7 @@ public class MetadataManager { } @Override - public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) - throws IOException { + public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) throws IOException { if (event == Event.DROP) srcTableExdMap.removeLocal(cacheKey); else @@ -372,8 +367,7 @@ public class MetadataManager { } @Override - public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) - throws IOException { + public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) throws IOException { if (event == Event.DROP) dataModelDescMap.removeLocal(cacheKey); else @@ -392,8 +386,7 @@ public class MetadataManager { } @Override - public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) - throws IOException { + public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) throws IOException { if (event == Event.DROP) extFilterMap.removeLocal(cacheKey); else @@ -403,13 +396,11 @@ public class MetadataManager { private void reloadAllTableExt() throws IOException { ResourceStore store = getStore(); - logger.debug("Reloading Table_exd info from folder " - + store.getReadableResourcePath(ResourceStore.TABLE_EXD_RESOURCE_ROOT)); + logger.debug("Reloading Table_exd info from folder " + store.getReadableResourcePath(ResourceStore.TABLE_EXD_RESOURCE_ROOT)); srcTableExdMap.clear(); - List<String> paths = store.collectResourceRecursively(ResourceStore.TABLE_EXD_RESOURCE_ROOT, - MetadataConstants.FILE_SURFIX); + List<String> paths = store.collectResourceRecursively(ResourceStore.TABLE_EXD_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX); for (String path : paths) { reloadTableExtAt(path); } @@ -470,13 +461,11 @@ public class MetadataManager { private void reloadAllExternalFilter() throws IOException { ResourceStore store = getStore(); - logger.debug("Reloading ExternalFilter from folder " - + store.getReadableResourcePath(ResourceStore.EXTERNAL_FILTER_RESOURCE_ROOT)); + logger.debug("Reloading ExternalFilter from folder " + store.getReadableResourcePath(ResourceStore.EXTERNAL_FILTER_RESOURCE_ROOT)); extFilterMap.clear(); - List<String> paths = store.collectResourceRecursively(ResourceStore.EXTERNAL_FILTER_RESOURCE_ROOT, - MetadataConstants.FILE_SURFIX); + List<String> paths = store.collectResourceRecursively(ResourceStore.EXTERNAL_FILTER_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX); for (String path : paths) { reloadExternalFilterAt(path); } @@ -486,13 +475,11 @@ public class MetadataManager { private void reloadAllSourceTable() throws IOException { ResourceStore store = getStore(); - logger.debug("Reloading SourceTable from folder " - + store.getReadableResourcePath(ResourceStore.TABLE_RESOURCE_ROOT)); + logger.debug("Reloading SourceTable from folder " + store.getReadableResourcePath(ResourceStore.TABLE_RESOURCE_ROOT)); srcTableMap.clear(); - List<String> paths = store.collectResourceRecursively(ResourceStore.TABLE_RESOURCE_ROOT, - MetadataConstants.FILE_SURFIX); + List<String> paths = store.collectResourceRecursively(ResourceStore.TABLE_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX); for (String path : paths) { reloadSourceTableAt(path); } @@ -593,13 +580,11 @@ public class MetadataManager { private void reloadAllDataModel() throws IOException { ResourceStore store = getStore(); - logger.debug("Reloading DataModel from folder " - + store.getReadableResourcePath(ResourceStore.DATA_MODEL_DESC_RESOURCE_ROOT)); + logger.debug("Reloading DataModel from folder " + store.getReadableResourcePath(ResourceStore.DATA_MODEL_DESC_RESOURCE_ROOT)); dataModelDescMap.clear(); - List<String> paths = store.collectResourceRecursively(ResourceStore.DATA_MODEL_DESC_RESOURCE_ROOT, - MetadataConstants.FILE_SURFIX); + List<String> paths = store.collectResourceRecursively(ResourceStore.DATA_MODEL_DESC_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX); for (String path : paths) { try { @@ -618,7 +603,7 @@ public class MetadataManager { ResourceStore store = getStore(); try { DataModelDesc dataModelDesc = store.getResource(path, DataModelDesc.class, MODELDESC_SERIALIZER); - + if (!dataModelDesc.isDraft()) dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); @@ -669,7 +654,7 @@ public class MetadataManager { } private DataModelDesc saveDataModelDesc(DataModelDesc dataModelDesc) throws IOException { - + if (!dataModelDesc.isDraft()) dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryEntry.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryEntry.java b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryEntry.java index be913f1..71ce24b 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryEntry.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryEntry.java @@ -44,8 +44,7 @@ public class BadQueryEntry extends RootPersistentEntity implements Comparable<Ba @JsonProperty("user") private String user; - public BadQueryEntry(String sql, String adj, long startTime, float runningSec, String server, String thread, - String user) { + public BadQueryEntry(String sql, String adj, long startTime, float runningSec, String server, String thread, String user) { this.updateRandomUuid(); this.adj = adj; this.sql = sql; @@ -152,7 +151,6 @@ public class BadQueryEntry extends RootPersistentEntity implements Comparable<Ba @Override public String toString() { - return "BadQueryEntry [ adj=" + adj + ", server=" + server + ", startTime=" - + DateFormat.formatToTimeStr(startTime) + " ]"; + return "BadQueryEntry [ adj=" + adj + ", server=" + server + ", startTime=" + DateFormat.formatToTimeStr(startTime) + " ]"; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java index d02f84b..c7eb133 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/badquery/BadQueryHistoryManager.java @@ -33,8 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class BadQueryHistoryManager { - public static final Serializer<BadQueryHistory> BAD_QUERY_INSTANCE_SERIALIZER = new JsonSerializer<>( - BadQueryHistory.class); + public static final Serializer<BadQueryHistory> BAD_QUERY_INSTANCE_SERIALIZER = new JsonSerializer<>(BadQueryHistory.class); private static final Logger logger = LoggerFactory.getLogger(BadQueryHistoryManager.class); private static final ConcurrentMap<KylinConfig, BadQueryHistoryManager> CACHE = new ConcurrentHashMap<>(); @@ -78,8 +77,7 @@ public class BadQueryHistoryManager { } public BadQueryHistory getBadQueriesForProject(String project) throws IOException { - BadQueryHistory badQueryHistory = getStore().getResource(getResourcePathForProject(project), - BadQueryHistory.class, BAD_QUERY_INSTANCE_SERIALIZER); + BadQueryHistory badQueryHistory = getStore().getResource(getResourcePathForProject(project), BadQueryHistory.class, BAD_QUERY_INSTANCE_SERIALIZER); if (badQueryHistory == null) { badQueryHistory = new BadQueryHistory(project); } @@ -119,16 +117,12 @@ public class BadQueryHistoryManager { return badQueryHistory; } - public BadQueryHistory addEntryToProject(String sql, long startTime, String adj, float runningSecs, String server, - String threadName, String user, String project) throws IOException { - return addEntryToProject(new BadQueryEntry(sql, adj, startTime, runningSecs, server, threadName, user), - project); + public BadQueryHistory addEntryToProject(String sql, long startTime, String adj, float runningSecs, String server, String threadName, String user, String project) throws IOException { + return addEntryToProject(new BadQueryEntry(sql, adj, startTime, runningSecs, server, threadName, user), project); } - public BadQueryHistory updateEntryToProject(String sql, long startTime, String adj, float runningSecs, - String server, String threadName, String user, String project) throws IOException { - return updateEntryToProject(new BadQueryEntry(sql, adj, startTime, runningSecs, server, threadName, user), - project); + public BadQueryHistory updateEntryToProject(String sql, long startTime, String adj, float runningSecs, String server, String threadName, String user, String project) throws IOException { + return updateEntryToProject(new BadQueryEntry(sql, adj, startTime, runningSecs, server, threadName, user), project); } public void removeBadQueryHistory(String project) throws IOException { @@ -138,4 +132,4 @@ public class BadQueryHistoryManager { public String getResourcePathForProject(String project) { return ResourceStore.BAD_QUERY_RESOURCE_ROOT + "/" + project + MetadataConstants.FILE_SURFIX; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java index 39ad830..1394f7b 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java @@ -116,8 +116,7 @@ public class Broadcaster { for (String node : config.getRestServers()) { restClients.add(new RestClient(node)); } - final ExecutorService wipingCachePool = Executors.newFixedThreadPool(restClients.size(), - new DaemonThreadFactory()); + final ExecutorService wipingCachePool = Executors.newFixedThreadPool(restClients.size(), new DaemonThreadFactory()); while (true) { try { final BroadcastEvent broadcastEvent = broadcastEvents.takeFirst(); @@ -127,8 +126,7 @@ public class Broadcaster { @Override public void run() { try { - restClient.wipeCache(broadcastEvent.getEntity(), broadcastEvent.getEvent(), - broadcastEvent.getCacheKey()); + restClient.wipeCache(broadcastEvent.getEntity(), broadcastEvent.getEvent(), broadcastEvent.getCacheKey()); } catch (IOException e) { logger.warn("Thread failed during wipe cache at " + broadcastEvent, e); } @@ -187,8 +185,7 @@ public class Broadcaster { if (list == null) return; - logger.debug("Broadcasting metadata change: entity=" + entity + ", event=" + event + ", cacheKey=" + cacheKey - + ", listeners=" + list); + logger.debug("Broadcasting metadata change: entity=" + entity + ", event=" + event + ", cacheKey=" + cacheKey + ", listeners=" + list); // prevents concurrent modification exception list = Lists.newArrayList(list); @@ -218,8 +215,7 @@ public class Broadcaster { break; } - logger.debug( - "Done broadcasting metadata change: entity=" + entity + ", event=" + event + ", cacheKey=" + cacheKey); + logger.debug("Done broadcasting metadata change: entity=" + entity + ", event=" + event + ", cacheKey=" + cacheKey); } /** @@ -276,8 +272,7 @@ public class Broadcaster { public void onProjectDataChange(Broadcaster broadcaster, String project) throws IOException { } - public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) - throws IOException { + public void onEntityChange(Broadcaster broadcaster, String entity, Event event, String cacheKey) throws IOException { } } @@ -341,8 +336,7 @@ public class Broadcaster { @Override public String toString() { - return Objects.toStringHelper(this).add("entity", entity).add("event", event).add("cacheKey", cacheKey) - .toString(); + return Objects.toStringHelper(this).add("entity", entity).add("event", event).add("cacheKey", cacheKey).toString(); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java index 1533f88..b5043f5 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java @@ -49,9 +49,7 @@ public class BigDecimalSerializer extends DataTypeSerializer<BigDecimal> { public void serialize(BigDecimal value, ByteBuffer out) { if (value.scale() > type.getScale()) { if (avoidVerbose++ % 10000 == 0) { - logger.warn("value's scale has exceeded the " + type.getScale() - + ", cut it off, to ensure encoded value do not exceed maxLength " + maxLength + " times:" - + (avoidVerbose)); + logger.warn("value's scale has exceeded the " + type.getScale() + ", cut it off, to ensure encoded value do not exceed maxLength " + maxLength + " times:" + (avoidVerbose)); } value = value.setScale(type.getScale(), BigDecimal.ROUND_HALF_EVEN); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java index a0bd892..3d485d2 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java @@ -18,11 +18,11 @@ package org.apache.kylin.metadata.datatype; -import java.nio.ByteBuffer; - import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.BooleanUtils; +import java.nio.ByteBuffer; + public class BooleanSerializer extends DataTypeSerializer<Long> { public final static String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" }; @@ -58,8 +58,8 @@ public class BooleanSerializer extends DataTypeSerializer<Long> { @Override public Long valueOf(String str) { if (str == null) - return Long.valueOf(0L); + return Long.valueOf(0L); else return Long.valueOf(BooleanUtils.toInteger(ArrayUtils.contains(TRUE_VALUE_SET, str.toLowerCase()))); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataType.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataType.java index bd7162c..83b2391 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataType.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataType.java @@ -164,16 +164,14 @@ public class DataType implements Serializable { try { n = Integer.parseInt(parts[i]); } catch (NumberFormatException e) { - throw new IllegalArgumentException( - "bad data type -- " + datatype + ", precision/scale not numeric"); + throw new IllegalArgumentException("bad data type -- " + datatype + ", precision/scale not numeric"); } if (i == 0) precision = n; else if (i == 1) scale = n; else - throw new IllegalArgumentException( - "bad data type -- " + datatype + ", too many precision/scale parts"); + throw new IllegalArgumentException("bad data type -- " + datatype + ", too many precision/scale parts"); } } @@ -219,7 +217,7 @@ public class DataType implements Serializable { public boolean isTimeFamily() { return DATETIME_FAMILY.contains(name) && !isDate(); } - + public boolean isDate() { return name.equals("date"); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java index af69e56..a4a35a4 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java @@ -18,15 +18,14 @@ package org.apache.kylin.metadata.datatype; +import com.google.common.collect.Maps; +import org.apache.kylin.common.util.BytesSerializer; + import java.io.IOException; import java.io.ObjectInputStream; import java.nio.ByteBuffer; import java.util.Map; -import org.apache.kylin.common.util.BytesSerializer; - -import com.google.common.collect.Maps; - /** * Note: the implementations MUST be thread-safe. */ http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java index f4c97b6..5101766 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java @@ -18,10 +18,10 @@ package org.apache.kylin.metadata.datatype; -import java.nio.ByteBuffer; - import org.apache.kylin.common.util.DateFormat; +import java.nio.ByteBuffer; + public class DateTimeSerializer extends DataTypeSerializer<Long> { public DateTimeSerializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java index a2ddd41..0e82e11 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java @@ -18,10 +18,10 @@ package org.apache.kylin.metadata.datatype; -import java.nio.ByteBuffer; - import org.apache.kylin.common.util.BytesUtil; +import java.nio.ByteBuffer; + /** */ public class Int4Serializer extends DataTypeSerializer<Integer> { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java index fcc0675..7dd5aa7 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java @@ -18,10 +18,10 @@ package org.apache.kylin.metadata.datatype; -import java.nio.ByteBuffer; - import org.apache.kylin.common.util.BytesUtil; +import java.nio.ByteBuffer; + /** */ public class Long8Serializer extends DataTypeSerializer<Long> { @@ -34,6 +34,7 @@ public class Long8Serializer extends DataTypeSerializer<Long> { BytesUtil.writeLong(value, out); } + @Override public Long deserialize(ByteBuffer in) { return BytesUtil.readLong(in); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java index f2c295b..605dcd7 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java @@ -18,10 +18,10 @@ package org.apache.kylin.metadata.datatype; -import java.nio.ByteBuffer; - import org.apache.kylin.common.util.BytesUtil; +import java.nio.ByteBuffer; + /** */ public class LongSerializer extends DataTypeSerializer<Long> { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/BuiltInFunctionTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/BuiltInFunctionTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/BuiltInFunctionTupleFilter.java index 06915da..767d868 100755 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/BuiltInFunctionTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/BuiltInFunctionTupleFilter.java @@ -54,8 +54,7 @@ public class BuiltInFunctionTupleFilter extends FunctionTupleFilter { } public BuiltInFunctionTupleFilter(String name, FilterOperatorEnum filterOperatorEnum) { - super(Lists.<TupleFilter> newArrayList(), - filterOperatorEnum == null ? FilterOperatorEnum.FUNCTION : filterOperatorEnum); + super(Lists.<TupleFilter> newArrayList(), filterOperatorEnum == null ? FilterOperatorEnum.FUNCTION : filterOperatorEnum); this.methodParams = Lists.newArrayList(); if (name != null) { @@ -92,8 +91,7 @@ public class BuiltInFunctionTupleFilter extends FunctionTupleFilter { if (columnContainerFilter instanceof ColumnTupleFilter) methodParams.set(colPosition, (Serializable) input); else if (columnContainerFilter instanceof BuiltInFunctionTupleFilter) - methodParams.set(colPosition, - (Serializable) ((BuiltInFunctionTupleFilter) columnContainerFilter).invokeFunction(input)); + methodParams.set(colPosition, (Serializable) ((BuiltInFunctionTupleFilter) columnContainerFilter).invokeFunction(input)); return method.invoke(null, (Object[]) (methodParams.toArray())); } @@ -130,8 +128,7 @@ public class BuiltInFunctionTupleFilter extends FunctionTupleFilter { if (!Primitives.isWrapperType(clazz)) methodParams.add(constVal); else - methodParams.add((Serializable) clazz - .cast(clazz.getDeclaredMethod("valueOf", String.class).invoke(null, constVal))); + methodParams.add((Serializable) clazz.cast(clazz.getDeclaredMethod("valueOf", String.class).invoke(null, constVal))); } catch (Exception e) { logger.warn("Reflection failed for methodParams. ", e); isValidFunc = false; @@ -194,4 +191,4 @@ public class BuiltInFunctionTupleFilter extends FunctionTupleFilter { isValidFunc = true; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CaseTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CaseTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CaseTupleFilter.java index 9bf7349..9083212 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CaseTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CaseTupleFilter.java @@ -85,8 +85,7 @@ public class CaseTupleFilter extends TupleFilter implements IOptimizeableTupleFi @Override public String toString() { - return "CaseTupleFilter [when=" + whenFilters + ", then=" + thenFilters + ", else=" + elseFilter + ", children=" - + children + "]"; + return "CaseTupleFilter [when=" + whenFilters + ", then=" + thenFilters + ", else=" + elseFilter + ", children=" + children + "]"; } @Override http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/ColumnTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/ColumnTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/ColumnTupleFilter.java index 77d3c33..ecb8e61 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/ColumnTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/ColumnTupleFilter.java @@ -42,7 +42,7 @@ import org.apache.kylin.metadata.tuple.IEvaluatableTuple; public class ColumnTupleFilter extends TupleFilter { private static final String _QUALIFIED_ = "_QUALIFIED_"; - + private TblColRef columnRef; private Object tupleValue; private List<Object> values; @@ -92,7 +92,7 @@ public class ColumnTupleFilter extends TupleFilter { @Override public void serialize(IFilterCodeSystem<?> cs, ByteBuffer buffer) { TableRef tableRef = columnRef.getTableRef(); - + if (tableRef == null) { // un-qualified column String table = columnRef.getTable(); @@ -109,13 +109,13 @@ public class ColumnTupleFilter extends TupleFilter { } else { // qualified column (from model) BytesUtil.writeUTFString(_QUALIFIED_, buffer); - + String model = tableRef.getModel().getName(); BytesUtil.writeUTFString(model, buffer); - + String alias = tableRef.getAlias(); BytesUtil.writeUTFString(alias, buffer); - + String col = columnRef.getName(); BytesUtil.writeUTFString(col, buffer); } @@ -126,17 +126,17 @@ public class ColumnTupleFilter extends TupleFilter { public void deserialize(IFilterCodeSystem<?> cs, ByteBuffer buffer) { String tableName = BytesUtil.readUTFString(buffer); - + if (_QUALIFIED_.equals(tableName)) { // qualified column (from model) String model = BytesUtil.readUTFString(buffer); String alias = BytesUtil.readUTFString(buffer); String col = BytesUtil.readUTFString(buffer); - + KylinConfig config = KylinConfig.getInstanceFromEnv(); DataModelDesc modelDesc = MetadataManager.getInstance(config).getDataModelDesc(model); this.columnRef = modelDesc.findColumn(alias, col); - + } else { // un-qualified column TableDesc tableDesc = null; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java index 4739fe3..4875217 100755 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java @@ -105,8 +105,7 @@ public class CompareTupleFilter extends TupleFilter implements IOptimizeableTupl } private boolean needSwapOperator() { - return operator == FilterOperatorEnum.LT || operator == FilterOperatorEnum.GT - || operator == FilterOperatorEnum.LTE || operator == FilterOperatorEnum.GTE; + return operator == FilterOperatorEnum.LT || operator == FilterOperatorEnum.GT || operator == FilterOperatorEnum.LTE || operator == FilterOperatorEnum.GTE; } @Override @@ -178,7 +177,7 @@ public class CompareTupleFilter extends TupleFilter implements IOptimizeableTupl else if (operator == FilterOperatorEnum.ISNULL) return false; } - + if (cs.isNull(firstCondValue)) { return false; } @@ -226,8 +225,7 @@ public class CompareTupleFilter extends TupleFilter implements IOptimizeableTupl @Override public boolean isEvaluable() { return (column != null || (function != null && function.isEvaluable())) // - && (!conditionValues.isEmpty() || operator == FilterOperatorEnum.ISNOTNULL - || operator == FilterOperatorEnum.ISNULL) // + && (!conditionValues.isEmpty() || operator == FilterOperatorEnum.ISNOTNULL || operator == FilterOperatorEnum.ISNULL) // && secondColumn == null; } @@ -237,13 +235,10 @@ public class CompareTupleFilter extends TupleFilter implements IOptimizeableTupl if (this.children != null && this.children.size() == 2 && // this.children.get(0) instanceof ConstantTupleFilter && // this.children.get(1) instanceof ConstantTupleFilter) { - if (((ConstantTupleFilter) this.children.get(0)).getValues() - .equals(((ConstantTupleFilter) this.children.get(1)).getValues())) { - return this.operator == FilterOperatorEnum.EQ ? CompareResultType.AlwaysTrue - : CompareResultType.AlwaysFalse; + if (((ConstantTupleFilter) this.children.get(0)).getValues().equals(((ConstantTupleFilter) this.children.get(1)).getValues())) { + return this.operator == FilterOperatorEnum.EQ ? CompareResultType.AlwaysTrue : CompareResultType.AlwaysFalse; } else { - return this.operator == FilterOperatorEnum.EQ ? CompareResultType.AlwaysFalse - : CompareResultType.AlwaysTrue; + return this.operator == FilterOperatorEnum.EQ ? CompareResultType.AlwaysFalse : CompareResultType.AlwaysTrue; } } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/FilterOptimizeTransformer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/FilterOptimizeTransformer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/FilterOptimizeTransformer.java index de3ee1b..9ef9c2c 100755 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/FilterOptimizeTransformer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/FilterOptimizeTransformer.java @@ -66,8 +66,7 @@ public class FilterOptimizeTransformer implements ITupleFilterTransformer { if (logicalTupleFilter.getOperator() == TupleFilter.FilterOperatorEnum.OR) { @SuppressWarnings("unchecked") - ListIterator<TupleFilter> childIterator = (ListIterator<TupleFilter>) logicalTupleFilter.getChildren() - .listIterator(); + ListIterator<TupleFilter> childIterator = (ListIterator<TupleFilter>) logicalTupleFilter.getChildren().listIterator(); while (childIterator.hasNext()) { TupleFilter next = childIterator.next(); if (ConstantTupleFilter.TRUE == next) { @@ -77,8 +76,7 @@ public class FilterOptimizeTransformer implements ITupleFilterTransformer { } } else if (logicalTupleFilter.getOperator() == TupleFilter.FilterOperatorEnum.AND) { @SuppressWarnings("unchecked") - ListIterator<TupleFilter> childIterator = (ListIterator<TupleFilter>) logicalTupleFilter.getChildren() - .listIterator(); + ListIterator<TupleFilter> childIterator = (ListIterator<TupleFilter>) logicalTupleFilter.getChildren().listIterator(); while (childIterator.hasNext()) { TupleFilter next = childIterator.next(); if (ConstantTupleFilter.FALSE == next) { @@ -118,7 +116,7 @@ public class FilterOptimizeTransformer implements ITupleFilterTransformer { if (newFilters.size() == 1) { return newFilters.get(0); } - + CaseTupleFilter newCaseTupleFilter = new CaseTupleFilter(); newCaseTupleFilter.addChildren(newFilters); return newCaseTupleFilter; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/LogicalTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/LogicalTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/LogicalTupleFilter.java index 4d4931e..7893ed8 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/LogicalTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/LogicalTupleFilter.java @@ -60,8 +60,7 @@ public class LogicalTupleFilter extends TupleFilter implements IOptimizeableTupl public TupleFilter reverse() { switch (operator) { case NOT: - throw new IllegalStateException( - "NOT will be replaced in org.apache.kylin.query.relnode.OLAPFilterRel.TupleFilterVisitor"); + throw new IllegalStateException("NOT will be replaced in org.apache.kylin.query.relnode.OLAPFilterRel.TupleFilterVisitor"); case AND: case OR: LogicalTupleFilter reverse = new LogicalTupleFilter(REVERSE_OP_MAP.get(operator)); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilter.java index f7168df..5ba8726 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilter.java @@ -42,9 +42,7 @@ public abstract class TupleFilter { static final Logger logger = LoggerFactory.getLogger(TupleFilter.class); public enum FilterOperatorEnum { - EQ(1), NEQ(2), GT(3), LT(4), GTE(5), LTE(6), ISNULL(7), ISNOTNULL(8), IN(9), NOTIN(10), AND(20), OR(21), NOT( - 22), COLUMN(30), CONSTANT(31), DYNAMIC( - 32), EXTRACT(33), CASE(34), FUNCTION(35), MASSIN(36), EVAL_FUNC(37), UNSUPPORTED(38); + EQ(1), NEQ(2), GT(3), LT(4), GTE(5), LTE(6), ISNULL(7), ISNOTNULL(8), IN(9), NOTIN(10), AND(20), OR(21), NOT(22), COLUMN(30), CONSTANT(31), DYNAMIC(32), EXTRACT(33), CASE(34), FUNCTION(35), MASSIN(36), EVAL_FUNC(37), UNSUPPORTED(38); private final int value; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilterSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilterSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilterSerializer.java index 7b27ce8..63153ef 100755 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilterSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/TupleFilterSerializer.java @@ -78,8 +78,7 @@ public class TupleFilterSerializer { return result; } - private static void internalSerialize(TupleFilter filter, Decorator decorator, ByteBuffer buffer, - IFilterCodeSystem<?> cs) { + private static void internalSerialize(TupleFilter filter, Decorator decorator, ByteBuffer buffer, IFilterCodeSystem<?> cs) { if (decorator != null) { // give decorator a chance to manipulate the output filter filter = decorator.onSerialize(filter); } @@ -204,8 +203,7 @@ public class TupleFilterSerializer { if (extendedTupleFilters.containsKey(op)) { try { filter = (TupleFilter) extendedTupleFilters.get(op).getConstructor().newInstance(); - } catch (InstantiationException | IllegalAccessException | InvocationTargetException - | NoSuchMethodException e) { + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { throw new RuntimeException(e); } } else { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java index 55ddec0..e4e311e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInTupleFilter.java @@ -114,8 +114,7 @@ public class MassInTupleFilter extends FunctionTupleFilter { super.addChild(child); ColumnTupleFilter columnFilter = (ColumnTupleFilter) child; if (this.column != null) { - throw new IllegalStateException("Duplicate columns! old is " + column.getName() + " and new is " - + columnFilter.getColumn().getName()); + throw new IllegalStateException("Duplicate columns! old is " + column.getName() + " and new is " + columnFilter.getColumn().getName()); } this.column = columnFilter.getColumn(); @@ -125,8 +124,7 @@ public class MassInTupleFilter extends FunctionTupleFilter { if (filterTableName == null) { filterTableName = (String) child.getValues().iterator().next(); - ExternalFilterDesc externalFilterDesc = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv()) - .getExtFilterDesc(filterTableName); + ExternalFilterDesc externalFilterDesc = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv()).getExtFilterDesc(filterTableName); if (externalFilterDesc == null) { throw new IllegalArgumentException("External filter named " + filterTableName + " is not found"); } @@ -134,8 +132,7 @@ public class MassInTupleFilter extends FunctionTupleFilter { filterTableResourceIdentifier = externalFilterDesc.getFilterResourceIdentifier(); } } else { - throw new IllegalStateException( - "MassInTupleFilter only has two children: one ColumnTupleFilter and one ConstantTupleFilter"); + throw new IllegalStateException("MassInTupleFilter only has two children: one ColumnTupleFilter and one ConstantTupleFilter"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInValueProviderFactory.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInValueProviderFactory.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInValueProviderFactory.java index 524aa15..18da37a 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInValueProviderFactory.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/UDF/MassInValueProviderFactory.java @@ -22,6 +22,5 @@ import org.apache.kylin.metadata.filter.function.Functions; import org.apache.kylin.metadata.model.TblColRef; public interface MassInValueProviderFactory { - MassInValueProvider getProvider(Functions.FilterTableType filterTableType, String filterResourceIdentifier, - TblColRef col); + MassInValueProvider getProvider(Functions.FilterTableType filterTableType, String filterResourceIdentifier, TblColRef col); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/BuiltInMethod.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/BuiltInMethod.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/BuiltInMethod.java index fc40af9..31ee297 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/BuiltInMethod.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/BuiltInMethod.java @@ -29,10 +29,7 @@ import org.apache.commons.lang3.reflect.MethodUtils; import com.google.common.collect.ImmutableMap; public enum BuiltInMethod { - UPPER(BuiltInMethod.class, "upper", String.class), LOWER(BuiltInMethod.class, "lower", String.class), SUBSTRING( - BuiltInMethod.class, "substring", String.class, int.class, - int.class), CHAR_LENGTH(BuiltInMethod.class, "charLength", String.class), LIKE(BuiltInMethod.class, "like", - String.class, String.class), INITCAP(BuiltInMethod.class, "initcap", String.class); + UPPER(BuiltInMethod.class, "upper", String.class), LOWER(BuiltInMethod.class, "lower", String.class), SUBSTRING(BuiltInMethod.class, "substring", String.class, int.class, int.class), CHAR_LENGTH(BuiltInMethod.class, "charLength", String.class), LIKE(BuiltInMethod.class, "like", String.class, String.class), INITCAP(BuiltInMethod.class, "initcap", String.class); public final Method method; public static final ImmutableMap<String, BuiltInMethod> MAP; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Functions.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Functions.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Functions.java index 8bff0a4..861e530 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Functions.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Functions.java @@ -49,8 +49,7 @@ public class Functions { if (SUPPORTED_UDF.containsKey(name)) { try { return (TupleFilter) SUPPORTED_UDF.get(name).getConstructor().newInstance(); - } catch (InstantiationException | IllegalAccessException | InvocationTargetException - | NoSuchMethodException e) { + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { throw new RuntimeException("Failed to on constructing FunctionTupleFilter for " + name); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Like.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Like.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Like.java index 2f94f13..a97244e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Like.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/Like.java @@ -27,10 +27,7 @@ package org.apache.kylin.metadata.filter.function; public class Like { private static final String JAVA_REGEX_SPECIALS = "[]()|^-+*?{}$\\"; private static final String SQL_SIMILAR_SPECIALS = "[]()|^-+*_%?{}"; - private static final String[] REG_CHAR_CLASSES = { "[:ALPHA:]", "\\p{Alpha}", "[:alpha:]", "\\p{Alpha}", - "[:UPPER:]", "\\p{Upper}", "[:upper:]", "\\p{Upper}", "[:LOWER:]", "\\p{Lower}", "[:lower:]", "\\p{Lower}", - "[:DIGIT:]", "\\d", "[:digit:]", "\\d", "[:SPACE:]", " ", "[:space:]", " ", "[:WHITESPACE:]", "\\s", - "[:whitespace:]", "\\s", "[:ALNUM:]", "\\p{Alnum}", "[:alnum:]", "\\p{Alnum}" }; + private static final String[] REG_CHAR_CLASSES = { "[:ALPHA:]", "\\p{Alpha}", "[:alpha:]", "\\p{Alpha}", "[:UPPER:]", "\\p{Upper}", "[:upper:]", "\\p{Upper}", "[:LOWER:]", "\\p{Lower}", "[:lower:]", "\\p{Lower}", "[:DIGIT:]", "\\d", "[:digit:]", "\\d", "[:SPACE:]", " ", "[:space:]", " ", "[:WHITESPACE:]", "\\s", "[:whitespace:]", "\\s", "[:ALNUM:]", "\\p{Alnum}", "[:alnum:]", "\\p{Alnum}" }; private Like() { } @@ -132,8 +129,7 @@ public class Like { return new RuntimeException("Invalid regular expression '" + pattern + "'"); } - private static int sqlSimilarRewriteCharEnumeration(String sqlPattern, StringBuilder javaPattern, int pos, - char escapeChar) { + private static int sqlSimilarRewriteCharEnumeration(String sqlPattern, StringBuilder javaPattern, int pos, char escapeChar) { int i; for (i = pos + 1; i < sqlPattern.length(); i++) { char c = sqlPattern.charAt(i); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/LikeMatchers.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/LikeMatchers.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/LikeMatchers.java index 649e336..ef1e412 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/LikeMatchers.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/function/LikeMatchers.java @@ -132,8 +132,7 @@ public class LikeMatchers { return new OnePercentSignLikeMatcher(patternStr); } else if (count == 2 && patternStr.startsWith(PERCENT_SIGN) && patternStr.endsWith(PERCENT_SIGN)) { return new TwoPercentSignLikeMatcher(patternStr); - } else if (count == 3 && patternStr.startsWith(PERCENT_SIGN) && patternStr.endsWith(PERCENT_SIGN) - && !patternStr.contains(PERCENT_SIGN + PERCENT_SIGN)) { + } else if (count == 3 && patternStr.startsWith(PERCENT_SIGN) && patternStr.endsWith(PERCENT_SIGN) && !patternStr.contains(PERCENT_SIGN + PERCENT_SIGN)) { return new ThreePercentSignLikeMatcher(patternStr); } else { return new DefaultLikeMatcher(patternStr); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java index c09d455..5d15d56 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java @@ -82,8 +82,7 @@ public class ColumnDesc implements Serializable { this.index = other.index; } - public ColumnDesc(String id, String name, String datatype, String comment, String dataGen, String index, - String computedColumnExpr) { + public ColumnDesc(String id, String name, String datatype, String comment, String dataGen, String index, String computedColumnExpr) { this.id = id; this.name = name; this.datatype = datatype; @@ -258,7 +257,6 @@ public class ColumnDesc implements Serializable { @Override public String toString() { - return "ColumnDesc{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", datatype='" + datatype + '\'' - + ", comment='" + comment + '\'' + '}'; + return "ColumnDesc{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", datatype='" + datatype + '\'' + ", comment='" + comment + '\'' + '}'; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java index 6b983bf..e759bdf 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java @@ -370,8 +370,7 @@ public class DataModelDesc extends RootPersistentEntity { @Override public ColumnDesc apply(@Nullable ComputedColumnDesc input) { id.increment(); - ColumnDesc columnDesc = new ColumnDesc(id.toString(), input.getColumnName(), input.getDatatype(), - input.getComment(), null, null, input.getExpression()); + ColumnDesc columnDesc = new ColumnDesc(id.toString(), input.getColumnName(), input.getDatatype(), input.getComment(), null, null, input.getExpression()); return columnDesc; } }).toArray(ColumnDesc.class); @@ -434,8 +433,7 @@ public class DataModelDesc extends RootPersistentEntity { private void addAlias(TableRef ref) { String alias = ref.getAlias(); if (aliasMap.containsKey(alias)) - throw new IllegalStateException("Alias '" + alias + "' ref to multiple tables: " + ref.getTableIdentity() - + ", " + aliasMap.get(alias).getTableIdentity()); + throw new IllegalStateException("Alias '" + alias + "' ref to multiple tables: " + ref.getTableIdentity() + ", " + aliasMap.get(alias).getTableIdentity()); aliasMap.put(alias, ref); TableDesc table = ref.getTableDesc(); @@ -472,22 +470,18 @@ public class DataModelDesc extends RootPersistentEntity { computedColumnDesc.init(); if (ccSet.contains(computedColumnDesc.getFullName())) { - throw new IllegalArgumentException( - String.format("More than one computed column named %s exist in model %s", - computedColumnDesc.getFullName(), this.getName())); + throw new IllegalArgumentException(String.format("More than one computed column named %s exist in model %s", computedColumnDesc.getFullName(), this.getName())); } else { ccSet.add(computedColumnDesc.getFullName()); } CCInfo other = ccInfoMap.get(computedColumnDesc.getFullName()); if (other == null || (other.dataModelDescs.size() == 1 && other.dataModelDescs.contains(this))) { - ccInfoMap.put(computedColumnDesc.getFullName(), - new CCInfo(computedColumnDesc, Sets.<DataModelDesc> newHashSet(this))); + ccInfoMap.put(computedColumnDesc.getFullName(), new CCInfo(computedColumnDesc, Sets.<DataModelDesc> newHashSet(this))); } else if (other.computedColumnDesc.equals(computedColumnDesc)) { other.dataModelDescs.add(this); } else { - throw new IllegalStateException(String.format( - "Computed column named %s is already defined in other models: %s. Please change another name, or try to keep consistent definition", // + throw new IllegalStateException(String.format("Computed column named %s is already defined in other models: %s. Please change another name, or try to keep consistent definition", // computedColumnDesc.getFullName(), other.dataModelDescs)); } } @@ -540,14 +534,11 @@ public class DataModelDesc extends RootPersistentEntity { if (pkCols.length == 0 || fkCols.length == 0) throw new IllegalStateException("Missing join columns on table " + dimTable); if (pkCols.length != fkCols.length) { - throw new IllegalStateException("Primary keys(" + dimTable + ")" + Arrays.toString(pks) - + " are not consistent with Foreign keys(" + fkTable + ") " + Arrays.toString(fks)); + throw new IllegalStateException("Primary keys(" + dimTable + ")" + Arrays.toString(pks) + " are not consistent with Foreign keys(" + fkTable + ") " + Arrays.toString(fks)); } for (int i = 0; i < fkCols.length; i++) { if (!fkCols[i].getDatatype().equals(pkCols[i].getDatatype())) { - logger.warn("PK " + dimTable + "." + pkCols[i].getName() + "." + pkCols[i].getDatatype() - + " are not consistent with FK " + fkTable + "." + fkCols[i].getName() + "." - + fkCols[i].getDatatype()); + logger.warn("PK " + dimTable + "." + pkCols[i].getName() + "." + pkCols[i].getDatatype() + " are not consistent with FK " + fkTable + "." + fkCols[i].getName() + "." + fkCols[i].getDatatype()); } } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/ExternalFilterDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ExternalFilterDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ExternalFilterDesc.java index 1fb25d0..115b154 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ExternalFilterDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ExternalFilterDesc.java @@ -89,8 +89,7 @@ public class ExternalFilterDesc extends RootPersistentEntity implements ISourceA @Override public String toString() { - return "ExternalFilterDesc [ name=" + name + " filter table resource identifier " - + this.filterResourceIdentifier + "]"; + return "ExternalFilterDesc [ name=" + name + " filter table resource identifier " + this.filterResourceIdentifier + "]"; } /** create a mockup table for unit test */ http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java index cba8f09..e969be2 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java @@ -308,8 +308,7 @@ public class FunctionDesc implements Serializable { @Override public String toString() { - return "FunctionDesc [expression=" + expression + ", parameter=" + parameter + ", returnType=" + returnType - + "]"; + return "FunctionDesc [expression=" + expression + ", parameter=" + parameter + ", returnType=" + returnType + "]"; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java index 2364bad..d46ea96 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ISegment.java @@ -37,7 +37,7 @@ public interface ISegment { public SegmentStatusEnum getStatus(); public long getLastBuildTime(); - + public void validate() throws IllegalStateException; - + } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinDesc.java index 27f4025..eb82ace 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinDesc.java @@ -18,14 +18,14 @@ package org.apache.kylin.metadata.model; -import java.io.Serializable; -import java.util.Arrays; - import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import java.io.Serializable; +import java.util.Arrays; + /** */ @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) @@ -55,15 +55,15 @@ public class JoinDesc implements Serializable { public boolean isInnerJoin() { return "INNER".equalsIgnoreCase(type); } - + public boolean isLeftJoin() { return "LEFT".equalsIgnoreCase(type); } - + public String getType() { return type; } - + public void setType(String type) { this.type = type; } @@ -105,7 +105,7 @@ public class JoinDesc implements Serializable { private void checkSameTable(TblColRef[] cols) { if (cols == null || cols.length == 0) return; - + TableRef tableRef = cols[0].getTableRef(); for (int i = 1; i < cols.length; i++) Preconditions.checkState(tableRef == cols[i].getTableRef()); @@ -114,14 +114,13 @@ public class JoinDesc implements Serializable { public TableRef getPKSide() { return primaryKeyColumns[0].getTableRef(); } - + public TableRef getFKSide() { return foreignKeyColumns[0].getTableRef(); } public void sortByFK() { - Preconditions.checkState(primaryKey.length == foreignKey.length && primaryKey.length == primaryKeyColumns.length - && foreignKey.length == foreignKeyColumns.length); + Preconditions.checkState(primaryKey.length == foreignKey.length && primaryKey.length == primaryKeyColumns.length && foreignKey.length == foreignKeyColumns.length); boolean cont = true; int n = foreignKey.length; for (int i = 0; i < n - 1 && cont; i++) { @@ -144,7 +143,7 @@ public class JoinDesc implements Serializable { arr[j] = arr[jj]; arr[jj] = tmp; } - + private void swap(TblColRef[] arr, int j, int jj) { TblColRef tmp = arr[j]; arr[j] = arr[jj]; @@ -186,23 +185,23 @@ public class JoinDesc implements Serializable { public boolean matches(JoinDesc other) { if (other == null) return false; - + if (!this.type.equalsIgnoreCase(other.getType())) return false; - + // note pk/fk are sorted, sortByFK() if (!this.columnDescEquals(foreignKeyColumns, other.foreignKeyColumns)) return false; if (!this.columnDescEquals(primaryKeyColumns, other.primaryKeyColumns)) return false; - + return true; } private boolean columnDescEquals(TblColRef[] a, TblColRef[] b) { if (a.length != b.length) return false; - + for (int i = 0; i < a.length; i++) { if (a[i].getColumnDesc().equals(b[i].getColumnDesc()) == false) return false; @@ -212,8 +211,7 @@ public class JoinDesc implements Serializable { @Override public String toString() { - return "JoinDesc [type=" + type + ", primary_key=" + Arrays.toString(primaryKey) + ", foreign_key=" - + Arrays.toString(foreignKey) + "]"; + return "JoinDesc [type=" + type + ", primary_key=" + Arrays.toString(primaryKey) + ", foreign_key=" + Arrays.toString(foreignKey) + "]"; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinTableDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinTableDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinTableDesc.java index 1c0d30a..56c90bd 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinTableDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinTableDesc.java @@ -37,14 +37,14 @@ public class JoinTableDesc implements Serializable { @JsonProperty("kind") @JsonInclude(JsonInclude.Include.NON_NULL) private TableKind kind = TableKind.LOOKUP; - + @JsonProperty("alias") @JsonInclude(JsonInclude.Include.NON_NULL) private String alias; - + @JsonProperty("join") private JoinDesc join; - + private TableRef tableRef; public String getTable() { @@ -58,15 +58,15 @@ public class JoinTableDesc implements Serializable { public TableKind getKind() { return kind; } - + void setAlias(String alias) { this.alias = alias; } - + public String getAlias() { return alias; } - + public JoinDesc getJoin() { return join; } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java index ab70cc7..4e7e8b8 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java @@ -73,8 +73,7 @@ public class JoinsTree implements Serializable { return matchUp.size(); } - private boolean matchInTree(Chain chain, JoinsTree another, Map<String, String> constraints, - Map<String, String> matchUp) { + private boolean matchInTree(Chain chain, JoinsTree another, Map<String, String> constraints, Map<String, String> matchUp) { String thisAlias = chain.table.getAlias(); if (matchUp.containsKey(thisAlias)) return true; @@ -104,8 +103,7 @@ public class JoinsTree implements Serializable { boolean matches = false; if (chain.join == null) { - matches = anotherChain.join == null - && chain.table.getTableDesc().getIdentity().equals(anotherChain.table.getTableDesc().getIdentity()); + matches = anotherChain.join == null && chain.table.getTableDesc().getIdentity().equals(anotherChain.table.getTableDesc().getIdentity()); } else { matches = chain.join.matches(anotherChain.join) && matchChain(chain.fkSide, anotherChain.fkSide, matchUp); }
