Merge branch '3.0' of github.com:taosdata/TDengine into szhou/python-udf

cmake/taosadapter_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG 7920f98
+        GIT_TAG 97d717d
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

docs/en/07-develop/07-tmq.mdx

@@ -295,7 +295,7 @@ You configure the following parameters when creating a consumer:
 |      `enable.auto.commit`      | boolean | Commit automatically                                             | Specify `true` or `false`.                   |
 |   `auto.commit.interval.ms`    | integer | Interval for automatic commits, in milliseconds                           |
 | `enable.heartbeat.background`  | boolean | Backend heartbeat; if enabled, the consumer does not go offline even if it has not polled for a long time |                                             |
-| `experimental.snapshot.enable` | boolean | Specify whether to consume messages from the WAL or from TSBS                    |                                             |
+| `experimental.snapshot.enable` | boolean | Specify whether to consume messages from TSDB                    |                                             |
 |     `msg.with.table.name`      | boolean | Specify whether to deserialize table names from messages                                 |
 
 The method of specifying these parameters depends on the language used:
@@ -418,7 +418,7 @@ Python programs use the following parameters:
 | `enable.auto.commit` | string | Commit automatically | pecify `true` or `false` |
 | `auto.commit.interval.ms` | string | Interval for automatic commits, in milliseconds | |
 | `auto.offset.reset` | string | Initial offset for the consumer group | Specify `earliest`, `latest`, or `none`(default) |
-| `experimental.snapshot.enable` | string | Specify whether to consume messages from the WAL or from TSDB | Specify `true` or `false` |
+| `experimental.snapshot.enable` | string | Specify whether it's allowed to consume messages from the WAL or from TSDB | Specify `true` or `false` |
 | `enable.heartbeat.background` | string | Backend heartbeat; if enabled, the consumer does not go offline even if it has not polled for a long time | Specify `true` or `false` |
 
 </TabItem>

docs/en/20-third-party/11-kafka.md

@@ -77,7 +77,7 @@ Development: false
 ### Install from source code
 
 ```
-git clone https://github.com/taosdata/kafka-connect-tdengine.git
+git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
 mvn clean package
 unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip

docs/zh/20-third-party/11-kafka.md

@@ -79,7 +79,7 @@ Development: false
 ### 从源码安装
 
 ```
-git clone https://github.com/taosdata/kafka-connect-tdengine.git
+git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
 mvn clean package
 unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip

tests/script/coverage_test.sh

@@ -56,9 +56,9 @@ function buildTDengine() {
 	rm -rf *
 	if [ "$branch" == "3.0" ]; then
 		echo "3.0 ============="
-		cmake -DCOVER=true -DBUILD_TEST=true -DBUILD_HTTP=false -DBUILD_TOOLS=true .. 
+		cmake -DCOVER=true -DBUILD_TEST=true -DBUILD_HTTP=false -DBUILD_TOOLS=true .. > /dev/null
 	else
-		cmake -DCOVER=true -DBUILD_TOOLS=true -DBUILD_HTTP=false .. > /dev/null
+		cmake -DCOVER=true -DBUILD_TEST=true -DBUILD_TOOLS=true -DBUILD_HTTP=false .. > /dev/null
 	fi
 	make -j
 	make install
@@ -108,6 +108,19 @@ function runUnitTest() {
 	echo " $TDENGINE_DIR/debug"
 	cd $TDENGINE_DIR/debug
 	ctest -j12
+
+	echo " $TDENGINE_DIR/tests/script/api"
+	cd $TDENGINE_DIR/tests/script/api
+	make clean && make
+	
+	stopTaosd
+	stopTaosadapter
+
+	nohup taosd -c /etc/taos >> /dev/null 2>&1 &
+	./batchprepare 127.0.0.1
+	./dbTableRoute 127.0.0.1
+	./stopquery 127.0.0.1 demo t1
+	
 	echo "3.0 unit test done"
 }
 
@@ -115,7 +128,7 @@ function runSimCases() {
 	echo "=== Run sim cases ==="
 	
 	cd $TDENGINE_DIR/tests/script
-	runCasesOneByOne ../parallel_test/cases.task sim	
+	runCasesOneByOne ../parallel_test/cases.task sim
 	
 	totalSuccess=`grep 'sim success' $TDENGINE_COVERAGE_REPORT | wc -l`
 	if [ "$totalSuccess" -gt "0" ]; then
@@ -163,8 +176,8 @@ function runJDBCCases() {
 	stopTaosd
 	stopTaosadapter
 
-	taosd -c /etc/taos >> /dev/null 2>&1 &
-	taosadapter >> /dev/null 2>&1 &
+	nohup taosd -c /etc/taos >> /dev/null 2>&1 &
+	nohup taosadapter >> /dev/null 2>&1 &
 
 	mvn clean test > result.txt 2>&1
 	summary=`grep "Tests run:" result.txt | tail -n 1`