You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/02/01 05:59:54 UTC
[iotdb] branch master updated: [IOTDB-5446] Add V_1_0 version and update version used in IoTDB (#8952)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 1848fc93bb [IOTDB-5446] Add V_1_0 version and update version used in IoTDB (#8952)
1848fc93bb is described below
commit 1848fc93bb3539086432f9b82e7d3aa7a639cd3b
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Wed Feb 1 13:59:47 2023 +0800
[IOTDB-5446] Add V_1_0 version and update version used in IoTDB (#8952)
---
.../src/main/java/org/apache/iotdb/SessionExample.java | 2 +-
.../apache/iotdb/SyntaxConventionRelatedExample.java | 2 +-
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 6 +++---
.../IoTDBDeletionVersionAdaptionIT.java | 18 +++++++++---------
.../versionadaption/IoTDBQueryVersionAdaptionIT.java | 8 ++++----
.../java/org/apache/iotdb/isession/SessionConfig.java | 2 +-
.../java/org/apache/iotdb/isession/util/Version.java | 3 ++-
jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java | 4 +++-
jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java | 3 ++-
.../org/apache/iotdb/commons/conf/IoTDBConstant.java | 3 ++-
.../apache/iotdb/db/client/DataNodeInternalClient.java | 7 ++-----
.../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 ++--
.../thrift/impl/DataNodeInternalRPCServiceImpl.java | 5 ++---
.../org/apache/iotdb/session/pool/SessionPoolTest.java | 4 ++--
14 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 967bc5fad4..953b7fd1da 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -67,7 +67,7 @@ public class SessionExample {
.port(6667)
.username("root")
.password("root")
- .version(Version.V_0_13)
+ .version(Version.V_1_0)
.build();
session.open(false);
diff --git a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index dde5cbc635..baf0074ece 100644
--- a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -76,7 +76,7 @@ public class SyntaxConventionRelatedExample {
.port(6667)
.username("root")
.password("root")
- .version(Version.V_0_13)
+ .version(Version.V_1_0)
.build();
session.open(false);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDDLVersionAdaptionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDDLVersionAdaptionIT.java
index 062abdf701..5d3e2e68c6 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDDLVersionAdaptionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDDLVersionAdaptionIT.java
@@ -53,7 +53,7 @@ public class IoTDBDDLVersionAdaptionIT {
private static final Logger logger = LoggerFactory.getLogger(IoTDBDDLVersionAdaptionIT.class);
private static void insertSQL() {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
String[] insertSqls =
@@ -288,7 +288,7 @@ public class IoTDBDDLVersionAdaptionIT {
}
private void executeAndCheckResult(String[] sqls, Set<String>[] standards) throws SQLException {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
for (int n = 0; n < sqls.length; n++) {
String sql = sqls[n];
@@ -342,7 +342,7 @@ public class IoTDBDDLVersionAdaptionIT {
private void executeDeleteAndCheckResult(String deleteSql, String showSql, String[] expected)
throws Exception {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute(deleteSql);
boolean hasResult = statement.execute(showSql);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
index 69b027b20c..029fbe1362 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
@@ -80,7 +80,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Test
public void test() throws SQLException {
prepareData();
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute("DELETE FROM root.vehicle.d0.s0 WHERE time <= 300");
@@ -120,7 +120,7 @@ public class IoTDBDeletionVersionAdaptionIT {
public void testMerge() throws SQLException {
prepareMerge();
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute("merge");
statement.execute("DELETE FROM root.vehicle.d0 WHERE time <= 15000");
@@ -149,7 +149,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Test
public void testRangeDelete() throws SQLException {
prepareData();
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute("DELETE FROM root.vehicle.d0.s0 WHERE time <= 300");
@@ -185,7 +185,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Test
public void testPartialPathRangeDelete() throws SQLException {
prepareData();
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute("DELETE FROM root.vehicle.d0.* WHERE time <= 300 and time > 150");
@@ -211,7 +211,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Test
public void testDeleteAll() throws SQLException {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute("insert into root.lz.dev.GPS(time, latitude, longitude) values(9,3.2,9.8)");
statement.execute("insert into root.lz.dev.GPS(time, latitude) values(11,4.5)");
@@ -237,7 +237,7 @@ public class IoTDBDeletionVersionAdaptionIT {
}
private static void prepareSeries() {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
for (String sql : creationSqls) {
@@ -249,7 +249,7 @@ public class IoTDBDeletionVersionAdaptionIT {
}
private void prepareData() throws SQLException {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
// prepare BufferWrite file
@@ -278,14 +278,14 @@ public class IoTDBDeletionVersionAdaptionIT {
}
private void cleanData() throws SQLException {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
statement.execute(deleteAllTemplate);
}
}
public void prepareMerge() throws SQLException {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
// prepare BufferWrite data
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBQueryVersionAdaptionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBQueryVersionAdaptionIT.java
index 6c74c6d862..2e075f7b39 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBQueryVersionAdaptionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBQueryVersionAdaptionIT.java
@@ -141,7 +141,7 @@ public class IoTDBQueryVersionAdaptionIT {
}
private static void importData() {
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
for (String sql : sqls) {
@@ -169,7 +169,7 @@ public class IoTDBQueryVersionAdaptionIT {
"1509466140000,false,20.98,v1,false,false,20.98,",
};
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
boolean hasResultSet = statement.execute("select * from root where time>10");
Assert.assertTrue(hasResultSet);
@@ -226,7 +226,7 @@ public class IoTDBQueryVersionAdaptionIT {
"1509466140000,root.ln.wf01.wt01.temperature,20.98177,FLOAT",
"1509466140000,root.ln.wf01.wt01.status,false,BOOLEAN"));
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
boolean hasResultSet = statement.execute("select last * from root order by time desc");
@@ -260,7 +260,7 @@ public class IoTDBQueryVersionAdaptionIT {
"1509465600000,root.sgcc.wf03.wt01,25.96,true,null,"
};
- try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_0_12);
+ try (Connection connection = EnvFactory.getEnv().getConnection(Constant.Version.V_1_0);
Statement statement = connection.createStatement()) {
boolean hasResultSet =
statement.execute("select * from root.* where temperature >= 25.957603 align by device");
diff --git a/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java b/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
index e043f9e894..685f47d740 100644
--- a/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
@@ -47,5 +47,5 @@ public class SessionConfig {
public static final int DEFAULT_SESSION_POOL_MAX_SIZE = 5;
- public static final Version DEFAULT_VERSION = Version.V_0_13;
+ public static final Version DEFAULT_VERSION = Version.V_1_0;
}
diff --git a/isession/src/main/java/org/apache/iotdb/isession/util/Version.java b/isession/src/main/java/org/apache/iotdb/isession/util/Version.java
index 31f3880439..8d7f46cd51 100644
--- a/isession/src/main/java/org/apache/iotdb/isession/util/Version.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/util/Version.java
@@ -21,5 +21,6 @@ package org.apache.iotdb.isession.util;
public enum Version {
V_0_12,
- V_0_13
+ V_0_13,
+ V_1_0
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
index 2187ec8144..de74b16a7d 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.jdbc;
+import org.apache.iotdb.jdbc.Constant.Version;
+
public class Config {
private Config() {}
@@ -47,7 +49,7 @@ public class Config {
static final int DEFAULT_CONNECTION_TIMEOUT_MS = 0;
public static final String VERSION = "version";
- static final Constant.Version DEFAULT_VERSION = Constant.Version.V_0_13;
+ static final Constant.Version DEFAULT_VERSION = Version.V_1_0;
public static final String JDBC_DRIVER_NAME = "org.apache.iotdb.jdbc.IoTDBDriver";
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
index ded2d3dd73..3f0893515f 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
@@ -44,6 +44,7 @@ public class Constant {
// version number
public enum Version {
V_0_12,
- V_0_13
+ V_0_13,
+ V_1_0
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
index eb019d7cab..628fdbf8a2 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
@@ -271,7 +271,8 @@ public class IoTDBConstant {
// client version number
public enum ClientVersion {
V_0_12,
- V_0_13
+ V_0_13,
+ V_1_0
}
// select into
diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java
index 497fd2aa38..6ce112d570 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.client;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.OperationType;
import org.apache.iotdb.db.exception.IntoProcessException;
@@ -64,10 +64,7 @@ public class DataNodeInternalClient {
session = new InternalClientSession("SELECT_INTO");
SESSION_MANAGER.supplySession(
- session,
- sessionInfo.getUserName(),
- sessionInfo.getZoneId(),
- IoTDBConstant.ClientVersion.V_0_13);
+ session, sessionInfo.getUserName(), sessionInfo.getZoneId(), ClientVersion.V_1_0);
LOGGER.info("User: {}, opens internal Session-{}.", sessionInfo.getUserName(), session);
} catch (Exception e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
index 53d5241ef2..7e8cae62b1 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
@@ -18,7 +18,7 @@
package org.apache.iotdb.db.protocol.mqtt;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -87,7 +87,7 @@ public class MPPPublishHandler extends AbstractInterceptHandler {
new String(msg.getPassword()),
ZoneId.systemDefault().toString(),
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3,
- IoTDBConstant.ClientVersion.V_0_13);
+ ClientVersion.V_1_0);
clientIdToSessionMap.put(msg.getClientID(), session);
} catch (TException e) {
throw new RuntimeException(e);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index a44774faa4..c6b14c2b52 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.common.rpc.thrift.TSettleReq;
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion;
import org.apache.iotdb.commons.consensus.ConsensusGroupId;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
@@ -828,8 +828,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
SESSION_MANAGER.registerSession(session);
- SESSION_MANAGER.supplySession(
- session, req.getUsername(), req.getZoneId(), IoTDBConstant.ClientVersion.V_0_13);
+ SESSION_MANAGER.supplySession(session, req.getUsername(), req.getZoneId(), ClientVersion.V_1_0);
String executedSQL = req.queryBody;
diff --git a/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java b/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
index 9e00440895..4b929de830 100644
--- a/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
+++ b/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
@@ -44,7 +44,7 @@ public class SessionPoolTest {
.enableCompression(true)
.zoneId(ZoneOffset.UTC)
.connectionTimeoutInMs(3)
- .version(Version.V_0_13)
+ .version(Version.V_1_0)
.build();
assertEquals("localhost", pool.getHost());
@@ -58,6 +58,6 @@ public class SessionPoolTest {
assertTrue(pool.isEnableCompression());
assertEquals(3, pool.getConnectionTimeoutInMs());
assertEquals(ZoneOffset.UTC, pool.getZoneId());
- assertEquals(Version.V_0_13, pool.getVersion());
+ assertEquals(Version.V_1_0, pool.getVersion());
}
}