You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/10/14 12:41:02 UTC
[kylin] branch master updated: KYLIN-3630,
remove unused fields in the implementations of MeasureType
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 50f1758 KYLIN-3630, remove unused fields in the implementations of MeasureType
50f1758 is described below
commit 50f175892a558d40d645501745c9ab7d060fa0f6
Author: tttMelody <24...@qq.com>
AuthorDate: Sun Oct 14 19:12:02 2018 +0800
KYLIN-3630, remove unused fields in the implementations of MeasureType
---
.../java/org/apache/kylin/measure/bitmap/BitmapMeasureType.java | 7 ++-----
.../kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java | 4 ++--
.../main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java | 4 ++--
.../apache/kylin/measure/percentile/PercentileMeasureType.java | 4 ++--
.../main/java/org/apache/kylin/measure/raw/RawMeasureType.java | 8 ++------
.../main/java/org/apache/kylin/measure/topn/TopNMeasureType.java | 4 ++--
.../java/org/apache/kylin/measure/AggregatorMemEstimateTest.java | 2 +-
7 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapMeasureType.java
index 403d1b6..f724257 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapMeasureType.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/bitmap/BitmapMeasureType.java
@@ -52,7 +52,7 @@ public class BitmapMeasureType extends MeasureType<BitmapCounter> {
@Override
public MeasureType<BitmapCounter> createMeasureType(String funcName, DataType dataType) {
- return new BitmapMeasureType(funcName, dataType);
+ return new BitmapMeasureType();
}
@Override
@@ -71,10 +71,7 @@ public class BitmapMeasureType extends MeasureType<BitmapCounter> {
}
}
- public DataType dataType;
-
- public BitmapMeasureType(String funcName, DataType dataType) {
- this.dataType = dataType;
+ public BitmapMeasureType() {
}
@Override
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
index b38299a..4c20ef3 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnMeasureType.java
@@ -56,7 +56,7 @@ public class ExtendedColumnMeasureType extends MeasureType<ByteArray> {
@Override
public MeasureType<ByteArray> createMeasureType(String funcName, DataType dataType) {
- return new ExtendedColumnMeasureType(funcName, dataType);
+ return new ExtendedColumnMeasureType(dataType);
}
@Override
@@ -75,7 +75,7 @@ public class ExtendedColumnMeasureType extends MeasureType<ByteArray> {
}
}
- public ExtendedColumnMeasureType(String funcName, DataType dataType) {
+ public ExtendedColumnMeasureType(DataType dataType) {
this.dataType = dataType;
}
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java
index 51c5a66..daa104b 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java
@@ -43,7 +43,7 @@ public class HLLCMeasureType extends MeasureType<HLLCounter> {
@Override
public MeasureType<HLLCounter> createMeasureType(String funcName, DataType dataType) {
- return new HLLCMeasureType(funcName, dataType);
+ return new HLLCMeasureType(dataType);
}
@Override
@@ -66,7 +66,7 @@ public class HLLCMeasureType extends MeasureType<HLLCounter> {
private final DataType dataType;
- public HLLCMeasureType(String funcName, DataType dataType) {
+ public HLLCMeasureType(DataType dataType) {
// note at query parsing phase, the data type may be null, because only function and parameters are known
this.dataType = dataType;
}
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 2c79784..44bd213 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
@@ -39,7 +39,7 @@ public class PercentileMeasureType extends MeasureType<PercentileCounter> {
public static final String FUNC_PERCENTILE_APPROX = "PERCENTILE_APPROX";
public static final String DATATYPE_PERCENTILE = "percentile";
- public PercentileMeasureType(String funcName, DataType dataType) {
+ public PercentileMeasureType(DataType dataType) {
this.dataType = dataType;
}
@@ -47,7 +47,7 @@ public class PercentileMeasureType extends MeasureType<PercentileCounter> {
@Override
public MeasureType<PercentileCounter> createMeasureType(String funcName, DataType dataType) {
- return new PercentileMeasureType(funcName, dataType);
+ return new PercentileMeasureType(dataType);
}
@Override
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 2add060..e9f1c82 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
@@ -57,7 +57,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> {
@Override
public MeasureType<List<ByteArray>> createMeasureType(String funcName, DataType dataType) {
- return new RawMeasureType(funcName, dataType);
+ return new RawMeasureType();
}
@Override
@@ -76,11 +76,7 @@ public class RawMeasureType extends MeasureType<List<ByteArray>> {
}
}
- @SuppressWarnings("unused")
- private final DataType dataType;
-
- public RawMeasureType(String funcName, DataType dataType) {
- this.dataType = dataType;
+ public RawMeasureType() {
}
public void validate(FunctionDesc functionDesc) throws IllegalArgumentException {
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 6b4c5b7..9b6ff0a 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
@@ -67,7 +67,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> {
@Override
public MeasureType<TopNCounter<ByteArray>> createMeasureType(String funcName, DataType dataType) {
- return new TopNMeasureType(funcName, dataType);
+ return new TopNMeasureType(dataType);
}
@Override
@@ -90,7 +90,7 @@ public class TopNMeasureType extends MeasureType<TopNCounter<ByteArray>> {
private final DataType dataType;
- public TopNMeasureType(String funcName, DataType dataType) {
+ public TopNMeasureType(DataType dataType) {
// note at query parsing phase, the data type may be null, because only function and parameters are known
this.dataType = dataType;
}
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 7ccec63..87d256b 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
@@ -109,7 +109,7 @@ public class AggregatorMemEstimateTest extends LocalFileMetadataTestCase {
}
bitmapAggregator.aggregate(bitmapCounter);
- ExtendedColumnMeasureType extendedColumnType = new ExtendedColumnMeasureType("EXTENDED_COLUMN",
+ ExtendedColumnMeasureType extendedColumnType = new ExtendedColumnMeasureType(
DataType.getType("extendedcolumn(100)"));
MeasureAggregator<ByteArray> extendedColumnAggregator = extendedColumnType.newAggregator();
extendedColumnAggregator.aggregate(new ByteArray(100));