Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tkv

Browse Source

...

This commit is contained in:

Hongze Cheng 2022-01-21 01:59:54 +00:00

parent ca25ddc730 5ebc377965

commit 2f2b7d2f53

536 changed files with 4035 additions and 2511 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

src/client/CMakeLists.txt → 2.0/src/client/CMakeLists.txt

Unescape Escape View File

0

src/client/inc/tscGlobalmerge.h → 2.0/src/client/inc/tscGlobalmerge.h

Unescape Escape View File

0

src/client/inc/tscLog.h → 2.0/src/client/inc/tscLog.h

Unescape Escape View File

0

src/client/inc/tscParseLine.h → 2.0/src/client/inc/tscParseLine.h

Unescape Escape View File

0

src/client/inc/tscProfile.h → 2.0/src/client/inc/tscProfile.h

Unescape Escape View File

0

src/client/inc/tscSubquery.h → 2.0/src/client/inc/tscSubquery.h

Unescape Escape View File

0

src/client/inc/tscUtil.h → 2.0/src/client/inc/tscUtil.h

Unescape Escape View File

0

src/client/inc/tsclient.h → 2.0/src/client/inc/tsclient.h

Unescape Escape View File

0

src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h → 2.0/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h

Unescape Escape View File

0

src/client/src/TSDBJNIConnector.c → 2.0/src/client/src/TSDBJNIConnector.c

Unescape Escape View File

0

src/client/src/taos.def → 2.0/src/client/src/taos.def

Unescape Escape View File

0

src/client/src/taos.rc.in → 2.0/src/client/src/taos.rc.in

Unescape Escape View File

0

src/client/src/tscAsync.c → 2.0/src/client/src/tscAsync.c

Unescape Escape View File

0

src/client/src/tscGlobalmerge.c → 2.0/src/client/src/tscGlobalmerge.c

Unescape Escape View File

0

src/client/src/tscLocal.c → 2.0/src/client/src/tscLocal.c

Unescape Escape View File

0

src/client/src/tscParseInsert.c → 2.0/src/client/src/tscParseInsert.c

Unescape Escape View File

0

src/client/src/tscParseLineProtocol.c → 2.0/src/client/src/tscParseLineProtocol.c

Unescape Escape View File

0

src/client/src/tscParseOpenTSDB.c → 2.0/src/client/src/tscParseOpenTSDB.c

Unescape Escape View File

0

src/client/src/tscPrepare.c → 2.0/src/client/src/tscPrepare.c

Unescape Escape View File

0

src/client/src/tscProfile.c → 2.0/src/client/src/tscProfile.c

Unescape Escape View File

0

src/client/src/tscSQLParser.c → 2.0/src/client/src/tscSQLParser.c

Unescape Escape View File

0

src/client/src/tscServer.c → 2.0/src/client/src/tscServer.c

Unescape Escape View File

0

src/client/src/tscSql.c → 2.0/src/client/src/tscSql.c

Unescape Escape View File

0

src/client/src/tscStream.c → 2.0/src/client/src/tscStream.c

Unescape Escape View File

0

src/client/src/tscSub.c → 2.0/src/client/src/tscSub.c

Unescape Escape View File

0

src/client/src/tscSubquery.c → 2.0/src/client/src/tscSubquery.c

Unescape Escape View File

0

src/client/src/tscSystem.c → 2.0/src/client/src/tscSystem.c

Unescape Escape View File

0

src/client/src/tscUtil.c → 2.0/src/client/src/tscUtil.c

Unescape Escape View File

0

src/client/tests/CMakeLists.txt → 2.0/src/client/tests/CMakeLists.txt

Unescape Escape View File

0

src/client/tests/cliTest.cpp → 2.0/src/client/tests/cliTest.cpp

Unescape Escape View File

0

src/client/tests/timeParseTest.cpp → 2.0/src/client/tests/timeParseTest.cpp

Unescape Escape View File

0

src/connector/C#/TDengineDriver.cs → 2.0/src/connector/C#/TDengineDriver.cs

Unescape Escape View File

0

src/connector/jdbc/CMakeLists.txt → 2.0/src/connector/jdbc/CMakeLists.txt

Unescape Escape View File

0

src/connector/jdbc/deploy-pom.xml → 2.0/src/connector/jdbc/deploy-pom.xml

Unescape Escape View File

0

src/connector/jdbc/pom.xml → 2.0/src/connector/jdbc/pom.xml

Unescape Escape View File

0

src/connector/jdbc/readme.md → 2.0/src/connector/jdbc/readme.md

Unescape Escape View File

0

src/connector/jdbc/src/main/assembly/assembly-jar.xml → 2.0/src/connector/jdbc/src/main/assembly/assembly-jar.xml

Unescape Escape View File

0

src/connector/jdbc/src/main/assembly/assembly.xml → 2.0/src/connector/jdbc/src/main/assembly/assembly.xml

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TaosGlobalConfig.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TaosGlobalConfig.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/WrapperImpl.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/WrapperImpl.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampPrecision.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampPrecision.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfo.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfo.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfoMBean.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfoMBean.java

Unescape Escape View File

0

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java → 2.0/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java

Unescape Escape View File

0

src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver → 2.0/src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BadLocaleSettingTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BadLocaleSettingTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchErrorIgnoreTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchErrorIgnoreTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java

Unescape Escape View File

0

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java → 2.0/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More