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 82d1a07f669324e2a9688acd0d6dd6515047eefd Author: lancelly <[email protected]> AuthorDate: Mon May 27 22:02:50 2024 +0800 fix maxby/minby/substring/udtfbuiltin IT --- .../org/apache/iotdb/it/env/cluster/ClusterConstant.java | 1 + .../org/apache/iotdb/it/env/cluster/env/AbstractEnv.java | 15 +++++++++++---- .../iotdb/db/it/aggregation/IoTDBAggregationIT.java | 13 ++++++------- .../iotdb/db/it/aggregation/maxby/IoTDBMaxByIT.java | 2 +- .../iotdb/db/it/aggregation/minby/IoTDBMinByIT.java | 2 +- .../iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 6 ++---- .../iotdb/db/queryengine/execution/memory/MemoryPool.java | 6 ++++-- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java index 6cf9fb71c1c..b827d01e504 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java @@ -199,6 +199,7 @@ public class ClusterConstant { public static final int NODE_START_TIMEOUT = 100; public static final int PROBE_TIMEOUT_MS = 2000; public static final int NODE_NETWORK_TIMEOUT_MS = 0; + public static final String ZERO_TIME_ZONE = "GMT+0"; public static final String DELIMITER = ","; public static final String TAB = " "; diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java index 1a429f4b0ad..981d39dccca 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java @@ -479,7 +479,9 @@ public abstract class AbstractEnv implements BaseEnv { String endpoint = dataNode.getIp() + ":" + dataNode.getPort(); Connection writeConnection = DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + endpoint + getParam(version, NODE_NETWORK_TIMEOUT_MS), + Config.IOTDB_URL_PREFIX + + endpoint + + getParam(version, NODE_NETWORK_TIMEOUT_MS, ZERO_TIME_ZONE), System.getProperty("User", username), System.getProperty("Password", password)); return new NodeConnection( @@ -521,7 +523,9 @@ public abstract class AbstractEnv implements BaseEnv { () -> { Connection readConnection = DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + endpoint + getParam(version, NODE_NETWORK_TIMEOUT_MS), + Config.IOTDB_URL_PREFIX + + endpoint + + getParam(version, NODE_NETWORK_TIMEOUT_MS, ZERO_TIME_ZONE), System.getProperty("User", username), System.getProperty("Password", password)); return new NodeConnection( @@ -559,7 +563,7 @@ public abstract class AbstractEnv implements BaseEnv { DriverManager.getConnection( Config.IOTDB_URL_PREFIX + dataNodeEndpoint - + getParam(null, NODE_NETWORK_TIMEOUT_MS), + + getParam(null, NODE_NETWORK_TIMEOUT_MS, ZERO_TIME_ZONE), System.getProperty("User", "root"), System.getProperty("Password", "root"))) { logger.info("Successfully connecting to DataNode: {}.", dataNodeEndpoint); @@ -584,12 +588,15 @@ public abstract class AbstractEnv implements BaseEnv { } } - private String getParam(Constant.Version version, int timeout) { + private String getParam(Constant.Version version, int timeout, String timeZone) { StringBuilder sb = new StringBuilder("?"); sb.append(Config.NETWORK_TIMEOUT).append("=").append(timeout); if (version != null) { sb.append("&").append(VERSION).append("=").append(version); } + if (timeZone != null) { + sb.append("&").append(Config.TIME_ZONE).append("=").append(timeZone); + } return sb.toString(); } 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 6a1041ff9c3..bb2b1d539bf 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 @@ -348,12 +348,11 @@ public class IoTDBAggregationIT { public void firstTest() { String[] retArray = new String[] { - "0,2000,2000,2000.0,2000,2000,0x2000,2000-01-01,1970-01-01T08:00:02.000+08:00", - "0,500,500,500.0,500,500,0x0500,1500-01-01,1970-01-01T08:00:00.500+08:00" + "0,2000,2000,2000.0,2000,2000,0x2000,2000-01-01,1970-01-01T00:00:02.000Z", + "0,500,500,500.0,500,500,0x0500,1500-01-01,1970-01-01T00:00:00.500Z" }; try (Connection connection = EnvFactory.getEnv().getConnection(); Statement statement = connection.createStatement()) { - connection.setClientInfo("time_zone", "+00:00"); int cnt; try (ResultSet resultSet = statement.executeQuery( @@ -454,9 +453,9 @@ public class IoTDBAggregationIT { public void lastTest() { String[] retArray = new String[] { - "0,8499,8499.0,8499,0x8499,8499-01-01,1970-01-01T08:00:08.499+08:00", - "0,1499,1499.0,1499,0x1499,1499-01-01,1970-01-01T08:00:01.499+08:00", - "0,2200,2200.0,2200,0x2200,2200-01-01,1970-01-01T08:00:02.200+08:00" + "0,8499,8499.0,8499,0x8499,8499-01-01,1970-01-01T00:00:08.499Z", + "0,1499,1499.0,1499,0x1499,1499-01-01,1970-01-01T00:00:01.499Z", + "0,2200,2200.0,2200,0x2200,2200-01-01,1970-01-01T00:00:02.200Z" }; try (Connection connection = EnvFactory.getEnv().getConnection(); Statement statement = connection.createStatement()) { @@ -729,7 +728,7 @@ public class IoTDBAggregationIT { public void maxminValueTest() { String[] retArray = new String[] { - "0,8499,500.0,999,1000,8499-01-01,1000-01-01,1970-01-01T08:00:08.499+08:00,1970-01-01T08:00:00.500+08:00", + "0,8499,500.0,999,1000,8499-01-01,1000-01-01,1970-01-01T00:00:08.499Z,1970-01-01T00:00:00.500Z", "0,2499,500.0" }; try (Connection connection = EnvFactory.getEnv().getConnection(); diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByIT.java index bddff844028..1ccdc8c1195 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/maxby/IoTDBMaxByIT.java @@ -211,7 +211,7 @@ public class IoTDBMaxByIT { new String[] {"x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10"}, new String[] {"y1", "y2", "y3", "y4", "y7", "y9", "y10"}); String[] retArray = - new String[] {"3,3,3.0,3.0,false,3,3,0x33,2024-01-03,1970-01-01T08:00:00.003+08:00,"}; + new String[] {"3,3,3.0,3.0,false,3,3,0x33,2024-01-03,1970-01-01T00:00:00.003Z,"}; for (Map.Entry<String, String[]> expectedHeader : expectedHeaders.entrySet()) { String y = expectedHeader.getKey(); resultSetEqualTest( 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 20c65b4145c..82867e782cc 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 @@ -211,7 +211,7 @@ public class IoTDBMinByIT { new String[] {"x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10"}, new String[] {"y1", "y2", "y3", "y4", "y7", "y9", "y10"}); String[] retArray = - new String[] {"3,3,3.0,3.0,false,3,3,0x33,2024-01-03,1970-01-01T08:00:00.003+08:00,"}; + new String[] {"3,3,3.0,3.0,false,3,3,0x33,2024-01-03,1970-01-01T00:00:00.003Z,"}; for (Map.Entry<String, String[]> expectedHeader : expectedHeaders.entrySet()) { String y = expectedHeader.getKey(); resultSetEqualTest( diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java index 64c4201f424..61de72829cc 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java @@ -205,8 +205,7 @@ public class IoTDBUDTFBuiltinFunctionIT { } else if (j == 5) { assertEquals("2024-01-0" + (i + 1), resultSet.getString(7)); } else if (j == 6) { - assertEquals( - String.format("1970-01-01T08:00:00.00%d+08:00", i), resultSet.getString(8)); + assertEquals(String.format("1970-01-01T00:00:00.00%dZ", i), resultSet.getString(8)); } } } @@ -252,8 +251,7 @@ public class IoTDBUDTFBuiltinFunctionIT { } else if (j == 5) { assertEquals("2024-01-0" + (i + 1), resultSet.getString(7)); } else if (j == 6) { - assertEquals( - String.format("1970-01-01T08:00:00.00%d+08:00", i), resultSet.getString(8)); + assertEquals(String.format("1970-01-01T00:00:00.00%dZ", i), resultSet.getString(8)); } } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java index ca37d853dc5..188833e329e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java @@ -230,7 +230,8 @@ public class MemoryPool { Validate.notNull(planNodeId, "planNodeId can not be null."); Validate.isTrue( bytesToReserve > 0L && bytesToReserve <= maxBytesPerFragmentInstance, - "bytesToReserve should be in (0,maxBytesPerFI]. maxBytesPerFI: %d", + "bytesToReserve should be in (0,maxBytesPerFI]. maxBytesPerFI: %d, bytesToReserve: %d", + maxBytesPerFragmentInstance, bytesToReserve); if (bytesToReserve > maxBytesCanReserve) { LOGGER.warn( @@ -270,7 +271,8 @@ public class MemoryPool { Validate.notNull(planNodeId, "planNodeId can not be null."); Validate.isTrue( bytesToReserve > 0L && bytesToReserve <= maxBytesPerFragmentInstance, - "bytesToReserve should be in (0,maxBytesPerFI]. maxBytesPerFI: %d", + "bytesToReserve should be in (0,maxBytesPerFI]. maxBytesPerFI: %d, bytesToReserve: %d", + maxBytesPerFragmentInstance, bytesToReserve); if (tryReserve(queryId, fragmentInstanceId, planNodeId, bytesToReserve, maxBytesCanReserve)) {
