This is an automated email from the ASF dual-hosted git repository.
caogaofei 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 304fbab00bd Unifying Exception Messages for Aggregation Functions
(#15231)
304fbab00bd is described below
commit 304fbab00bde781856f305f9ef6a1ecab6d45f07
Author: FearfulTomcat27 <[email protected]>
AuthorDate: Tue Apr 1 17:49:20 2025 +0800
Unifying Exception Messages for Aggregation Functions (#15231)
---
.../aggregation/CountAllAccumulator.java | 2 +-
.../relational/aggregation/FirstByAccumulator.java | 11 +++-----
.../relational/aggregation/LastByAccumulator.java | 6 ++---
.../relational/aggregation/MaxAccumulator.java | 6 ++---
.../relational/aggregation/MinAccumulator.java | 4 +--
.../relational/aggregation/SumAccumulator.java | 4 +--
.../aggregation/TableVarianceAccumulator.java | 4 +--
.../aggregation/grouped/GroupedAvgAccumulator.java | 2 +-
.../grouped/GroupedExtremeAccumulator.java | 16 ++++++------
.../grouped/GroupedFirstAccumulator.java | 16 ++++++------
.../grouped/GroupedFirstByAccumulator.java | 18 ++++++-------
.../grouped/GroupedLastAccumulator.java | 16 ++++++------
.../grouped/GroupedLastByAccumulator.java | 18 ++++++-------
.../aggregation/grouped/GroupedMaxAccumulator.java | 16 ++++++------
.../grouped/GroupedMaxMinByBaseAccumulator.java | 30 +++++++++++-----------
.../aggregation/grouped/GroupedMinAccumulator.java | 16 ++++++------
.../aggregation/grouped/GroupedSumAccumulator.java | 2 +-
.../grouped/GroupedVarianceAccumulator.java | 2 +-
18 files changed, 93 insertions(+), 96 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java
index 27867e38730..5a42082f0eb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java
@@ -50,7 +50,7 @@ public class CountAllAccumulator implements TableAccumulator {
@Override
public void removeInput(Column[] arguments) {
- checkArgument(arguments.length == 1, "argument of Count should be one
column");
+ checkArgument(arguments.length == 1, "argument of CountAll should be one
column");
int count = arguments[0].getPositionCount();
countState -= count;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java
index a1047128d16..e696b4a7de4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java
@@ -35,7 +35,6 @@ import org.apache.tsfile.write.UnSupportedDataTypeException;
import static com.google.common.base.Preconditions.checkArgument;
import static
org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValue;
-import static
org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION;
public class FirstByAccumulator implements TableAccumulator {
@@ -105,7 +104,7 @@ public class FirstByAccumulator implements TableAccumulator
{
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in FirstBy: %s", yDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
yDataType));
}
}
@@ -170,7 +169,7 @@ public class FirstByAccumulator implements TableAccumulator
{
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in First Aggregation: %s",
yDataType));
+ String.format("Unsupported data type in FirstBy Aggregation:
%s", yDataType));
}
}
}
@@ -221,7 +220,7 @@ public class FirstByAccumulator implements TableAccumulator
{
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in FirstBy: %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -285,9 +284,7 @@ public class FirstByAccumulator implements TableAccumulator
{
break;
default:
throw new UnSupportedDataTypeException(
- String.format(
- "Unsupported data type: %s in Aggregation: %s",
- yDataType, FIRST_BY_AGGREGATION));
+ String.format("Unsupported data type in FirstBy Aggregation:
%s", yDataType));
}
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java
index bef3f534ce9..47c19349522 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java
@@ -129,7 +129,7 @@ public class LastByAccumulator implements TableAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastBy: %s", yDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
yDataType));
}
}
@@ -194,7 +194,7 @@ public class LastByAccumulator implements TableAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in Last Aggregation: %s",
yDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
yDataType));
}
}
}
@@ -245,7 +245,7 @@ public class LastByAccumulator implements TableAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastBy: %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java
index b7d2a2c88ce..e66ee7e1c2c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java
@@ -81,7 +81,7 @@ public class MaxAccumulator implements TableAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastValue: %s",
seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
@@ -189,7 +189,7 @@ public class MaxAccumulator implements TableAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in MaxAggregation: %s",
seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
@@ -230,7 +230,7 @@ public class MaxAccumulator implements TableAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java
index 6d571fb8b1a..4e4d394a4e5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java
@@ -81,7 +81,7 @@ public class MinAccumulator implements TableAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastValue: %s",
seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
@@ -230,7 +230,7 @@ public class MinAccumulator implements TableAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java
index 1bc6322507c..c31d3d72b3c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java
@@ -73,7 +73,7 @@ public class SumAccumulator implements TableAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation Sum : %s",
argumentDataType));
+ String.format("Unsupported data type in Sum Aggregation: %s",
argumentDataType));
}
}
@@ -101,7 +101,7 @@ public class SumAccumulator implements TableAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation Sum : %s",
argumentDataType));
+ String.format("Unsupported data type in Sum Aggregation: %s",
argumentDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java
index 83997b7b1e2..61ae7a0190c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java
@@ -85,7 +85,7 @@ public class TableVarianceAccumulator implements
TableAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation variance :
%s", seriesDataType));
+ String.format("Unsupported data type in Variance Aggregation: %s",
seriesDataType));
}
}
@@ -112,7 +112,7 @@ public class TableVarianceAccumulator implements
TableAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation variance :
%s", seriesDataType));
+ String.format("Unsupported data type in Variance Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java
index 7be8b0f460f..868fcbcca1d 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java
@@ -83,7 +83,7 @@ public class GroupedAvgAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation AVG : %s",
argumentDataType));
+ String.format("Unsupported data type in AVG Aggregation: %s",
argumentDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java
index d0893c5a833..24a03852061 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java
@@ -67,7 +67,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type Extreme Aggregation: %s",
seriesDataType));
}
}
@@ -97,7 +97,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation: %s",
seriesDataType));
}
return INSTANCE_SIZE + valuesSize;
@@ -127,7 +127,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case BOOLEAN:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation: %s",
seriesDataType));
}
}
@@ -155,7 +155,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type Extreme Aggregation: %s",
seriesDataType));
}
}
@@ -188,7 +188,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation:
%s", seriesDataType));
}
}
}
@@ -219,7 +219,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation:
%s", seriesDataType));
}
}
}
@@ -250,7 +250,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation:
%s", seriesDataType));
}
}
}
@@ -282,7 +282,7 @@ public class GroupedExtremeAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Extreme Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java
index e4277bf640b..348fc42b229 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java
@@ -85,7 +85,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
@@ -117,7 +117,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
return INSTANCE_SIZE + valuesSize;
@@ -151,7 +151,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
@@ -183,7 +183,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
@@ -237,7 +237,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
}
@@ -284,7 +284,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
}
@@ -320,7 +320,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
@@ -372,7 +372,7 @@ public class GroupedFirstAccumulator implements
GroupedAccumulator {
return bytes;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in First Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java
index 9a1bf72f680..5bbf87626aa 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java
@@ -95,7 +95,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -127,7 +127,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
return INSTANCE_SIZE + valuesSize + yFirstTimes.sizeOf() + inits.sizeOf()
+ xNulls.sizeOf();
@@ -163,7 +163,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -200,7 +200,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -234,7 +234,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in FirstBy: %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -300,7 +300,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in Aggregation: %s",
xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation:
%s", xDataType));
}
}
}
@@ -353,7 +353,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
return bytes;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", yDataType));
+ String.format("Unsupported data type in FirstBy Aggregation:
%s", xDataType));
}
}
return bytes;
@@ -379,7 +379,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
return 1;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
@@ -415,7 +415,7 @@ public class GroupedFirstByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in FirstBy: %s", xDataType));
+ String.format("Unsupported data type in FirstBy Aggregation: %s",
xDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java
index 8294f3c529b..d6a8dbedaa5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java
@@ -85,7 +85,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
@@ -117,7 +117,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
return INSTANCE_SIZE + valuesSize;
@@ -151,7 +151,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
@@ -183,7 +183,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
@@ -237,7 +237,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type Aggregation: %s",
seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
}
@@ -284,7 +284,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
}
@@ -320,7 +320,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
@@ -372,7 +372,7 @@ public class GroupedLastAccumulator implements
GroupedAccumulator {
return bytes;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Last Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java
index cfeca852bd2..ef7badb3cd6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java
@@ -95,7 +95,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
@@ -127,7 +127,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
return INSTANCE_SIZE + valuesSize + yLastTimes.sizeOf() + inits.sizeOf() +
xNulls.sizeOf();
@@ -163,7 +163,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
@@ -200,7 +200,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
@@ -234,7 +234,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastBy: %s", yDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
yDataType));
}
}
@@ -300,7 +300,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in Last Aggregation: %s",
yDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
yDataType));
}
}
}
@@ -353,7 +353,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
return bytes;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", yDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
yDataType));
}
}
return bytes;
@@ -379,7 +379,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
return 1;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
@@ -415,7 +415,7 @@ public class GroupedLastByAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in LastBy: %s", xDataType));
+ String.format("Unsupported data type in LastBy Aggregation: %s",
xDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java
index afe661aeb63..12ed710ac8e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java
@@ -76,7 +76,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
@@ -108,7 +108,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
return INSTANCE_SIZE + valuesSize + inits.sizeOf();
@@ -142,7 +142,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
@@ -174,7 +174,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
@@ -211,7 +211,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
}
@@ -247,7 +247,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
}
@@ -282,7 +282,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
}
@@ -318,7 +318,7 @@ public class GroupedMaxAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Max Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java
index 12c2293c688..f9209243cdf 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java
@@ -104,7 +104,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
switch (yDataType) {
@@ -132,7 +132,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", yDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", yDataType));
}
}
@@ -164,7 +164,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
switch (yDataType) {
@@ -192,7 +192,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
return INSTANCE_SIZE + valuesSize + inits.sizeOf() + xNulls.sizeOf();
@@ -227,7 +227,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
switch (yDataType) {
case INT32:
@@ -254,7 +254,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
}
@@ -290,7 +290,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
switch (yDataType) {
@@ -318,7 +318,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", yDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", yDataType));
}
}
@@ -349,7 +349,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", yDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", yDataType));
}
}
@@ -603,7 +603,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
}
@@ -636,7 +636,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
xBooleanValues.set(groupId, xColumn.getBoolean(xIndex));
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
}
}
@@ -707,7 +707,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", dataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", dataType));
}
}
@@ -734,7 +734,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
return 1;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", dataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", dataType));
}
}
@@ -789,7 +789,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", yDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", yDataType));
}
}
@@ -827,7 +827,7 @@ public abstract class GroupedMaxMinByBaseAccumulator
implements GroupedAccumulat
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", xDataType));
+ String.format("Unsupported data type in MaxBy/MinBy Aggregation:
%s", xDataType));
}
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java
index 222b20c6786..53f02724f2c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java
@@ -76,7 +76,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
@@ -108,7 +108,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
return INSTANCE_SIZE + valuesSize + inits.sizeOf();
@@ -142,7 +142,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in : %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
@@ -174,7 +174,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
@@ -211,7 +211,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
}
@@ -247,7 +247,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
}
@@ -282,7 +282,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
break;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type: %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
}
@@ -318,7 +318,7 @@ public class GroupedMinAccumulator implements
GroupedAccumulator {
return;
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type : %s", seriesDataType));
+ String.format("Unsupported data type in Min Aggregation: %s",
seriesDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java
index 395fddb4f2e..3848f2a6895 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java
@@ -76,7 +76,7 @@ public class GroupedSumAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation AVG : %s",
argumentDataType));
+ String.format("Unsupported data type in Sum Aggregation: %s",
argumentDataType));
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java
index 9c244be3da2..42b74b71346 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java
@@ -89,7 +89,7 @@ public class GroupedVarianceAccumulator implements
GroupedAccumulator {
case TIMESTAMP:
default:
throw new UnSupportedDataTypeException(
- String.format("Unsupported data type in aggregation variance :
%s", seriesDataType));
+ String.format("Unsupported data type in Variance Aggregation: %s",
seriesDataType));
}
}
