http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java index 22ab809..deec4f2 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java @@ -84,8 +84,7 @@ public class MeasureDesc implements Serializable { if (!function.equals(that.getFunction())) return false; - if (dependentMeasureRef != null && that.getDependentMeasureRef() == null - || dependentMeasureRef == null && that.getDependentMeasureRef() != null) + if (dependentMeasureRef != null && that.getDependentMeasureRef() == null || dependentMeasureRef == null && that.getDependentMeasureRef() != null) return false; if (dependentMeasureRef == null && that.getDependentMeasureRef() == null)
http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/ModelDimensionDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ModelDimensionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ModelDimensionDesc.java index d484019..c0ddbad 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ModelDimensionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ModelDimensionDesc.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE) public class ModelDimensionDesc implements Serializable { private static final long serialVersionUID = 1L; - + @JsonProperty("table") private String table; @JsonProperty("columns") @@ -58,7 +58,7 @@ public class ModelDimensionDesc implements Serializable { if (columns != null) { StringUtil.toUpperCaseArray(columns, columns); } - + if (model != null) { table = model.findTable(table).getAlias(); if (columns != null) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java index 2acb12f..3c00149 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java @@ -18,8 +18,6 @@ package org.apache.kylin.metadata.model; -import java.io.Serializable; - import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.util.ClassUtil; import org.apache.kylin.common.util.DateFormat; @@ -29,12 +27,14 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.Serializable; + /** */ @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) public class PartitionDesc implements Serializable { - public static enum PartitionType implements Serializable { + public static enum PartitionType implements Serializable{ APPEND, // UPDATE_INSERT // not used since 0.7.1 } @@ -80,7 +80,7 @@ public class PartitionDesc implements Serializable { public boolean partitionColumnIsYmdInt() { if (partitionDateColumnRef == null) return false; - + DataType type = partitionDateColumnRef.getType(); return (type.isInt() || type.isBigInt()) && DateFormat.isDatePattern(partitionDateFormat); } @@ -88,7 +88,7 @@ public class PartitionDesc implements Serializable { public boolean partitionColumnIsTimeMillis() { if (partitionDateColumnRef == null) return false; - + DataType type = partitionDateColumnRef.getType(); return type.isBigInt() && !DateFormat.isDatePattern(partitionDateFormat); } @@ -105,12 +105,12 @@ public class PartitionDesc implements Serializable { public void setPartitionDateColumn(String partitionDateColumn) { this.partitionDateColumn = partitionDateColumn; } - + // for test void setPartitionDateColumnRef(TblColRef partitionDateColumnRef) { this.partitionDateColumnRef = partitionDateColumnRef; } - + public String getPartitionTimeColumn() { return partitionTimeColumn; } @@ -124,7 +124,7 @@ public class PartitionDesc implements Serializable { void setPartitionTimeColumnRef(TblColRef partitionTimeColumnRef) { this.partitionTimeColumnRef = partitionTimeColumnRef; } - + @Deprecated public long getPartitionDateStart() { return partitionDateStart; @@ -170,7 +170,7 @@ public class PartitionDesc implements Serializable { public TblColRef getPartitionTimeColumnRef() { return partitionTimeColumnRef; } - + // ============================================================================ public static interface IPartitionConditionBuilder { @@ -190,21 +190,17 @@ public class PartitionDesc implements Serializable { } else if (partDesc.partitionColumnIsTimeMillis()) { buildSingleColumnRangeCondAsTimeMillis(builder, partitionDateColumn, startInclusive, endExclusive); } else if (partitionDateColumn != null && partitionTimeColumn == null) { - buildSingleColumnRangeCondition(builder, partitionDateColumn, startInclusive, endExclusive, - partDesc.getPartitionDateFormat()); + buildSingleColumnRangeCondition(builder, partitionDateColumn, startInclusive, endExclusive, partDesc.getPartitionDateFormat()); } else if (partitionDateColumn == null && partitionTimeColumn != null) { - buildSingleColumnRangeCondition(builder, partitionTimeColumn, startInclusive, endExclusive, - partDesc.getPartitionTimeFormat()); + buildSingleColumnRangeCondition(builder, partitionTimeColumn, startInclusive, endExclusive, partDesc.getPartitionTimeFormat()); } else if (partitionDateColumn != null && partitionTimeColumn != null) { - buildMultipleColumnRangeCondition(builder, partitionDateColumn, partitionTimeColumn, startInclusive, - endExclusive, partDesc.getPartitionDateFormat(), partDesc.getPartitionTimeFormat()); + buildMultipleColumnRangeCondition(builder, partitionDateColumn, partitionTimeColumn, startInclusive, endExclusive, partDesc.getPartitionDateFormat(), partDesc.getPartitionTimeFormat()); } return builder.toString(); } - private static void buildSingleColumnRangeCondAsTimeMillis(StringBuilder builder, TblColRef partitionColumn, - long startInclusive, long endExclusive) { + private static void buildSingleColumnRangeCondAsTimeMillis(StringBuilder builder, TblColRef partitionColumn, long startInclusive, long endExclusive) { String partitionColumnName = partitionColumn.getIdentity(); if (startInclusive > 0) { builder.append(partitionColumnName + " >= " + startInclusive); @@ -213,47 +209,35 @@ public class PartitionDesc implements Serializable { builder.append(partitionColumnName + " < " + endExclusive); } - private static void buildSingleColumnRangeCondAsYmdInt(StringBuilder builder, TblColRef partitionColumn, - long startInclusive, long endExclusive) { + private static void buildSingleColumnRangeCondAsYmdInt(StringBuilder builder, TblColRef partitionColumn, long startInclusive, long endExclusive) { String partitionColumnName = partitionColumn.getIdentity(); if (startInclusive > 0) { - builder.append(partitionColumnName + " >= " - + DateFormat.formatToDateStr(startInclusive, DateFormat.COMPACT_DATE_PATTERN)); + builder.append(partitionColumnName + " >= " + DateFormat.formatToDateStr(startInclusive, DateFormat.COMPACT_DATE_PATTERN)); builder.append(" AND "); } - builder.append(partitionColumnName + " < " - + DateFormat.formatToDateStr(endExclusive, DateFormat.COMPACT_DATE_PATTERN)); + builder.append(partitionColumnName + " < " + DateFormat.formatToDateStr(endExclusive, DateFormat.COMPACT_DATE_PATTERN)); } - private static void buildSingleColumnRangeCondition(StringBuilder builder, TblColRef partitionColumn, - long startInclusive, long endExclusive, String partitionColumnDateFormat) { + private static void buildSingleColumnRangeCondition(StringBuilder builder, TblColRef partitionColumn, long startInclusive, long endExclusive, String partitionColumnDateFormat) { String partitionColumnName = partitionColumn.getIdentity(); if (startInclusive > 0) { - builder.append(partitionColumnName + " >= '" - + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'"); + builder.append(partitionColumnName + " >= '" + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'"); builder.append(" AND "); } - builder.append(partitionColumnName + " < '" - + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'"); + builder.append(partitionColumnName + " < '" + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'"); } - private static void buildMultipleColumnRangeCondition(StringBuilder builder, TblColRef partitionDateColumn, - TblColRef partitionTimeColumn, long startInclusive, long endExclusive, String partitionColumnDateFormat, - String partitionColumnTimeFormat) { + private static void buildMultipleColumnRangeCondition(StringBuilder builder, TblColRef partitionDateColumn, TblColRef partitionTimeColumn, long startInclusive, long endExclusive, String partitionColumnDateFormat, String partitionColumnTimeFormat) { String partitionDateColumnName = partitionDateColumn.getIdentity(); String partitionTimeColumnName = partitionTimeColumn.getIdentity(); if (startInclusive > 0) { builder.append("("); builder.append("("); - builder.append(partitionDateColumnName + " = '" - + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'").append(" AND ") - .append(partitionTimeColumnName + " >= '" - + DateFormat.formatToDateStr(startInclusive, partitionColumnTimeFormat) + "'"); + builder.append(partitionDateColumnName + " = '" + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'").append(" AND ").append(partitionTimeColumnName + " >= '" + DateFormat.formatToDateStr(startInclusive, partitionColumnTimeFormat) + "'"); builder.append(")"); builder.append(" OR "); builder.append("("); - builder.append(partitionDateColumnName + " > '" - + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'"); + builder.append(partitionDateColumnName + " > '" + DateFormat.formatToDateStr(startInclusive, partitionColumnDateFormat) + "'"); builder.append(")"); builder.append(")"); builder.append(" AND "); @@ -261,15 +245,11 @@ public class PartitionDesc implements Serializable { builder.append("("); builder.append("("); - builder.append(partitionDateColumnName + " = '" - + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'").append(" AND ") - .append(partitionTimeColumnName + " < '" - + DateFormat.formatToDateStr(endExclusive, partitionColumnTimeFormat) + "'"); + builder.append(partitionDateColumnName + " = '" + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'").append(" AND ").append(partitionTimeColumnName + " < '" + DateFormat.formatToDateStr(endExclusive, partitionColumnTimeFormat) + "'"); builder.append(")"); builder.append(" OR "); builder.append("("); - builder.append(partitionDateColumnName + " < '" - + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'"); + builder.append(partitionDateColumnName + " < '" + DateFormat.formatToDateStr(endExclusive, partitionColumnDateFormat) + "'"); builder.append(")"); builder.append(")"); } @@ -287,8 +267,7 @@ public class PartitionDesc implements Serializable { TblColRef partitionColumn = partDesc.getPartitionDateColumnRef(); String tableAlias = partitionColumn.getTableAlias(); - String concatField = String.format("CONCAT(%s.YEAR,'-',%s.MONTH,'-',%s.DAY)", tableAlias, tableAlias, - tableAlias); + String concatField = String.format("CONCAT(%s.YEAR,'-',%s.MONTH,'-',%s.DAY)", tableAlias, tableAlias, tableAlias); StringBuilder builder = new StringBuilder(); if (startInclusive > 0) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentStatusEnum.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentStatusEnum.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentStatusEnum.java index 3b30d01..689a314 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentStatusEnum.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentStatusEnum.java @@ -24,6 +24,6 @@ import java.io.Serializable; * @author xduo * */ -public enum SegmentStatusEnum implements Serializable { +public enum SegmentStatusEnum implements Serializable{ NEW, READY, READY_PENDING } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java index af2b0ea..9d22dc6 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java @@ -28,7 +28,7 @@ import org.apache.kylin.common.util.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Segments<T extends ISegment> extends ArrayList<T> implements Serializable { +public class Segments<T extends ISegment> extends ArrayList<T> implements Serializable{ private static final long serialVersionUID = 1L; @@ -110,8 +110,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial public T getSegment(String name, SegmentStatusEnum status) { for (T segment : this) { - if ((null != segment.getName() && segment.getName().equals(name)) - && (status == null || segment.getStatus() == status)) { + if ((null != segment.getName() && segment.getName().equals(name)) && (status == null || segment.getStatus() == status)) { return segment; } } @@ -122,8 +121,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial Segments<T> buildingSegments = new Segments(); if (null != this) { for (T segment : this) { - if (SegmentStatusEnum.NEW == segment.getStatus() - || SegmentStatusEnum.READY_PENDING == segment.getStatus()) { + if (SegmentStatusEnum.NEW == segment.getStatus() || SegmentStatusEnum.READY_PENDING == segment.getStatus()) { buildingSegments.add(segment); } } @@ -146,8 +144,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial if (sourceOffsetContains(mergedSegment, seg)) { // make sure no holes if (result.size() > 0 && result.getLast().getSourceOffsetEnd() != seg.getSourceOffsetStart()) - throw new IllegalStateException( - "Merging segments must not have holes between " + result.getLast() + " and " + seg); + throw new IllegalStateException("Merging segments must not have holes between " + result.getLast() + " and " + seg); result.add(seg); } @@ -155,8 +152,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial return result; } - public Pair<Long, Long> autoMergeCubeSegments(boolean needAutoMerge, String cubeName, long[] timeRanges) - throws IOException { + public Pair<Long, Long> autoMergeCubeSegments(boolean needAutoMerge, String cubeName, long[] timeRanges) throws IOException { if (!needAutoMerge) { logger.debug("Cube " + cubeName + " doesn't need auto merge"); return null; @@ -175,8 +171,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial for (ISegment building : getBuildingSegments()) { // exclude those under-merging segs for (ISegment ready : readySegs) { - if (ready.getSourceOffsetStart() >= building.getSourceOffsetStart() - && ready.getSourceOffsetEnd() <= building.getSourceOffsetEnd()) { + if (ready.getSourceOffsetStart() >= building.getSourceOffsetStart() && ready.getSourceOffsetEnd() <= building.getSourceOffsetEnd()) { mergingSegs.add(ready); } } @@ -194,8 +189,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial for (int s = 0; s < readySegs.size(); s++) { ISegment seg = readySegs.get(s); Pair<T, T> p = readySegs.getSubList(s, readySegs.size()) // - .findMergeOffsetsByDateRange(seg.getDateRangeStart(), seg.getDateRangeStart() + toMergeRange, - toMergeRange); + .findMergeOffsetsByDateRange(seg.getDateRangeStart(), seg.getDateRangeStart() + toMergeRange, toMergeRange); if (p != null && p.getSecond().getDateRangeEnd() - p.getFirst().getDateRangeStart() >= toMergeRange) return Pair.newPair(p.getFirst().getSourceOffsetStart(), p.getSecond().getSourceOffsetEnd()); } @@ -339,4 +333,4 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial return result; } -} +} \ 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/model/TableDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java index 692f8a9..b388f11 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableDesc.java @@ -180,9 +180,9 @@ public class TableDesc extends RootPersistentEntity implements ISourceAware { if (columns == null) { return -1; } - + int max = -1; - + for (ColumnDesc col : columns) { int idx = col.getZeroBasedIndex(); max = Math.max(max, idx); @@ -264,9 +264,7 @@ public class TableDesc extends RootPersistentEntity implements ISourceAware { @Override public String toString() { - return "TableDesc{" + "name='" + name + '\'' + ", columns=" + Arrays.toString(columns) + ", sourceType=" - + sourceType + ", tableType='" + tableType + '\'' + ", database=" + database + ", identity='" - + getIdentity() + '\'' + '}'; + return "TableDesc{" + "name='" + name + '\'' + ", columns=" + Arrays.toString(columns) + ", sourceType=" + sourceType + ", tableType='" + tableType + '\'' + ", database=" + database + ", identity='" + getIdentity() + '\'' + '}'; } /** 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/TableExtDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java index 14e3049..a0f67f0 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java @@ -181,8 +181,7 @@ public class TableExtDesc extends RootPersistentEntity { } public boolean isPartitioned() { - return this.dataSourceProps.get("partition_column") == null ? false - : !this.dataSourceProps.get("partition_column").isEmpty(); + return this.dataSourceProps.get("partition_column") == null ? false : !this.dataSourceProps.get("partition_column").isEmpty(); } @Override @@ -199,8 +198,7 @@ public class TableExtDesc extends RootPersistentEntity { @Override public String toString() { - return "TableExtDesc{" + "name='" + (null == tableName ? "NULL" : tableName) + '\'' + ", columns_samples=" - + (null == columnStats ? "null" : Arrays.toString(columnStats.toArray())); + return "TableExtDesc{" + "name='" + (null == tableName ? "NULL" : tableName) + '\'' + ", columns_samples=" + (null == columnStats ? "null" : Arrays.toString(columnStats.toArray())); } @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java index 9669922..b213eae 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java @@ -26,6 +26,7 @@ import java.util.TreeSet; import javax.annotation.Nullable; +import com.fasterxml.jackson.annotation.JsonInclude; import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.persistence.ResourceStore; import org.apache.kylin.common.persistence.RootPersistentEntity; @@ -33,7 +34,6 @@ import org.apache.kylin.metadata.realization.RealizationType; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -99,9 +99,7 @@ public class ProjectInstance extends RootPersistentEntity { return project.toUpperCase(); } - public static ProjectInstance create(String name, String owner, String description, - LinkedHashMap<String, String> overrideProps, List<RealizationEntry> realizationEntries, - List<String> models) { + public static ProjectInstance create(String name, String owner, String description, LinkedHashMap<String, String> overrideProps, List<RealizationEntry> realizationEntries, List<String> models) { ProjectInstance projectInstance = new ProjectInstance(); projectInstance.updateRandomUuid(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java index 4eeb7f0..cf5498c 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java @@ -212,8 +212,7 @@ class ProjectL2Cache { if (filterDesc != null) { projectCache.extFilters.put(extFilterName, filterDesc); } else { - logger.warn( - "External Filter '" + extFilterName + "' defined under project '" + project + "' is not found"); + logger.warn("External Filter '" + extFilterName + "' defined under project '" + project + "' is not found"); } } @@ -260,17 +259,14 @@ class ProjectL2Cache { for (TblColRef col : allColumns) { TableDesc table = metaMgr.getTableDesc(col.getTable()); if (table == null) { - logger.error("Realization '" + realization.getCanonicalName() + "' reports column '" - + col.getCanonicalName() + "', but its table is not found by MetadataManager"); + logger.error("Realization '" + realization.getCanonicalName() + "' reports column '" + col.getCanonicalName() + "', but its table is not found by MetadataManager"); return false; } if (!col.getColumnDesc().isComputedColumnn()) { ColumnDesc foundCol = table.findColumnByName(col.getName()); if (col.getColumnDesc().equals(foundCol) == false) { - logger.error("Realization '" + realization.getCanonicalName() + "' reports column '" - + col.getCanonicalName() + "', but it is not equal to '" + foundCol - + "' according to MetadataManager"); + logger.error("Realization '" + realization.getCanonicalName() + "' reports column '" + col.getCanonicalName() + "', but it is not equal to '" + foundCol + "' according to MetadataManager"); return false; } } else { @@ -280,9 +276,7 @@ class ProjectL2Cache { // auto-define table required by realization for some legacy test case if (prjCache.tables.get(table.getIdentity()) == null) { prjCache.tables.put(table.getIdentity(), new TableCache(table)); - logger.warn( - "Realization '" + realization.getCanonicalName() + "' reports column '" + col.getCanonicalName() - + "' whose table is not defined in project '" + prjCache.project + "'"); + logger.warn("Realization '" + realization.getCanonicalName() + "' reports column '" + col.getCanonicalName() + "' whose table is not defined in project '" + prjCache.project + "'"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java index 6f2705e..ff2d3e6 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java @@ -52,8 +52,7 @@ import com.google.common.collect.Lists; public class ProjectManager { private static final Logger logger = LoggerFactory.getLogger(ProjectManager.class); private static final ConcurrentMap<KylinConfig, ProjectManager> CACHE = new ConcurrentHashMap<KylinConfig, ProjectManager>(); - public static final Serializer<ProjectInstance> PROJECT_SERIALIZER = new JsonSerializer<ProjectInstance>( - ProjectInstance.class); + public static final Serializer<ProjectInstance> PROJECT_SERIALIZER = new JsonSerializer<ProjectInstance>(ProjectInstance.class); public static ProjectManager getInstance(KylinConfig config) { ProjectManager r = CACHE.get(config); @@ -109,8 +108,7 @@ public class ProjectManager { } @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 { String project = cacheKey; if (event == Event.DROP) @@ -131,8 +129,7 @@ public class ProjectManager { ResourceStore store = getStore(); List<String> paths = store.collectResourceRecursively(ResourceStore.PROJECT_RESOURCE_ROOT, ".json"); - logger.debug( - "Loading Project from folder " + store.getReadableResourcePath(ResourceStore.PROJECT_RESOURCE_ROOT)); + logger.debug("Loading Project from folder " + store.getReadableResourcePath(ResourceStore.PROJECT_RESOURCE_ROOT)); for (String path : paths) { reloadProjectLocalAt(path); @@ -168,8 +165,7 @@ public class ProjectManager { return projectMap.get(projectName); } - public ProjectInstance createProject(String projectName, String owner, String description, - LinkedHashMap<String, String> overrideProps) throws IOException { + public ProjectInstance createProject(String projectName, String owner, String description, LinkedHashMap<String, String> overrideProps) throws IOException { logger.info("Creating project " + projectName); ProjectInstance currentProject = getProject(projectName); @@ -195,8 +191,7 @@ public class ProjectManager { } if (projectInstance.getRealizationCount(null) != 0) { - throw new IllegalStateException("The project named " + projectName - + " can not be deleted because there's still realizations in it. Delete them first."); + throw new IllegalStateException("The project named " + projectName + " can not be deleted because there's still realizations in it. Delete them first."); } logger.info("Dropping project '" + projectInstance.getName() + "'"); @@ -215,8 +210,7 @@ public class ProjectManager { } //update project itself - public ProjectInstance updateProject(ProjectInstance project, String newName, String newDesc, - LinkedHashMap<String, String> overrideProps) throws IOException { + public ProjectInstance updateProject(ProjectInstance project, String newName, String newDesc, LinkedHashMap<String, String> overrideProps) throws IOException { if (!project.getName().equals(newName)) { ProjectInstance newProject = this.createProject(newName, project.getOwner(), newDesc, overrideProps); @@ -292,21 +286,16 @@ public class ProjectManager { return newProject; } - public ProjectInstance moveRealizationToProject(RealizationType type, String realizationName, String newProjectName, - String owner) throws IOException { + public ProjectInstance moveRealizationToProject(RealizationType type, String realizationName, String newProjectName, String owner) throws IOException { removeRealizationsFromProjects(type, realizationName); return addRealizationToProject(type, realizationName, newProjectName, owner); } - private ProjectInstance addRealizationToProject(RealizationType type, String realizationName, String project, - String user) throws IOException { + private ProjectInstance addRealizationToProject(RealizationType type, String realizationName, String project, String user) throws IOException { String newProjectName = norm(project); ProjectInstance newProject = getProject(newProjectName); if (newProject == null) { - newProject = this.createProject(newProjectName, user, - "This is a project automatically added when adding realization " + realizationName + "(" + type - + ")", - null); + newProject = this.createProject(newProjectName, user, "This is a project automatically added when adding realization " + realizationName + "(" + type + ")", null); } newProject.addRealizationEntry(type, realizationName); updateProject(newProject); @@ -433,13 +422,11 @@ public class ProjectManager { } public boolean isExposedTable(String project, String table) { - return config.isAdhocEnabled() ? l2Cache.isDefinedTable(norm(project), table) - : l2Cache.isExposedTable(norm(project), table); + return config.isAdhocEnabled() ? l2Cache.isDefinedTable(norm(project), table) : l2Cache.isExposedTable(norm(project), table); } public boolean isExposedColumn(String project, String table, String col) { - return config.isAdhocEnabled() ? l2Cache.isDefinedColumn(norm(project), table, col) - : l2Cache.isExposedColumn(norm(project), table, col); + return config.isAdhocEnabled() ? l2Cache.isDefinedColumn(norm(project), table, col) : l2Cache.isExposedColumn(norm(project), table, col); } public Set<IRealization> listAllRealizations(String project) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/project/RealizationEntry.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/RealizationEntry.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/RealizationEntry.java index 8139053..421f802 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/RealizationEntry.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/RealizationEntry.java @@ -18,17 +18,17 @@ package org.apache.kylin.metadata.project; -import java.io.Serializable; - import org.apache.kylin.metadata.realization.RealizationType; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.Serializable; + /** */ @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE) -public class RealizationEntry implements Serializable { +public class RealizationEntry implements Serializable{ @JsonProperty("type") private RealizationType type; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMeta.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMeta.java b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMeta.java index b591c58..89b5675 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMeta.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMeta.java @@ -51,11 +51,7 @@ public class ColumnMeta implements Serializable { public ColumnMeta() { } - public ColumnMeta(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String cOLUMN_NAME, int dATA_TYPE, - String tYPE_NAME, int cOLUMN_SIZE, int bUFFER_LENGTH, int dECIMAL_DIGITS, int nUM_PREC_RADIX, int nULLABLE, - String rEMARKS, String cOLUMN_DEF, int sQL_DATA_TYPE, int sQL_DATETIME_SUB, int cHAR_OCTET_LENGTH, - int oRDINAL_POSITION, String iS_NULLABLE, String sCOPE_CATLOG, String sCOPE_SCHEMA, String sCOPE_TABLE, - short sOURCE_DATA_TYPE, String iS_AUTOINCREMENT) { + public ColumnMeta(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String cOLUMN_NAME, int dATA_TYPE, String tYPE_NAME, int cOLUMN_SIZE, int bUFFER_LENGTH, int dECIMAL_DIGITS, int nUM_PREC_RADIX, int nULLABLE, String rEMARKS, String cOLUMN_DEF, int sQL_DATA_TYPE, int sQL_DATETIME_SUB, int cHAR_OCTET_LENGTH, int oRDINAL_POSITION, String iS_NULLABLE, String sCOPE_CATLOG, String sCOPE_SCHEMA, String sCOPE_TABLE, short sOURCE_DATA_TYPE, String iS_AUTOINCREMENT) { super(); TABLE_CAT = tABLE_CAT; TABLE_SCHEM = tABLE_SCHEM; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMetaWithType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMetaWithType.java b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMetaWithType.java index 245ede4..e3cb86b 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMetaWithType.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/ColumnMetaWithType.java @@ -33,11 +33,7 @@ public class ColumnMetaWithType extends ColumnMeta { private HashSet<columnTypeEnum> TYPE; - public ColumnMetaWithType(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String cOLUMN_NAME, - int dATA_TYPE, String tYPE_NAME, int cOLUMN_SIZE, int bUFFER_LENGTH, int dECIMAL_DIGITS, int nUM_PREC_RADIX, - int nULLABLE, String rEMARKS, String cOLUMN_DEF, int sQL_DATA_TYPE, int sQL_DATETIME_SUB, - int cHAR_OCTET_LENGTH, int oRDINAL_POSITION, String iS_NULLABLE, String sCOPE_CATLOG, String sCOPE_SCHEMA, - String sCOPE_TABLE, short sOURCE_DATA_TYPE, String iS_AUTOINCREMENT) { + public ColumnMetaWithType(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String cOLUMN_NAME, int dATA_TYPE, String tYPE_NAME, int cOLUMN_SIZE, int bUFFER_LENGTH, int dECIMAL_DIGITS, int nUM_PREC_RADIX, int nULLABLE, String rEMARKS, String cOLUMN_DEF, int sQL_DATA_TYPE, int sQL_DATETIME_SUB, int cHAR_OCTET_LENGTH, int oRDINAL_POSITION, String iS_NULLABLE, String sCOPE_CATLOG, String sCOPE_SCHEMA, String sCOPE_TABLE, short sOURCE_DATA_TYPE, String iS_AUTOINCREMENT) { TABLE_CAT = tABLE_CAT; TABLE_SCHEM = tABLE_SCHEM; TABLE_NAME = tABLE_NAME; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/SelectedColumnMeta.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/SelectedColumnMeta.java b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/SelectedColumnMeta.java index c3bd0b7..9ba0da2 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/SelectedColumnMeta.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/SelectedColumnMeta.java @@ -23,10 +23,7 @@ import java.io.Serializable; /** */ public class SelectedColumnMeta implements Serializable { - public SelectedColumnMeta(boolean isAutoIncrement, boolean isCaseSensitive, boolean isSearchable, - boolean isCurrency, int isNullalbe, boolean isSigned, int displaySize, String label, String name, - String schemaName, String catelogName, String tableName, int precision, int scale, int columnType, - String columnTypeName, boolean isReadOnly, boolean isWritable, boolean isDefinitelyWritable) { + public SelectedColumnMeta(boolean isAutoIncrement, boolean isCaseSensitive, boolean isSearchable, boolean isCurrency, int isNullalbe, boolean isSigned, int displaySize, String label, String name, String schemaName, String catelogName, String tableName, int precision, int scale, int columnType, String columnTypeName, boolean isReadOnly, boolean isWritable, boolean isDefinitelyWritable) { super(); this.isAutoIncrement = isAutoIncrement; this.isCaseSensitive = isCaseSensitive; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMeta.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMeta.java b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMeta.java index bf9532e..b02fb4e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMeta.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMeta.java @@ -42,9 +42,7 @@ public class TableMeta implements Serializable { public TableMeta() { } - public TableMeta(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String tABLE_TYPE, String rEMARKS, - String tYPE_CAT, String tYPE_SCHEM, String tYPE_NAME, String sELF_REFERENCING_COL_NAME, - String rEF_GENERATION) { + public TableMeta(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String tABLE_TYPE, String rEMARKS, String tYPE_CAT, String tYPE_SCHEM, String tYPE_NAME, String sELF_REFERENCING_COL_NAME, String rEF_GENERATION) { super(); TABLE_CAT = tABLE_CAT; TABLE_SCHEM = tABLE_SCHEM; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMetaWithType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMetaWithType.java b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMetaWithType.java index 60df3a4..2ff21e4 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMetaWithType.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/querymeta/TableMetaWithType.java @@ -33,9 +33,7 @@ public class TableMetaWithType extends TableMeta { private HashSet<tableTypeEnum> TYPE; - public TableMetaWithType(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String tABLE_TYPE, String rEMARKS, - String tYPE_CAT, String tYPE_SCHEM, String tYPE_NAME, String sELF_REFERENCING_COL_NAME, - String rEF_GENERATION) { + public TableMetaWithType(String tABLE_CAT, String tABLE_SCHEM, String tABLE_NAME, String tABLE_TYPE, String rEMARKS, String tYPE_CAT, String tYPE_SCHEM, String tYPE_NAME, String sELF_REFERENCING_COL_NAME, String rEF_GENERATION) { TABLE_CAT = tABLE_CAT; TABLE_SCHEM = tABLE_SCHEM; TABLE_NAME = tABLE_NAME; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java index 41557c7..2d1a4a5 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java @@ -94,8 +94,7 @@ public class RealizationRegistry { for (String clsName : providerNames) { try { Class<? extends IRealizationProvider> cls = ClassUtil.forName(clsName, IRealizationProvider.class); - IRealizationProvider p = (IRealizationProvider) cls.getMethod("getInstance", KylinConfig.class) - .invoke(null, config); + IRealizationProvider p = (IRealizationProvider) cls.getMethod("getInstance", KylinConfig.class).invoke(null, config); providers.put(p.getRealizationType(), p); } catch (Exception | NoClassDefFoundError e) { @@ -107,8 +106,7 @@ public class RealizationRegistry { } if (providers.isEmpty()) - throw new IllegalArgumentException( - "Failed to find realization provider by url: " + config.getMetadataUrl()); + throw new IllegalArgumentException("Failed to find realization provider by url: " + config.getMetadataUrl()); logger.info("RealizationRegistry is " + providers); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationStatusEnum.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationStatusEnum.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationStatusEnum.java index 1a514c9..872d2e4 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationStatusEnum.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationStatusEnum.java @@ -20,7 +20,7 @@ package org.apache.kylin.metadata.realization; import java.io.Serializable; -public enum RealizationStatusEnum implements Serializable { +public enum RealizationStatusEnum implements Serializable{ DISABLED, READY, DESCBROKEN http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java index 840a0b3..9ce65bb 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigest.java @@ -96,7 +96,7 @@ public class SQLDigest { this.sortOrders = sortOrders; this.isRawQuery = isRawQuery(); this.limitPrecedesAggr = limitPrecedesAggr; - + this.includeSubqueryJoinParticipants(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java index 821116b..a70a17e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/SQLDigestUtil.java @@ -35,8 +35,7 @@ import com.google.common.collect.Range; */ public class SQLDigestUtil { - public static <F, T> T appendTsFilterToExecute(SQLDigest sqlDigest, TblColRef partitionColRef, Range<Long> tsRange, - Function<F, T> action) { + public static <F, T> T appendTsFilterToExecute(SQLDigest sqlDigest, TblColRef partitionColRef, Range<Long> tsRange, Function<F, T> action) { // add the boundary condition to query real-time TupleFilter originalFilter = sqlDigest.filter; @@ -81,8 +80,7 @@ public class SQLDigestUtil { return ret; } - private static TupleFilter createFilterForRealtime(TupleFilter originFilter, TblColRef partitionColRef, - Range<Long> tsRange) { + private static TupleFilter createFilterForRealtime(TupleFilter originFilter, TblColRef partitionColRef, Range<Long> tsRange) { DataType type = partitionColRef.getColumnDesc().getType(); String startTimeStr, endTimeStr; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java index 3bb09ab..345350e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java @@ -58,29 +58,21 @@ public class StreamSQLDigest { StreamSQLDigest other = (StreamSQLDigest) o; - if (filterSerialized != null ? !Arrays.equals(filterSerialized, other.filterSerialized) - : other.filterSerialized != null) + if (filterSerialized != null ? !Arrays.equals(filterSerialized, other.filterSerialized) : other.filterSerialized != null) return false; - if (sqlDigest.aggregations != null ? !sqlDigest.aggregations.equals(other.sqlDigest.aggregations) - : other.sqlDigest.aggregations != null) + if (sqlDigest.aggregations != null ? !sqlDigest.aggregations.equals(other.sqlDigest.aggregations) : other.sqlDigest.aggregations != null) return false; - if (sqlDigest.allColumns != null ? !sqlDigest.allColumns.equals(other.sqlDigest.allColumns) - : other.sqlDigest.allColumns != null) + if (sqlDigest.allColumns != null ? !sqlDigest.allColumns.equals(other.sqlDigest.allColumns) : other.sqlDigest.allColumns != null) return false; - if (sqlDigest.factTable != null ? !sqlDigest.factTable.equals(other.sqlDigest.factTable) - : other.sqlDigest.factTable != null) + if (sqlDigest.factTable != null ? !sqlDigest.factTable.equals(other.sqlDigest.factTable) : other.sqlDigest.factTable != null) return false; - if (sqlDigest.filterColumns != null ? !sqlDigest.filterColumns.equals(other.sqlDigest.filterColumns) - : other.sqlDigest.filterColumns != null) + if (sqlDigest.filterColumns != null ? !sqlDigest.filterColumns.equals(other.sqlDigest.filterColumns) : other.sqlDigest.filterColumns != null) return false; - if (sqlDigest.groupbyColumns != null ? !sqlDigest.groupbyColumns.equals(other.sqlDigest.groupbyColumns) - : other.sqlDigest.groupbyColumns != null) + if (sqlDigest.groupbyColumns != null ? !sqlDigest.groupbyColumns.equals(other.sqlDigest.groupbyColumns) : other.sqlDigest.groupbyColumns != null) return false; - if (sqlDigest.joinDescs != null ? !sqlDigest.joinDescs.equals(other.sqlDigest.joinDescs) - : other.sqlDigest.joinDescs != null) + if (sqlDigest.joinDescs != null ? !sqlDigest.joinDescs.equals(other.sqlDigest.joinDescs) : other.sqlDigest.joinDescs != null) return false; - if (sqlDigest.metricColumns != null ? !sqlDigest.metricColumns.equals(other.sqlDigest.metricColumns) - : other.sqlDigest.metricColumns != null) + if (sqlDigest.metricColumns != null ? !sqlDigest.metricColumns.equals(other.sqlDigest.metricColumns) : other.sqlDigest.metricColumns != null) return false; return true; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/streaming/StreamingManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/streaming/StreamingManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/streaming/StreamingManager.java index 4af0c22..48febeb 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/streaming/StreamingManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/streaming/StreamingManager.java @@ -45,8 +45,7 @@ public class StreamingManager { // static cached instances private static final ConcurrentMap<KylinConfig, StreamingManager> CACHE = new ConcurrentHashMap<KylinConfig, StreamingManager>(); - public static final Serializer<StreamingConfig> STREAMING_SERIALIZER = new JsonSerializer<StreamingConfig>( - StreamingConfig.class); + public static final Serializer<StreamingConfig> STREAMING_SERIALIZER = new JsonSerializer<StreamingConfig>(StreamingConfig.class); private KylinConfig config; @@ -60,7 +59,7 @@ public class StreamingManager { private StreamingManager(KylinConfig config) throws IOException { this.config = config; this.streamingMap = new CaseInsensitiveStringCache<StreamingConfig>(config, "streaming"); - + // touch lower level metadata before registering my listener reloadAllStreaming(); Broadcaster.getInstance(config).registerListener(new StreamingSyncListener(), "streaming"); @@ -73,8 +72,7 @@ public class StreamingManager { } @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) removeStreamingLocal(cacheKey); else @@ -119,8 +117,7 @@ public class StreamingManager { } private static String formatStreamingOutputPath(String streaming, List<Integer> partitions) { - return ResourceStore.STREAMING_OUTPUT_RESOURCE_ROOT + "/" + streaming + "_" + StringUtils.join(partitions, "_") - + ".json"; + return ResourceStore.STREAMING_OUTPUT_RESOURCE_ROOT + "/" + streaming + "_" + StringUtils.join(partitions, "_") + ".json"; } public StreamingConfig getStreamingConfig(String name) { @@ -222,13 +219,11 @@ public class StreamingManager { private void reloadAllStreaming() throws IOException { ResourceStore store = getStore(); - logger.info("Reloading Streaming Metadata from folder " - + store.getReadableResourcePath(ResourceStore.STREAMING_RESOURCE_ROOT)); + logger.info("Reloading Streaming Metadata from folder " + store.getReadableResourcePath(ResourceStore.STREAMING_RESOURCE_ROOT)); streamingMap.clear(); - List<String> paths = store.collectResourceRecursively(ResourceStore.STREAMING_RESOURCE_ROOT, - MetadataConstants.FILE_SURFIX); + List<String> paths = store.collectResourceRecursively(ResourceStore.STREAMING_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX); for (String path : paths) { StreamingConfig streamingConfig; try { @@ -238,8 +233,7 @@ public class StreamingManager { continue; } if (path.equals(streamingConfig.getResourcePath()) == false) { - logger.error("Skip suspicious desc at " + path + ", " + streamingConfig + " should be at " - + streamingConfig.getResourcePath()); + logger.error("Skip suspicious desc at " + path + ", " + streamingConfig + " should be at " + streamingConfig.getResourcePath()); continue; } if (streamingMap.containsKey(streamingConfig.getName())) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java index c41d61b..b50a7e4 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java @@ -188,8 +188,7 @@ public class Tuple implements ITuple { if (strValue == null) return null; - if ((strValue.equals("") || strValue.equals("\\N")) && !dataTypeName.equals("string") - && !dataTypeName.startsWith("varchar")) + if ((strValue.equals("") || strValue.equals("\\N")) && !dataTypeName.equals("string") && !dataTypeName.startsWith("varchar")) return null; switch (dataTypeName) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/ISource.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/ISource.java b/core-metadata/src/main/java/org/apache/kylin/source/ISource.java index 1811a5c..302c53c 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/ISource.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/ISource.java @@ -41,7 +41,7 @@ public interface ISource { * Return a ReadableTable that can iterate through the rows of given table. */ IReadableTable createReadableTable(TableDesc tableDesc); - + /** * Give the source a chance to enrich a SourcePartition before build start. * Particularly, Kafka source use this chance to define start/end offsets within each partition. http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/ISourceMetadataExplorer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/ISourceMetadataExplorer.java b/core-metadata/src/main/java/org/apache/kylin/source/ISourceMetadataExplorer.java index 48897c7..b746f19 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/ISourceMetadataExplorer.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/ISourceMetadataExplorer.java @@ -27,10 +27,10 @@ import org.apache.kylin.metadata.model.TableExtDesc; public interface ISourceMetadataExplorer { List<String> listDatabases() throws Exception; - + List<String> listTables(String database) throws Exception; - + Pair<TableDesc, TableExtDesc> loadTableMetadata(String database, String table) throws Exception; - + List<String> getRelatedKylinResources(TableDesc table); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/SourceFactory.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/SourceFactory.java b/core-metadata/src/main/java/org/apache/kylin/source/SourceFactory.java index cadd13c..86f89b8 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/SourceFactory.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/SourceFactory.java @@ -33,7 +33,7 @@ public class SourceFactory { Map<Integer, String> impls = KylinConfig.getInstanceFromEnv().getSourceEngines(); sources = new ImplementationSwitch<>(impls, ISource.class); } - + public static ISource getDefaultSource() { KylinConfig config = KylinConfig.getInstanceFromEnv(); return sources.get(config.getDefaultSource()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/SourcePartition.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/SourcePartition.java b/core-metadata/src/main/java/org/apache/kylin/source/SourcePartition.java index b77b55c..43e46c6 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/SourcePartition.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/SourcePartition.java @@ -44,8 +44,7 @@ public class SourcePartition { public SourcePartition() { } - public SourcePartition(long startDate, long endDate, long startOffset, long endOffset, - Map<Integer, Long> sourcePartitionOffsetStart, Map<Integer, Long> sourcePartitionOffsetEnd) { + public SourcePartition(long startDate, long endDate, long startOffset, long endOffset, Map<Integer, Long> sourcePartitionOffsetStart, Map<Integer, Long> sourcePartitionOffsetEnd) { this.startDate = startDate; this.endDate = endDate; this.startOffset = startOffset; @@ -104,10 +103,7 @@ public class SourcePartition { @Override public String toString() { - return Objects.toStringHelper(this).add("startDate", startDate).add("endDate", endDate) - .add("startOffset", startOffset).add("endOffset", endOffset) - .add("sourcePartitionOffsetStart", sourcePartitionOffsetStart.toString()) - .add("sourcePartitionOffsetEnd", sourcePartitionOffsetEnd.toString()).toString(); + return Objects.toStringHelper(this).add("startDate", startDate).add("endDate", endDate).add("startOffset", startOffset).add("endOffset", endOffset).add("sourcePartitionOffsetStart", sourcePartitionOffsetStart.toString()).add("sourcePartitionOffsetEnd", sourcePartitionOffsetEnd.toString()).toString(); } public static SourcePartition getCopyOf(SourcePartition origin) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenConfig.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenConfig.java b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenConfig.java index 292b2a0..62fe46c 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenConfig.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenConfig.java @@ -33,22 +33,22 @@ public class ColumnGenConfig { public static final String ID = "ID"; public static final String RAND = "RAND"; public static final String $RANDOM = "${RANDOM}"; - + // discrete values boolean isDiscrete; boolean isFK; List<String> values; - + // random boolean isRandom; String randFormat; int randStart; int randEnd; - + // ID boolean isID; int idStart; - + // general int cardinality; boolean genNull; @@ -56,19 +56,19 @@ public class ColumnGenConfig { String genNullStr; boolean order; boolean unique; - + public ColumnGenConfig(ColumnDesc col, ModelDataGenerator modelGen) throws IOException { init(col, modelGen); } private void init(ColumnDesc col, ModelDataGenerator modelGen) throws IOException { - + Map<String, String> config = Util.parseEqualCommaPairs(col.getDataGen(), "values"); values = Arrays.asList(Util.parseString(config, "values", "").split("[|]")); - + List<String> pkValues = modelGen.getPkValuesIfIsFk(col); - + if (FK.equals(values.get(0)) || (values.get(0).isEmpty() && pkValues != null)) { isFK = true; values = getPkValues(modelGen, config, pkValues); @@ -83,7 +83,7 @@ public class ColumnGenConfig { } else { isDiscrete = true; } - + cardinality = Util.parseInt(config, "card", guessCardinality(col.getName())); genNull = Util.parseBoolean(config, "null", guessGenNull(col.getName())); genNullPct = Util.parseDouble(config, "nullpct", 0.01); @@ -92,19 +92,17 @@ public class ColumnGenConfig { unique = Util.parseBoolean(config, "uniq", modelGen.isPK(col)); } - private List<String> getPkValues(ModelDataGenerator modelGen, Map<String, String> config, List<String> dftPkValues) - throws IOException { + private List<String> getPkValues(ModelDataGenerator modelGen, Map<String, String> config, List<String> dftPkValues) throws IOException { String pkColName = config.get("pk"); if (pkColName == null) return dftPkValues; - + int cut = pkColName.lastIndexOf('.'); String pkTableName = pkColName.substring(0, cut); pkColName = pkColName.substring(cut + 1); - + KylinConfig kylinConfig = modelGen.getModle().getConfig(); - ColumnDesc pkcol = MetadataManager.getInstance(kylinConfig).getTableDesc(pkTableName) - .findColumnByName(pkColName); + ColumnDesc pkcol = MetadataManager.getInstance(kylinConfig).getTableDesc(pkTableName).findColumnByName(pkColName); return modelGen.getPkValues(pkcol); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java index 858844f..f086ae9 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java @@ -250,7 +250,7 @@ public class ColumnGenerator { public String next() { if (values.isEmpty()) return null; - + return values.get(rand.nextInt(values.size())); } } @@ -312,7 +312,7 @@ public class ColumnGenerator { if (input.hasNext()) { r = input.next(); } - + if (rand.nextDouble() < nullPct) { r = nullStr; } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/datagen/ModelDataGenerator.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ModelDataGenerator.java b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ModelDataGenerator.java index fe8a236..3caf2f4 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/datagen/ModelDataGenerator.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/datagen/ModelDataGenerator.java @@ -65,7 +65,7 @@ public class ModelDataGenerator { private ModelDataGenerator(DataModelDesc model, int nRows, ResourceStore outputStore) { this(model, nRows, outputStore, "/data"); } - + private ModelDataGenerator(DataModelDesc model, int nRows, ResourceStore outputStore, String outputPath) { this.model = model; this.targetRows = nRows; @@ -79,10 +79,9 @@ public class ModelDataGenerator { JoinTableDesc[] allTables = model.getJoinTables(); for (int i = allTables.length - 1; i >= -1; i--) { - TableDesc table = (i == -1) ? model.getRootFactTable().getTableDesc() - : allTables[i].getTableRef().getTableDesc(); + TableDesc table = (i == -1) ? model.getRootFactTable().getTableDesc() : allTables[i].getTableRef().getTableDesc(); allTableDesc.add(table); - + if (generated.contains(table)) continue; @@ -176,7 +175,7 @@ public class ModelDataGenerator { for (TableDesc t : tables) { if (t.isView()) continue; - + out.print("DROP TABLE IF EXISTS " + normHiveIdentifier(t.getIdentity()) + ";\n"); out.print("CREATE TABLE " + normHiveIdentifier(t.getIdentity()) + "(" + "\n"); @@ -217,16 +216,15 @@ public class ModelDataGenerator { out.print("-- " + t.getIdentity() + " is view \n"); continue; } - - out.print("LOAD DATA LOCAL INPATH '" + t.getIdentity() + ".csv' OVERWRITE INTO TABLE " - + normHiveIdentifier(t.getIdentity()) + ";\n"); + + out.print("LOAD DATA LOCAL INPATH '" + t.getIdentity() + ".csv' OVERWRITE INTO TABLE " + normHiveIdentifier(t.getIdentity()) + ";\n"); } } public boolean existsInStore(TableDesc table) throws IOException { return outputStore.exists(path(table)); } - + public boolean isPK(ColumnDesc col) { for (JoinTableDesc joinTable : model.getJoinTables()) { JoinDesc join = joinTable.getJoin(); @@ -237,7 +235,7 @@ public class ModelDataGenerator { } return false; } - + public List<String> getPkValuesIfIsFk(ColumnDesc fk) throws IOException { JoinTableDesc[] joinTables = model.getJoinTables(); for (int i = 0; i < joinTables.length; i++) { @@ -268,8 +266,7 @@ public class ModelDataGenerator { List<String> r = new ArrayList<>(); - BufferedReader in = new BufferedReader( - new InputStreamReader(outputStore.getResource(path(pk.getTable())).inputStream, "UTF-8")); + BufferedReader in = new BufferedReader(new InputStreamReader(outputStore.getResource(path(pk.getTable())).inputStream, "UTF-8")); try { String line; while ((line = in.readLine()) != null) { @@ -305,12 +302,11 @@ public class ModelDataGenerator { String modelName = args[0]; int nRows = Integer.parseInt(args[1]); String outputDir = args.length > 2 ? args[2] : null; - + KylinConfig conf = KylinConfig.getInstanceFromEnv(); DataModelDesc model = MetadataManager.getInstance(conf).getDataModelDesc(modelName); - ResourceStore store = outputDir == null ? ResourceStore.getStore(conf) - : ResourceStore.getStore(mockup(outputDir)); - + ResourceStore store = outputDir == null ? ResourceStore.getStore(conf) : ResourceStore.getStore(mockup(outputDir)); + ModelDataGenerator gen = new ModelDataGenerator(model, nRows, store); gen.generate(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/datagen/TableGenConfig.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/datagen/TableGenConfig.java b/core-metadata/src/main/java/org/apache/kylin/source/datagen/TableGenConfig.java index 7a1a540..a0f19e7 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/datagen/TableGenConfig.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/datagen/TableGenConfig.java @@ -24,28 +24,28 @@ import java.util.Map; import org.apache.kylin.metadata.model.TableDesc; public class TableGenConfig { - + boolean needGen; double rows; - + public TableGenConfig(TableDesc table, ModelDataGenerator modelGen) throws IOException { String dataGen = table.getDataGen(); if (dataGen == null && modelGen.existsInStore(table) == false) { dataGen = ""; } - + if (dataGen == null || "no".equals(dataGen) || "false".equals(dataGen) || "skip".equals(dataGen)) return; - + if (table.isView()) return; - + needGen = true; - + Map<String, String> config = Util.parseEqualCommaPairs(dataGen, "rows"); - + // config.rows is either a multiplier (0,1] or an absolute row number rows = Util.parseDouble(config, "rows", modelGen.getModle().isFactTable(table.getIdentity()) ? 1.0 : 20); } - + } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/main/java/org/apache/kylin/source/datagen/Util.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/source/datagen/Util.java b/core-metadata/src/main/java/org/apache/kylin/source/datagen/Util.java index 87f3ab1..ca27bbf 100644 --- a/core-metadata/src/main/java/org/apache/kylin/source/datagen/Util.java +++ b/core-metadata/src/main/java/org/apache/kylin/source/datagen/Util.java @@ -27,7 +27,7 @@ public class Util { static Map<String, String> parseEqualCommaPairs(String equalCommaPairs, String defaultKey) { Map<String, String> r = new LinkedHashMap<>(); - + if (StringUtils.isBlank(equalCommaPairs)) return r; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/dimension/FixedLenHexDimEncTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/dimension/FixedLenHexDimEncTest.java b/core-metadata/src/test/java/org/apache/kylin/dimension/FixedLenHexDimEncTest.java index 942ebee..d9a1a0f 100644 --- a/core-metadata/src/test/java/org/apache/kylin/dimension/FixedLenHexDimEncTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/dimension/FixedLenHexDimEncTest.java @@ -96,15 +96,16 @@ public class FixedLenHexDimEncTest { } } + @Test public void testEncodeDecode2() { FixedLenHexDimEnc enc = new FixedLenHexDimEnc(5); testEncodeDecode(enc, "AF121"); testEncodeDecode(enc, "00000"); - + //with a little extra room all F is supported testEncodeDecode(enc, "FFFFF"); - + try { testEncodeDecode(enc, "FFF"); Assert.fail(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/dimension/IntegerDimEncTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/dimension/IntegerDimEncTest.java b/core-metadata/src/test/java/org/apache/kylin/dimension/IntegerDimEncTest.java index 14566b9..039e056 100644 --- a/core-metadata/src/test/java/org/apache/kylin/dimension/IntegerDimEncTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/dimension/IntegerDimEncTest.java @@ -39,13 +39,9 @@ public class IntegerDimEncTest { successValue.add(new long[] { -32767, -127, 0, 127, 32767 }); successValue.add(new long[] { -8388607, -32767, -127, 0, 127, 32767, 8388607 }); successValue.add(new long[] { -2147483647L, -8388607, -32767, -127, 0, 127, 32767, 8388607, 2147483647L }); - successValue.add(new long[] { -549755813887L, -2147483647L, -8388607, -32767, -127, 0, 127, 32767, 8388607, - 2147483647L, 549755813887L }); - successValue.add(new long[] { -140737488355327L, -549755813887L, -2147483647L, -8388607, -32767, -127, 0, 127, - 32767, 8388607, 2147483647L, 549755813887L, 140737488355327L }); - successValue.add(new long[] { -36028797018963967L, -140737488355327L, -549755813887L, -2147483647L, -8388607, - -32767, -127, 0, 127, 32767, 8388607, 2147483647L, 549755813887L, 140737488355327L, - 36028797018963967L }); + successValue.add(new long[] { -549755813887L, -2147483647L, -8388607, -32767, -127, 0, 127, 32767, 8388607, 2147483647L, 549755813887L }); + successValue.add(new long[] { -140737488355327L, -549755813887L, -2147483647L, -8388607, -32767, -127, 0, 127, 32767, 8388607, 2147483647L, 549755813887L, 140737488355327L }); + successValue.add(new long[] { -36028797018963967L, -140737488355327L, -549755813887L, -2147483647L, -8388607, -32767, -127, 0, 127, 32767, 8388607, 2147483647L, 549755813887L, 140737488355327L, 36028797018963967L }); successValue.add(new long[] { // -9223372036854775807L, // -36028797018963967L, // http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/dimension/OneMoreByteVLongDimEncTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/dimension/OneMoreByteVLongDimEncTest.java b/core-metadata/src/test/java/org/apache/kylin/dimension/OneMoreByteVLongDimEncTest.java index d62600d..17af5c1 100644 --- a/core-metadata/src/test/java/org/apache/kylin/dimension/OneMoreByteVLongDimEncTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/dimension/OneMoreByteVLongDimEncTest.java @@ -87,6 +87,7 @@ public class OneMoreByteVLongDimEncTest { } } + private void testEncodeDecode(OneMoreByteVLongDimEnc enc, long value) { String valueStr = "" + value; byte[] buf = new byte[enc.getLengthOfEncoding()]; @@ -95,6 +96,7 @@ public class OneMoreByteVLongDimEncTest { Assert.assertEquals(valueStr, decode); } + @Test public void testSerDes() { OneMoreByteVLongDimEnc enc = new OneMoreByteVLongDimEnc(2); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/AggregatorMemEstimateTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/AggregatorMemEstimateTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/AggregatorMemEstimateTest.java index e51e839..4e67d22 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/AggregatorMemEstimateTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/AggregatorMemEstimateTest.java @@ -84,8 +84,11 @@ public class AggregatorMemEstimateTest extends LocalFileMetadataTestCase { decimalMax.aggregate(decimal); decimalSum.aggregate(decimal); - return Lists.newArrayList(longMin, longMax, longSum, doubleMin, doubleMax, doubleSum, decimalMin, decimalMax, - decimalSum); + return Lists.newArrayList( + longMin, longMax, longSum, + doubleMin, doubleMax, doubleSum, + decimalMin, decimalMax, decimalSum + ); } private String getAggregatorName(Class<? extends MeasureAggregator> clazz) { @@ -108,8 +111,7 @@ public class AggregatorMemEstimateTest extends LocalFileMetadataTestCase { } bitmapAggregator.aggregate(bitmapCounter); - ExtendedColumnMeasureType extendedColumnType = new ExtendedColumnMeasureType("EXTENDED_COLUMN", - DataType.getType("extendedcolumn(100)")); + ExtendedColumnMeasureType extendedColumnType = new ExtendedColumnMeasureType("EXTENDED_COLUMN", DataType.getType("extendedcolumn(100)")); MeasureAggregator<ByteArray> extendedColumnAggregator = extendedColumnType.newAggregator(); extendedColumnAggregator.aggregate(new ByteArray(100)); @@ -121,8 +123,7 @@ public class AggregatorMemEstimateTest extends LocalFileMetadataTestCase { System.out.printf("%40s %10s %10s\n", "Class", "Estimate", "Actual"); for (MeasureAggregator aggregator : aggregators) { String clzName = getAggregatorName(aggregator.getClass()); - System.out.printf("%40s %10d %10d\n", clzName, aggregator.getMemBytesEstimate(), - meter.measureDeep(aggregator)); + System.out.printf("%40s %10d %10d\n", clzName, aggregator.getMemBytesEstimate(), meter.measureDeep(aggregator)); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapAggregatorTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapAggregatorTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapAggregatorTest.java index 4ce82d0..0b82fc4 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapAggregatorTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapAggregatorTest.java @@ -18,13 +18,13 @@ package org.apache.kylin.measure.bitmap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.junit.Test; import java.io.IOException; import java.nio.ByteBuffer; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class BitmapAggregatorTest { private static final BitmapCounterFactory factory = RoaringBitmapCounterFactory.INSTANCE; @@ -85,5 +85,6 @@ public class BitmapAggregatorTest { result.orWith(counter3); assertEquals(result, aggregator.getState()); + } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapCounterTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapCounterTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapCounterTest.java index 6d0c97b..7194a23 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapCounterTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapCounterTest.java @@ -18,12 +18,12 @@ package org.apache.kylin.measure.bitmap; +import org.junit.Test; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.Test; - public class BitmapCounterTest { private static final BitmapCounterFactory factory = RoaringBitmapCounterFactory.INSTANCE; @@ -43,17 +43,17 @@ public class BitmapCounterTest { counter2.orWith(counter); assertEquals(4, counter.getCount()); - assertEquals(6, counter2.getCount()); // in-place change + assertEquals(6, counter2.getCount()); // in-place change int i = 0; int[] values = new int[(int) counter2.getCount()]; for (int value : counter2) { values[i++] = value; } - assertArrayEquals(new int[] { 10, 20, 30, 40, 1000, 2000 }, values); + assertArrayEquals(new int[]{10, 20, 30, 40, 1000, 2000}, values); counter2.clear(); assertEquals(0, counter2.getCount()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapSerializerTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapSerializerTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapSerializerTest.java index 69aba9a..acbfe88 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapSerializerTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/bitmap/BitmapSerializerTest.java @@ -18,12 +18,6 @@ package org.apache.kylin.measure.bitmap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.nio.BufferOverflowException; -import java.nio.ByteBuffer; - import org.apache.kylin.common.util.LocalFileMetadataTestCase; import org.apache.kylin.metadata.datatype.DataType; import org.junit.AfterClass; @@ -31,6 +25,12 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.nio.BufferOverflowException; +import java.nio.ByteBuffer; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class BitmapSerializerTest extends LocalFileMetadataTestCase { @BeforeClass public static void setUp() throws Exception { @@ -74,4 +74,4 @@ public class BitmapSerializerTest extends LocalFileMetadataTestCase { assertTrue(e instanceof BufferOverflowException); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/hllc/HLLCMeasureTypeTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/hllc/HLLCMeasureTypeTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/hllc/HLLCMeasureTypeTest.java index 40b2567..e884094 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/hllc/HLLCMeasureTypeTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/hllc/HLLCMeasureTypeTest.java @@ -43,23 +43,22 @@ public class HLLCMeasureTypeTest extends LocalFileMetadataTestCase { @Test public void testIngest() { - MeasureType<HLLCounter> mtype = (MeasureType<HLLCounter>) MeasureTypeFactory - .create(HLLCMeasureType.FUNC_COUNT_DISTINCT, DataType.getType("hllc(10)")); + MeasureType<HLLCounter> mtype = (MeasureType<HLLCounter>) MeasureTypeFactory.create(HLLCMeasureType.FUNC_COUNT_DISTINCT, DataType.getType("hllc(10)")); MeasureIngester<HLLCounter> ingester = mtype.newIngester(); HLLCounter hllc; - + hllc = ingester.valueOf(new String[] { null }, null, null); assertEquals(0, hllc.getCountEstimate()); - + hllc = ingester.valueOf(new String[] { null, null }, null, null); assertEquals(0, hllc.getCountEstimate()); - + hllc = ingester.valueOf(new String[] { "" }, null, null); assertEquals(1, hllc.getCountEstimate()); - + hllc = ingester.valueOf(new String[] { "", null }, null, null); assertEquals(1, hllc.getCountEstimate()); - + hllc = ingester.valueOf(new String[] { "abc" }, null, null); assertEquals(1, hllc.getCountEstimate()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/core-metadata/src/test/java/org/apache/kylin/measure/percentile/PercentileCounterTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/measure/percentile/PercentileCounterTest.java b/core-metadata/src/test/java/org/apache/kylin/measure/percentile/PercentileCounterTest.java index ba7cbdd..94a1233 100644 --- a/core-metadata/src/test/java/org/apache/kylin/measure/percentile/PercentileCounterTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/measure/percentile/PercentileCounterTest.java @@ -109,7 +109,7 @@ public class PercentileCounterTest { ObjectInputStream in = null; try { in = new ObjectInputStream(is); - serialized_counter = (PercentileCounter) in.readObject(); + serialized_counter = (PercentileCounter)in.readObject(); Assert.assertNotNull(serialized_counter); Assert.assertNotNull(serialized_counter.registers);
