You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yu...@apache.org on 2022/01/26 03:39:27 UTC
[iotdb] branch kyy updated: exp
This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a commit to branch kyy
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/kyy by this push:
new 95a321b exp
95a321b is described below
commit 95a321bec6be19f52729fcf750f44013bec6ae8a
Author: Ring-k <yu...@hotmail.com>
AuthorDate: Wed Jan 26 11:38:44 2022 +0800
exp
---
.../aggregation/IoTDBAggregationLargeDataIT.java | 28 +++++++++++-----------
.../aggregation/IoTDBAggregationSmallDataIT.java | 10 ++++----
.../file/metadata/statistics/BinaryStatistics.java | 11 +++++----
.../metadata/statistics/BooleanStatistics.java | 5 ++--
.../file/metadata/statistics/DoubleStatistics.java | 4 ++--
.../file/metadata/statistics/FloatStatistics.java | 4 ++--
.../metadata/statistics/IntegerStatistics.java | 4 ++--
.../file/metadata/statistics/LongStatistics.java | 4 ++--
.../file/metadata/statistics/TimeStatistics.java | 4 ++--
9 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
index f3dde27..21aa762 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
@@ -214,7 +214,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(sum(d0s1))
+ ","
+ Math.round(resultSet.getDouble(sum(d0s2)));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -236,7 +236,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(sum(d0s1))
+ ","
+ Math.round(resultSet.getDouble(sum(d0s2)));
- Assert.assertEquals(ans, retArray[retArray.length - cnt - 1]);
+ Assert.assertEquals(retArray[retArray.length - cnt - 1], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -274,7 +274,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(firstValue(d0s3))
+ ","
+ resultSet.getString(firstValue(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -301,7 +301,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(firstValue(d0s3))
+ ","
+ resultSet.getString(firstValue(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -446,7 +446,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(minTime(d0s3))
+ ","
+ resultSet.getString(minTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -473,7 +473,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(minTime(d0s3))
+ ","
+ resultSet.getString(minTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -507,7 +507,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(minValue(d0s1))
+ ","
+ resultSet.getString(minValue(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -531,7 +531,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(minValue(d0s1))
+ ","
+ resultSet.getString(minValue(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -567,7 +567,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(maxValue(d0s1))
+ ","
+ resultSet.getString(maxValue(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -591,7 +591,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(maxValue(d0s1))
+ ","
+ resultSet.getString(maxValue(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -628,7 +628,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(extreme(d0s1))
+ ","
+ resultSet.getString(extreme(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -653,7 +653,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(extreme(d0s1))
+ ","
+ resultSet.getString(extreme(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -890,7 +890,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(maxTime(d0s3))
+ ","
+ resultSet.getString(maxTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -917,7 +917,7 @@ public class IoTDBAggregationLargeDataIT {
+ resultSet.getString(maxTime(d0s3))
+ ","
+ resultSet.getString(maxTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
index 4a04675..aaec4be 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
@@ -563,7 +563,7 @@ public class IoTDBAggregationSmallDataIT {
+ resultSet.getString(minTime(d0s3))
+ ","
+ resultSet.getString(minTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
Assert.assertEquals(1, cnt);
}
@@ -601,7 +601,7 @@ public class IoTDBAggregationSmallDataIT {
+ resultSet.getString(maxTime(d0s3))
+ ","
+ resultSet.getString(maxTime(d0s4));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -635,7 +635,7 @@ public class IoTDBAggregationSmallDataIT {
+ resultSet.getString(minValue(d0s1))
+ ","
+ resultSet.getString(minValue(d0s2));
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
@@ -758,7 +758,7 @@ public class IoTDBAggregationSmallDataIT {
+ resultSet.getString(d0s3)
+ ","
+ resultSet.getString(d1s0);
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(17, cnt);
@@ -772,7 +772,7 @@ public class IoTDBAggregationSmallDataIT {
int cnt = 0;
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(d0s4);
- Assert.assertEquals(ans, retArray[cnt]);
+ Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
Assert.assertEquals(1, cnt);
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 a14770b..b2ba5b7 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
@@ -44,7 +44,8 @@ public class BinaryStatistics extends Statistics<Binary> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
@@ -80,12 +81,12 @@ 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, BINARY, "min"));
}
@Override
public Binary getMaxValue() {
- throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG,BINARY, "max"));
+ throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, BINARY, "max"));
}
@Override
@@ -100,12 +101,12 @@ 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, BINARY, "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, BINARY, "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 4193951..56745c2 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.file.metadata.statistics;
import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -44,7 +43,8 @@ public class BooleanStatistics extends Statistics<Boolean> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
@@ -134,7 +134,6 @@ public class BooleanStatistics extends Statistics<Boolean> {
return sumValue;
}
-
@Override
protected void mergeStatisticsValue(Statistics<Boolean> stats) {
BooleanStatistics boolStats = (BooleanStatistics) stats;
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 98d0fb6..f7f223d 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.file.metadata.statistics;
import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -46,7 +45,8 @@ public class DoubleStatistics extends Statistics<Double> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
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 8e76da0..87b98ff 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.file.metadata.statistics;
import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -47,7 +46,8 @@ public class FloatStatistics extends Statistics<Float> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
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 2b744a1..26570f4 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.file.metadata.statistics;
import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -47,7 +46,8 @@ public class IntegerStatistics extends Statistics<Integer> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
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 1939878..7326fab 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.file.metadata.statistics;
import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -46,7 +45,8 @@ public class LongStatistics extends Statistics<Long> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
index 9dca855..adc967e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
@@ -37,7 +37,8 @@ public class TimeStatistics extends Statistics<Long> {
}
/**
- * The output of this method should be identical to the method "serializeStats(OutputStream outputStream)"
+ * The output of this method should be identical to the method "serializeStats(OutputStream
+ * outputStream)"
*/
@Override
public int getStatsSize() {
@@ -97,7 +98,6 @@ public class TimeStatistics extends Statistics<Long> {
@Override
protected void mergeStatisticsValue(Statistics<Long> stats) {}
-
@Override
public int serializeStats(OutputStream outputStream) {
return 0;