This is an automated email from the ASF dual-hosted git repository. lancelly pushed a commit to branch new_data_type_query in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7908015410f34a5c2af42979d7b621cc66c7bb1f Author: lancelly <[email protected]> AuthorDate: Mon May 27 20:36:09 2024 +0800 fix maxby/minby/substring/udtfbuiltin IT --- .../db/it/aggregation/IoTDBAggregationIT.java | 2 +- .../aggregation/IoTDBAggregationSmallDataIT.java | 4 ++-- .../maxby/IoTDBMaxByAlignedSeriesIT.java | 28 +++++++++++----------- .../minby/IoTDBMinByAlignedSeriesIT.java | 16 ++++++------- .../db/it/aggregation/minby/IoTDBMinByIT.java | 1 + .../scalar/IoTDBSubStringFunctionIT.java | 2 +- .../transformation/dag/util/LayerCacheUtils.java | 4 ++++ 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationIT.java index 28998f057a4..6a1041ff9c3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationIT.java @@ -353,7 +353,7 @@ public class IoTDBAggregationIT { }; try (Connection connection = EnvFactory.getEnv().getConnection(); Statement statement = connection.createStatement()) { - + connection.setClientInfo("time_zone", "+00:00"); int cnt; try (ResultSet resultSet = statement.executeQuery( diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java index a08b42a8ff7..aec2ae3a48f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java @@ -212,7 +212,7 @@ public class IoTDBAggregationSmallDataIT { Assert.assertTrue( e.toString() .contains( - "Aggregate functions [AVG, SUM, EXTREME, MIN_VALUE, MAX_VALUE, STDDEV, STDDEV_POP, STDDEV_SAMP, VARIANCE, VAR_POP, VAR_SAMP] only support numeric data types [INT32, INT64, FLOAT, DOUBLE]")); + "Aggregate functions [MIN_VALUE, MAX_VALUE] only support data types [INT32, INT64, FLOAT, DOUBLE, STRING, DATE, TIMESTAMP]")); } int cnt = 0; @@ -251,7 +251,7 @@ public class IoTDBAggregationSmallDataIT { Assert.assertTrue( e.toString() .contains( - "Aggregate functions [AVG, SUM, EXTREME, MIN_VALUE, MAX_VALUE, STDDEV, STDDEV_POP, STDDEV_SAMP, VARIANCE, VAR_POP, VAR_SAMP] only support numeric data types [INT32, INT64, FLOAT, DOUBLE]")); + "Aggregate functions [AVG, SUM, EXTREME, STDDEV, STDDEV_POP, STDDEV_SAMP, VARIANCE, VAR_POP, VAR_SAMP] only support numeric data types [INT32, INT64, FLOAT, DOUBLE]")); } int cnt = 0; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByAlignedSeriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByAlignedSeriesIT.java index 05af62d8552..bdcce214db8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByAlignedSeriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByAlignedSeriesIT.java @@ -29,21 +29,21 @@ public class IoTDBMaxByAlignedSeriesIT extends IoTDBMaxByIT { protected static final String[] ALIGNED_DATASET = new String[] { // x input - "CREATE ALIGNED TIMESERIES root.db.d1(x1 INT32, x2 INT64, x3 FLOAT, x4 DOUBLE, x5 BOOLEAN, x6 TEXT)", + "CREATE ALIGNED TIMESERIES root.db.d1(x1 INT32, x2 INT64, x3 FLOAT, x4 DOUBLE, x5 BOOLEAN, x6 TEXT, x7 STRING, x8 BLOB, x9 DATE, x10 TIMESTAMP)", // y input - "CREATE ALIGNED TIMESERIES root.db.d1(y1 INT32, y2 INT64, y3 FLOAT, y4 DOUBLE, y5 BOOLEAN, y6 TEXT)", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(1, 1, 1, 1, 1, true, \"1\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(2, 2, 2, 2, 2, false, \"2\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(3, 3, 3, 3, 3, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(2, 2, 2, 2, 2, true, \"4\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(3, 3, 3, 3, 3, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(4, 4, 4, 4, 4, false, \"4\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(8, 3, 3, 3, 3, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(8, 8, 8, 8, 8, false, \"4\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(12, 3, 3, 3, 3, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(12, 9, 9, 9, 9, false, \"4\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(13, 4, 4, 4, 4, false, \"4\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(13, 9, 9, 9, 9, false, \"4\")", + "CREATE ALIGNED TIMESERIES root.db.d1(y1 INT32, y2 INT64, y3 FLOAT, y4 DOUBLE, y5 BOOLEAN, y6 TEXT, y7 STRING, y8 BLOB, y9 DATE, y10 TIMESTAMP)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(1, 1, 1, 1, 1, true, \"1\", '1', X'11', '2024-01-01', 1)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(2, 2, 2, 2, 2, false, \"2\", '2', X'22', '2024-01-02', 2)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(3, 3, 3, 3, 3, false, \"3\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(2, 2, 2, 2, 2, true, \"4\", '2', X'22', '2024-01-02', 2)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(3, 3, 3, 3, 3, false, \"3\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(4, 4, 4, 4, 4, false, \"4\", '4', X'44', '2024-01-04', 4)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,y7,y8,y9,y10) values(8, 3, 3, 3, 3, false, \"3\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(8, 8, 8, 8, 8, false, \"4\", '8', X'44', '2024-01-08', 8)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,y7,y8,y9,y10) values(12, 3, 3, 3, 3, false, \"3\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(12, 9, 9, 9, 9, false, \"4\", '9', X'44', '2024-01-09', 9)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,y7,y8,y9,y10) values(13, 4, 4, 4, 4, false, \"4\",'4', X'44', '2024-01-04', 4)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(13, 9, 9, 9, 9, false, \"4\",'9', X'44', '2024-01-09', 9)", "flush", // For Align By Device "CREATE ALIGNED TIMESERIES root.db.d2(x1 INT32, x2 INT64, x3 FLOAT, x4 DOUBLE, x5 BOOLEAN, x6 TEXT)", diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByAlignedSeriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByAlignedSeriesIT.java index 56f7b5ecb09..a48eeaa6c10 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByAlignedSeriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByAlignedSeriesIT.java @@ -29,15 +29,15 @@ public class IoTDBMinByAlignedSeriesIT extends IoTDBMinByIT { protected static final String[] ALIGNED_DATASET = new String[] { // x input - "CREATE ALIGNED TIMESERIES root.db.d1(x1 INT32, x2 INT64, x3 FLOAT, x4 DOUBLE, x5 BOOLEAN, x6 TEXT)", + "CREATE ALIGNED TIMESERIES root.db.d1(x1 INT32, x2 INT64, x3 FLOAT, x4 DOUBLE, x5 BOOLEAN, x6 TEXT, x7 STRING, x8 BLOB, x9 DATE, x10 TIMESTAMP)", // y input - "CREATE ALIGNED TIMESERIES root.db.d1(y1 INT32, y2 INT64, y3 FLOAT, y4 DOUBLE, y5 BOOLEAN, y6 TEXT)", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(1, 1, 1, 1, 1, true, \"1\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(2, 2, 2, 2, 2, false, \"2\")", - "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(3, 3, 3, 3, 3, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(2, 3, 3, 3, 3, true, \"4\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(3, 2, 2, 2, 2, false, \"3\")", - "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(4, 1, 1, 1, 1, false, \"4\")", + "CREATE ALIGNED TIMESERIES root.db.d1(y1 INT32, y2 INT64, y3 FLOAT, y4 DOUBLE, y5 BOOLEAN, y6 TEXT, y7 STRING, y8 BLOB, y9 DATE, y10 TIMESTAMP)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(1, 1, 1, 1, 1, true, \"1\", '1', X'11', '2024-01-01', 1)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(2, 2, 2, 2, 2, false, \"2\", '2', X'22', '2024-01-02', 2)", + "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10) values(3, 3, 3, 3, 3, false, \"3\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(2, 3, 3, 3, 3, true, \"4\", '3', X'33', '2024-01-03', 3)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(3, 2, 2, 2, 2, false, \"3\", '2', X'22', '2024-01-02', 2)", + "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6,y7,y8,y9,y10) values(4, 1, 1, 1, 1, false, \"4\", '1', X'11', '2024-01-01', 1)", "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(8, 3, 3, 3, 3, false, \"3\")", "INSERT INTO root.db.d1(timestamp,y1,y2,y3,y4,y5,y6) values(8, 8, 8, 8, 8, false, \"4\")", "INSERT INTO root.db.d1(timestamp,x1,x2,x3,x4,x5,x6) values(12, 3, 3, 3, 3, false, \"3\")", diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByIT.java index 8a1fcf4565b..20c65b4145c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/minby/IoTDBMinByIT.java @@ -58,6 +58,7 @@ public class IoTDBMinByIT { "CREATE TIMESERIES root.db.d1.x4 WITH DATATYPE=DOUBLE, ENCODING=PLAIN", "CREATE TIMESERIES root.db.d1.x5 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN", "CREATE TIMESERIES root.db.d1.x6 WITH DATATYPE=TEXT, ENCODING=PLAIN", + "CREATE TIMESERIES root.db.d1.x7 WITH DATATYPE=STRING, ENCODING=PLAIN", "CREATE TIMESERIES root.db.d1.x8 WITH DATATYPE=BLOB, ENCODING=PLAIN", "CREATE TIMESERIES root.db.d1.x9 WITH DATATYPE=DATE, ENCODING=PLAIN", "CREATE TIMESERIES root.db.d1.x10 WITH DATATYPE=TIMESTAMP, ENCODING=PLAIN", diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java index 9b3ebf6608f..cf4d8bb84ff 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java @@ -170,7 +170,7 @@ public class IoTDBSubStringFunctionIT { // Normal String[] expectedHeader2 = new String[] { - "Time,root.sg.s9,change_points(root.sg.s9),SUBSTRING(root.sg.s9,1),SUBSTRING(root.sg.s9,1,3),SUBSTRING(root.sg.s9 FROM 1),SUBSTRING(root.sg.s9 FROM 1 FOR 3)" + "Time,root.sg.s9,change_points(root.sg.s1),SUBSTRING(root.sg.s9,1),SUBSTRING(root.sg.s9,1,3),SUBSTRING(root.sg.s9 FROM 1),SUBSTRING(root.sg.s9 FROM 1 FOR 3)" }; String[] retArray2 = new String[] { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java index 8d090f6fd84..86e1001c672 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java @@ -65,9 +65,11 @@ public class LayerCacheUtils { } else { switch (dataType) { case INT32: + case DATE: target.putInt(source.currentTime(), source.currentInt()); break; case INT64: + case TIMESTAMP: target.putLong(source.currentTime(), source.currentLong()); break; case FLOAT: @@ -80,6 +82,8 @@ public class LayerCacheUtils { target.putBoolean(source.currentTime(), source.currentBoolean()); break; case TEXT: + case BLOB: + case STRING: target.putBinary( source.currentTime(), UDFBinaryTransformer.transformToUDFBinary(source.currentBinary()));
