Merge remote-tracking branch 'origin/3.0' into feature/qnode

2022-01-20 19:05:01 +08:00 · 2022-01-20 19:05:01 +08:00 · a818c130b1
parent bb67155b42 8adf6d9bb1
commit a818c130b1
500 changed files with 1606 additions and 1841 deletions
--- a/2.0/src/client/CMakeLists.txt
+++ b/2.0/src/client/CMakeLists.txt
--- a/2.0/src/client/inc/tscGlobalmerge.h
+++ b/2.0/src/client/inc/tscGlobalmerge.h
--- a/2.0/src/client/inc/tscLog.h
+++ b/2.0/src/client/inc/tscLog.h
--- a/2.0/src/client/inc/tscParseLine.h
+++ b/2.0/src/client/inc/tscParseLine.h
--- a/2.0/src/client/inc/tscProfile.h
+++ b/2.0/src/client/inc/tscProfile.h
--- a/2.0/src/client/inc/tscSubquery.h
+++ b/2.0/src/client/inc/tscSubquery.h
--- a/2.0/src/client/inc/tscUtil.h
+++ b/2.0/src/client/inc/tscUtil.h
--- a/2.0/src/client/inc/tsclient.h
+++ b/2.0/src/client/inc/tsclient.h
--- a/2.0/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/2.0/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
--- a/2.0/src/client/src/TSDBJNIConnector.c
+++ b/2.0/src/client/src/TSDBJNIConnector.c
--- a/2.0/src/client/src/taos.def
+++ b/2.0/src/client/src/taos.def
--- a/2.0/src/client/src/taos.rc.in
+++ b/2.0/src/client/src/taos.rc.in
--- a/2.0/src/client/src/tscAsync.c
+++ b/2.0/src/client/src/tscAsync.c
--- a/2.0/src/client/src/tscGlobalmerge.c
+++ b/2.0/src/client/src/tscGlobalmerge.c
--- a/2.0/src/client/src/tscLocal.c
+++ b/2.0/src/client/src/tscLocal.c
--- a/2.0/src/client/src/tscParseInsert.c
+++ b/2.0/src/client/src/tscParseInsert.c
--- a/2.0/src/client/src/tscParseLineProtocol.c
+++ b/2.0/src/client/src/tscParseLineProtocol.c
--- a/2.0/src/client/src/tscParseOpenTSDB.c
+++ b/2.0/src/client/src/tscParseOpenTSDB.c
--- a/2.0/src/client/src/tscPrepare.c
+++ b/2.0/src/client/src/tscPrepare.c
--- a/2.0/src/client/src/tscProfile.c
+++ b/2.0/src/client/src/tscProfile.c
--- a/2.0/src/client/src/tscSQLParser.c
+++ b/2.0/src/client/src/tscSQLParser.c
--- a/2.0/src/client/src/tscServer.c
+++ b/2.0/src/client/src/tscServer.c
--- a/2.0/src/client/src/tscSql.c
+++ b/2.0/src/client/src/tscSql.c
--- a/2.0/src/client/src/tscStream.c
+++ b/2.0/src/client/src/tscStream.c
--- a/2.0/src/client/src/tscSub.c
+++ b/2.0/src/client/src/tscSub.c
--- a/2.0/src/client/src/tscSubquery.c
+++ b/2.0/src/client/src/tscSubquery.c
--- a/2.0/src/client/src/tscSystem.c
+++ b/2.0/src/client/src/tscSystem.c
--- a/2.0/src/client/src/tscUtil.c
+++ b/2.0/src/client/src/tscUtil.c
--- a/2.0/src/client/tests/CMakeLists.txt
+++ b/2.0/src/client/tests/CMakeLists.txt
--- a/2.0/src/client/tests/cliTest.cpp
+++ b/2.0/src/client/tests/cliTest.cpp
--- a/2.0/src/client/tests/timeParseTest.cpp
+++ b/2.0/src/client/tests/timeParseTest.cpp
--- a/2.0/src/connector/C#/TDengineDriver.cs
+++ b/2.0/src/connector/C#/TDengineDriver.cs
--- a/2.0/src/connector/jdbc/CMakeLists.txt
+++ b/2.0/src/connector/jdbc/CMakeLists.txt
--- a/2.0/src/connector/jdbc/deploy-pom.xml
+++ b/2.0/src/connector/jdbc/deploy-pom.xml
--- a/2.0/src/connector/jdbc/pom.xml
+++ b/2.0/src/connector/jdbc/pom.xml
--- a/2.0/src/connector/jdbc/readme.md
+++ b/2.0/src/connector/jdbc/readme.md
--- a/2.0/src/connector/jdbc/src/main/assembly/assembly-jar.xml
+++ b/2.0/src/connector/jdbc/src/main/assembly/assembly-jar.xml
--- a/2.0/src/connector/jdbc/src/main/assembly/assembly.xml
+++ b/2.0/src/connector/jdbc/src/main/assembly/assembly.xml
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TaosGlobalConfig.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TaosGlobalConfig.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/WrapperImpl.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/WrapperImpl.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampPrecision.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampPrecision.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfo.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfo.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfoMBean.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfoMBean.java
--- a/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
+++ b/2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
--- a/2.0/src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver
+++ b/2.0/src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BadLocaleSettingTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BadLocaleSettingTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchErrorIgnoreTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchErrorIgnoreTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java
--- a/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
+++ b/2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
--- a/Show More
+++ b/Show More