shaofengshi closed pull request #289: KYLIN-3630, remove unused fields in the
implementations of MeasureType
URL: https://github.com/apache/kylin/pull/289
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 403d1b6c6d..f724257de5 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 @@
@Override
public MeasureType<BitmapCounter> createMeasureType(String funcName,
DataType dataType) {
- return new BitmapMeasureType(funcName, dataType);
+ return new BitmapMeasureType();
}
@Override
@@ -71,10 +71,7 @@ public String getAggrDataTypeName() {
}
}
- 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 b38299ac3b..4c20ef3fe2 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 @@
@Override
public MeasureType<ByteArray> createMeasureType(String funcName,
DataType dataType) {
- return new ExtendedColumnMeasureType(funcName, dataType);
+ return new ExtendedColumnMeasureType(dataType);
}
@Override
@@ -75,7 +75,7 @@ public String getAggrDataTypeName() {
}
}
- 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 51c5a66217..daa104baf7 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 @@
@Override
public MeasureType<HLLCounter> createMeasureType(String funcName,
DataType dataType) {
- return new HLLCMeasureType(funcName, dataType);
+ return new HLLCMeasureType(dataType);
}
@Override
@@ -66,7 +66,7 @@ public String getAggrDataTypeName() {
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 2c79784696..44bd2133b2 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 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 PercentileMeasureType(String funcName, DataType
dataType) {
@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 2add0602ad..e9f1c82c45 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 @@
@Override
public MeasureType<List<ByteArray>> createMeasureType(String funcName,
DataType dataType) {
- return new RawMeasureType(funcName, dataType);
+ return new RawMeasureType();
}
@Override
@@ -76,11 +76,7 @@ public String getAggrDataTypeName() {
}
}
- @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 6b4c5b7476..9b6ff0ac20 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 @@
@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 String getAggrDataTypeName() {
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 7ccec637f9..87d256b4ce 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 void testAggregatorEstimate() {
}
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));
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
