You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2024/07/23 12:50:38 UTC
(iotdb) 02/02: fix conflicts
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/TableIT
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4e0786d7897b25291fa3cd44d3d6e3a7c9c8b592
Merge: 405eeb2c5c8 f1ec46511f3
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jul 23 20:50:28 2024 +0800
fix conflicts
.../IoTDBAlignByDeviceWithTemplateIT.java | 4 +-
.../iotdb/session/it/IoTDBSessionRelationalIT.java | 126 +++++++++++++++++----
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 11 ++
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 105 ++++++++++++-----
.../planner/plan/node/write/InsertTabletNode.java | 6 +-
.../plan/node/write/RelationalInsertRowNode.java | 22 ++--
.../node/write/RelationalInsertTabletNode.java | 36 +++---
.../fetcher/TableHeaderSchemaValidator.java | 2 +-
.../relational/sql/ast/WrappedInsertStatement.java | 27 +++--
.../plan/statement/crud/InsertTabletStatement.java | 8 +-
.../iotdb/db/storageengine/StorageEngine.java | 2 +-
.../dataregion/memtable/TsFileProcessor.java | 9 +-
13 files changed, 265 insertions(+), 95 deletions(-)
diff --cc integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateIT.java
index af8448ae30c,cd6154aea78..9d1217b466d
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateIT.java
@@@ -343,8 -343,8 +343,8 @@@ public class IoTDBAlignByDeviceWithTemp
"1997-01-01T08:00:00.004Z,d3,44,true,", "1997-01-01T08:00:00.002Z,d2,22,false,",
};
tableResultSetEqualTest(
- "SELECT s3,s2 FROM table1 where time > 1 and time < 5 and s3>=11 and s3<=1111 and s1 != 11.1 "
- + "ORDER BY TIME DESC, device_id;",
+ "SELECT time, device_id, s3,s2 FROM table1 where time > 1 and time < 5 and s3>=11 and s3<=1111 and s1 != 11.1 "
- + "ORDER BY TIME DESC, device_id;",
++ + "ORDER BY time DESC, device_id;",
expectedHeader,
retArray,
DATABASE_NAME);
@@@ -373,8 -373,8 +373,8 @@@
"1997-01-01T08:00:00.004Z,d3,44,true,", "1997-01-01T08:00:00.002Z,d2,22,false,",
};
tableResultSetEqualTest(
- "SELECT s3,s2 FROM table1 where time > 1 and time < 5 and s3>=11 and s3<=1111 and s1 != 11.1 "
- + "ORDER BY DEVICE DESC, Time asc",
+ "SELECT time, device_id, s3,s2 FROM table1 where time > 1 and time < 5 and s3>=11 and s3<=1111 and s1 != 11.1 "
- + "ORDER BY DEVICE DESC, Time asc",
++ + "ORDER BY DEVICE DESC, time asc",
expectedHeader,
retArray,
DATABASE_NAME);