You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/02/08 09:11:55 UTC
[iotdb] branch master updated: [IOTDB-2512]Replaced some static variables with TSDataType.toString (#5018)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9c97d09b [IOTDB-2512]Replaced some static variables with TSDataType.toString (#5018)
9c97d09b is described below
commit 9c97d09baac265626f72af82360c1f7acb586cd0
Author: Zhang Zeyu <57...@users.noreply.github.com>
AuthorDate: Tue Feb 8 17:10:43 2022 +0800
[IOTDB-2512]Replaced some static variables with TSDataType.toString (#5018)
Co-authored-by: Zhang Zeyu <Je...@outlook.com>
---
.../tsfile/file/metadata/statistics/BinaryStatistics.java | 13 ++++++++-----
.../tsfile/file/metadata/statistics/BooleanStatistics.java | 10 ++++++----
.../tsfile/file/metadata/statistics/DoubleStatistics.java | 4 ++--
.../tsfile/file/metadata/statistics/FloatStatistics.java | 4 ++--
.../tsfile/file/metadata/statistics/IntegerStatistics.java | 4 ++--
.../tsfile/file/metadata/statistics/LongStatistics.java | 4 ++--
6 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
index b2ba5b7..65a7363 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
@@ -35,7 +35,6 @@ public class BinaryStatistics extends Statistics<Binary> {
private Binary firstValue = new Binary("");
private Binary lastValue = new Binary("");
- private static final String BINARY = "Binary";
static final int BINARY_STATISTICS_FIXED_RAM_SIZE = 32;
@Override
@@ -81,12 +80,14 @@ public class BinaryStatistics extends Statistics<Binary> {
@Override
public Binary getMinValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BINARY, "min"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.TEXT, "min"));
}
@Override
public Binary getMaxValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BINARY, "max"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.TEXT, "max"));
}
@Override
@@ -101,12 +102,14 @@ public class BinaryStatistics extends Statistics<Binary> {
@Override
public double getSumDoubleValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BINARY, "double sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.TEXT, "double sum"));
}
@Override
public long getSumLongValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BINARY, "long sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.TEXT, "long sum"));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
index 56745c2..300a349 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
@@ -35,7 +35,6 @@ public class BooleanStatistics extends Statistics<Boolean> {
private long sumValue;
static final int BOOLEAN_STATISTICS_FIXED_RAM_SIZE = 56;
- private static final String BOOLEAN = "Boolean";
@Override
public TSDataType getType() {
@@ -106,12 +105,14 @@ public class BooleanStatistics extends Statistics<Boolean> {
@Override
public Boolean getMinValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BOOLEAN, "min"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.BOOLEAN, "min"));
}
@Override
public Boolean getMaxValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BOOLEAN, "max"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.BOOLEAN, "max"));
}
@Override
@@ -126,7 +127,8 @@ public class BooleanStatistics extends Statistics<Boolean> {
@Override
public double getSumDoubleValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BOOLEAN, "double sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.BOOLEAN, "double sum"));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
index a867d3e..4176a7d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
@@ -37,7 +37,6 @@ public class DoubleStatistics extends Statistics<Double> {
private double sumValue;
static final int DOUBLE_STATISTICS_FIXED_RAM_SIZE = 80;
- private static final String DOUBLE = "Double";
@Override
public TSDataType getType() {
@@ -156,7 +155,8 @@ public class DoubleStatistics extends Statistics<Double> {
@Override
public long getSumLongValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, DOUBLE, "long sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.DOUBLE, "long sum"));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
index 612ce61..30e5400 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
@@ -38,7 +38,6 @@ public class FloatStatistics extends Statistics<Float> {
private double sumValue;
static final int FLOAT_STATISTICS_FIXED_RAM_SIZE = 64;
- private static final String FLOAT = "Float";
@Override
public TSDataType getType() {
@@ -148,7 +147,8 @@ public class FloatStatistics extends Statistics<Float> {
@Override
public long getSumLongValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, FLOAT, "long sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.FLOAT, "long sum"));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
index 26570f4..1ed3174 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
@@ -38,7 +38,6 @@ public class IntegerStatistics extends Statistics<Integer> {
private long sumValue;
static final int INTEGER_STATISTICS_FIXED_RAM_SIZE = 64;
- private static final String INTEGER = "Integer";
@Override
public TSDataType getType() {
@@ -143,7 +142,8 @@ public class IntegerStatistics extends Statistics<Integer> {
@Override
public double getSumDoubleValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, INTEGER, "double sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.INT32, "double sum"));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
index 7326fab..4df12df 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
@@ -37,7 +37,6 @@ public class LongStatistics extends Statistics<Long> {
private double sumValue;
static final int LONG_STATISTICS_FIXED_RAM_SIZE = 80;
- private static final String LONG = "Long";
@Override
public TSDataType getType() {
@@ -125,7 +124,8 @@ public class LongStatistics extends Statistics<Long> {
@Override
public long getSumLongValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, LONG, "long sum"));
+ throw new StatisticsClassException(
+ String.format(STATS_UNSUPPORTED_MSG, TSDataType.INT64, "long sum"));
}
@Override