You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sp...@apache.org on 2023/02/02 06:07:56 UTC
[iotdb] branch master updated: Update `V_0_12`, `V_0_13` to `V_1_0` (#8961)
This is an automated email from the ASF dual-hosted git repository.
spricoder 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 fabc0fa4f7 Update `V_0_12`, `V_0_13` to `V_1_0` (#8961)
fabc0fa4f7 is described below
commit fabc0fa4f769708aa83fa669ca9fdc1b34eaf801
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Thu Feb 2 14:07:50 2023 +0800
Update `V_0_12`, `V_0_13` to `V_1_0` (#8961)
---
client-cpp/src/main/Session.cpp | 2 ++
client-cpp/src/main/Session.h | 10 +++++-----
client-py/iotdb/Session.py | 2 +-
docs/UserGuide/API/Programming-JDBC.md | 4 ++--
docs/UserGuide/API/Programming-Java-Native-API.md | 2 +-
docs/zh/UserGuide/API/Programming-JDBC.md | 4 ++--
docs/zh/UserGuide/API/Programming-Java-Native-API.md | 2 +-
example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java | 2 +-
.../java/org/apache/iotdb/SyntaxConventionRelatedExample.java | 2 +-
.../java/org/apache/iotdb/db/it/sync/SyncTransportTest.java | 4 ++--
10 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/client-cpp/src/main/Session.cpp b/client-cpp/src/main/Session.cpp
index 253c18039f..96a7c62bbe 100644
--- a/client-cpp/src/main/Session.cpp
+++ b/client-cpp/src/main/Session.cpp
@@ -793,6 +793,8 @@ string Session::getVersionString(Version::Version version) {
return "V_0_12";
case Version::V_0_13:
return "V_0_13";
+ case Version::V_1_0,
+ return "V_1_0";
default:
return "V_0_12";
}
diff --git a/client-cpp/src/main/Session.h b/client-cpp/src/main/Session.h
index 079fb7b990..7d25298228 100644
--- a/client-cpp/src/main/Session.h
+++ b/client-cpp/src/main/Session.h
@@ -127,7 +127,7 @@ public:
namespace Version {
enum Version {
- V_0_12, V_0_13
+ V_0_12, V_0_13, V_1_0
};
}
@@ -985,7 +985,7 @@ private:
std::string getVersionString(Version::Version version);
public:
- Session(const std::string &host, int rpcPort) : username("user"), password("password"), version(Version::V_0_13) {
+ Session(const std::string &host, int rpcPort) : username("user"), password("password"), version(Version::V_1_0) {
this->host = host;
this->rpcPort = rpcPort;
}
@@ -997,7 +997,7 @@ public:
this->username = username;
this->password = password;
this->zoneId = "UTC+08:00";
- this->version = Version::V_0_13;
+ this->version = Version::V_1_0;
}
Session(const std::string &host, int rpcPort, const std::string &username, const std::string &password,
@@ -1008,7 +1008,7 @@ public:
this->password = password;
this->fetchSize = fetchSize;
this->zoneId = "UTC+08:00";
- this->version = Version::V_0_13;
+ this->version = Version::V_1_0;
}
Session(const std::string &host, const std::string &rpcPort, const std::string &username = "user",
@@ -1019,7 +1019,7 @@ public:
this->password = password;
this->fetchSize = fetchSize;
this->zoneId = "UTC+08:00";
- this->version = Version::V_0_13;
+ this->version = Version::V_1_0;
}
~Session();
diff --git a/client-py/iotdb/Session.py b/client-py/iotdb/Session.py
index 2c599f0a3c..0dc516ce2f 100644
--- a/client-py/iotdb/Session.py
+++ b/client-py/iotdb/Session.py
@@ -123,7 +123,7 @@ class Session(object):
username=self.__user,
password=self.__password,
zoneId=self.__zone_id,
- configuration={"version": "V_0_13"},
+ configuration={"version": "V_1_0"},
)
try:
diff --git a/docs/UserGuide/API/Programming-JDBC.md b/docs/UserGuide/API/Programming-JDBC.md
index 801dcbbde7..3122634563 100644
--- a/docs/UserGuide/API/Programming-JDBC.md
+++ b/docs/UserGuide/API/Programming-JDBC.md
@@ -213,6 +213,6 @@ public class JDBCExample {
The parameter `version` can be used in the url:
````java
-String url = "jdbc:iotdb://127.0.0.1:6667?version=V_0_12";
+String url = "jdbc:iotdb://127.0.0.1:6667?version=V_1_0";
````
-The parameter `version` represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of 0.12 when upgrading 0.13. The possible values are: `V_0_12`, `V_0_13`.
+The parameter `version` represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of 0.12 when upgrading 0.13. The possible values are: `V_0_12`, `V_0_13`, `V_1_0`.
diff --git a/docs/UserGuide/API/Programming-Java-Native-API.md b/docs/UserGuide/API/Programming-Java-Native-API.md
index bb0289551c..0c9e4777a3 100644
--- a/docs/UserGuide/API/Programming-Java-Native-API.md
+++ b/docs/UserGuide/API/Programming-Java-Native-API.md
@@ -91,7 +91,7 @@ session =
.build();
```
-Version represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of 0.12 when upgrading 0.13. The possible values are: `V_0_12`, `V_0_13`.
+Version represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of 0.12 when upgrading 0.13. The possible values are: `V_0_12`, `V_0_13`, `V_1_0`.
* Open a Session
diff --git a/docs/zh/UserGuide/API/Programming-JDBC.md b/docs/zh/UserGuide/API/Programming-JDBC.md
index 94730f8aaf..f0c0b5de19 100644
--- a/docs/zh/UserGuide/API/Programming-JDBC.md
+++ b/docs/zh/UserGuide/API/Programming-JDBC.md
@@ -203,6 +203,6 @@ public class JDBCExample {
可以在 url 中指定 version 参数：
```java
-String url = "jdbc:iotdb://127.0.0.1:6667?version=V_0_12";
+String url = "jdbc:iotdb://127.0.0.1:6667?version=V_1_0";
```
-version 表示客户端使用的 SQL 语义版本，用于升级 0.13 时兼容 0.12 的 SQL 语义，可能取值有：`V_0_12`、`V_0_13`。
+version 表示客户端使用的 SQL 语义版本，用于升级 0.13 时兼容 0.12 的 SQL 语义，可能取值有：`V_0_12`、`V_0_13`、`V_1_0`。
diff --git a/docs/zh/UserGuide/API/Programming-Java-Native-API.md b/docs/zh/UserGuide/API/Programming-Java-Native-API.md
index 8d7ccc9606..4324484fde 100644
--- a/docs/zh/UserGuide/API/Programming-Java-Native-API.md
+++ b/docs/zh/UserGuide/API/Programming-Java-Native-API.md
@@ -94,7 +94,7 @@ session =
.build();
```
-其中，version 表示客户端使用的 SQL 语义版本，用于升级 0.13 时兼容 0.12 的 SQL 语义，可能取值有：`V_0_12`、`V_0_13`。
+其中，version 表示客户端使用的 SQL 语义版本，用于升级 0.13 时兼容 0.12 的 SQL 语义，可能取值有：`V_0_12`、`V_0_13`、`V_1_0`。
* 开启 Session
diff --git a/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java b/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
index 84560120c3..2e8907f9f4 100644
--- a/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
+++ b/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
@@ -33,7 +33,7 @@ public class JDBCExample {
Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
try (Connection connection =
DriverManager.getConnection(
- "jdbc:iotdb://127.0.0.1:6667?version=V_0_13", "root", "root");
+ "jdbc:iotdb://127.0.0.1:6667?version=V_1_0", "root", "root");
Statement statement = connection.createStatement()) {
// set JDBC fetchSize
diff --git a/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java b/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index 73d547a5c2..29c25f1137 100644
--- a/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++ b/example/jdbc/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -65,7 +65,7 @@ public class SyntaxConventionRelatedExample {
Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
try (Connection connection =
DriverManager.getConnection(
- "jdbc:iotdb://127.0.0.1:6667?version=V_0_13", "root", "root");
+ "jdbc:iotdb://127.0.0.1:6667?version=V_1_0", "root", "root");
Statement statement = connection.createStatement()) {
// set JDBC fetchSize
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/sync/SyncTransportTest.java b/integration-test/src/test/java/org/apache/iotdb/db/it/sync/SyncTransportTest.java
index 64a091a911..ce87348eac 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/sync/SyncTransportTest.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/sync/SyncTransportTest.java
@@ -267,7 +267,7 @@ public class SyncTransportTest {
// .port(6667)
// .username("root")
// .password("root")
- // .version(Version.V_0_13)
+ // .version(Version.V_1_0)
// .build();
// try {
// session.open(false);
@@ -299,7 +299,7 @@ public class SyncTransportTest {
// .port(6667)
// .username("root")
// .password("root")
- // .version(Version.V_0_13)
+ // .version(Version.V_1_0)
// .build();
// try {
// session.open(false);