Merge branch 'develop' into xiaoping/add_test_case

.drone.yml

 ---
 kind: pipeline
-name: test_amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: build
-  image: gcc
-  commands:
-  - apt-get update
-  - apt-get install -y cmake build-essential 
-  - git submodule update --init --recursive
-  - mkdir debug
-  - cd debug
-  - cmake .. 
-  - make -j4 
-  trigger:
-    event:
-      - pull_request
-  when:
-    branch:
-    - develop
-    - master
-    - 2.0
----
-kind: pipeline
 name: test_arm64_bionic
 
 platform:
@@ -37,7 +10,10 @@ steps:
   image: arm64v8/ubuntu:bionic
   commands:
   - apt-get update
-  - apt-get install -y cmake build-essential
+  - apt-get install -y cmake  git build-essential wget
+  - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -65,7 +41,10 @@ steps:
   commands:
   - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
   - apt-get update 
-  - apt-get install -y -qq cmake build-essential
+  - apt-get install -y -qq git cmake build-essential wget
+  - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -91,11 +70,17 @@ steps:
 - name: build
   image: arm64v8/centos:7
   commands:
-  - yum install -y gcc gcc-c++ make cmake git
+  - yum install -y epel-release
+  - yum install -y gcc gcc-c++ make cmake3  wget git 
+  - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
+  - ln -s /usr/bin/cmake3 /usr/bin/cmake
+  - go version
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
-  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - cmake3 .. -DCPUTYPE=aarch64 > /dev/null
   - make -j4 
   trigger:
     event:
@@ -117,7 +102,7 @@ steps:
 - name: build
   image: arm64v8/centos:8
   commands:
-  - dnf install -y gcc gcc-c++ make cmake epel-release git libarchive
+  - dnf install -y gcc gcc-c++ make cmake epel-release git libarchive golang
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -144,7 +129,7 @@ steps:
   image: arm32v7/ubuntu:bionic
   commands:
   - apt-get update
-  - apt-get install -y cmake build-essential
+  - apt-get install -y cmake build-essential golang-go git
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -171,7 +156,10 @@ steps:
   image: ubuntu:trusty
   commands:
   - apt-get update
-  - apt-get install -y gcc cmake3 build-essential git binutils-2.26
+  - apt-get install -y gcc cmake3 build-essential git binutils-2.26 wget 
+  - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -198,7 +186,10 @@ steps:
   image: ubuntu:xenial
   commands:
   - apt-get update
-  - apt-get install -y gcc cmake build-essential
+  - apt-get install -y gcc cmake build-essential  git wget
+  - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -224,7 +215,10 @@ steps:
   image: ubuntu:bionic
   commands:
   - apt-get update
-  - apt-get install -y gcc cmake build-essential
+  - apt-get install -y gcc cmake build-essential  git wget
+  - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
@@ -249,11 +243,16 @@ steps:
 - name: build
   image: ansible/centos7-ansible
   commands:
-  - yum install -y gcc gcc-c++ make cmake
+  - yum install -y epel-release
+  - yum install -y gcc gcc-c++ make cmake3  wget git 
+  - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
+  - ln -s /usr/bin/cmake3 /usr/bin/cmake
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
-  - cmake .. 
+  - cmake3 .. 
   - make -j4 
   trigger:
     event:

CMakeLists.txt

@@ -10,9 +10,9 @@ ELSE ()
 ENDIF ()
 
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 ELSE ()
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 ENDIF ()
 
 SET(TD_ACCOUNT FALSE)
@@ -38,7 +38,7 @@ MESSAGE(STATUS "Community directory: " ${TD_COMMUNITY_DIR})
 INCLUDE(cmake/input.inc)
 INCLUDE(cmake/platform.inc)
 
-IF (TD_WINDOWS OR TD_DARWIN) 
+IF (TD_WINDOWS OR TD_DARWIN)
   SET(TD_SOMODE_STATIC TRUE)
 ENDIF ()
 

Jenkinsfile

@@ -99,7 +99,7 @@ def pre_test(){
     sh '''
     cd ${WK}
     git pull >/dev/null 
-    git submodule update --init --recursive
+    
     export TZ=Asia/Harbin
     date
     git clean -dfx
@@ -149,6 +149,7 @@ def pre_test_win(){
     git fetch origin +refs/pull/%CHANGE_ID%/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git submodule update --init --recursive
     cd C:\\workspace\\TDinternal
     git reset --hard HEAD~10
     '''
@@ -421,11 +422,12 @@ pipeline {
               ./test-all.sh b4fq
               cd ${WKC}/tests
               ./test-all.sh p4
-              cd ${WKC}/tests
-              ./test-all.sh full jdbc
-              cd ${WKC}/tests
-              ./test-all.sh full unit
-              date'''
+              '''
+              // cd ${WKC}/tests
+              // ./test-all.sh full jdbc
+              // cd ${WKC}/tests
+              // ./test-all.sh full unit
+              
             }
           }
         }
@@ -469,35 +471,35 @@ pipeline {
           }
         } 
         
-        stage('build'){
-          agent{label " wintest "}
-          steps {
-            pre_test()
-            script{             
-                while(win_stop == 0){
-                  sleep(1)
-                  }
-              }
-            }
-        }
-        stage('test'){
-          agent{label "win"}
-          steps{
+        // stage('build'){
+        //   agent{label " wintest "}
+        //   steps {
+        //     pre_test()
+        //     script{             
+        //         while(win_stop == 0){
+        //           sleep(1)
+        //           }
+        //       }
+        //     }
+        // }
+        // stage('test'){
+        //   agent{label "win"}
+        //   steps{
             
-            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                pre_test_win()
-                timeout(time: 20, unit: 'MINUTES'){
-                bat'''
-                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-                .\\test-all.bat Wintest
-                '''
-                }
-            }     
-            script{
-              win_stop=1
-            }
-          }
-        }
+        //     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+        //         pre_test_win()
+        //         timeout(time: 20, unit: 'MINUTES'){
+        //         bat'''
+        //         cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+        //         .\\test-all.bat Wintest
+        //         '''
+        //         }
+        //     }     
+        //     script{
+        //       win_stop=1
+        //     }
+        //   }
+        // }
           
                
     }

README.md

@@ -6,7 +6,7 @@
 
 [![TDengine](TDenginelogo.png)](https://www.taosdata.com)
 
-English | [简体中文](./README-CN.md) 
+English | [简体中文](./README-CN.md)
 We are hiring, check [here](https://www.taosdata.com/en/careers/)
 
 # What is TDengine？
@@ -32,7 +32,7 @@ For user manual, system design and architecture, engineering blogs, refer to [TD
 # Building
 At the moment, TDengine only supports building and running on Linux systems. You can choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) or from the source code. This quick guide is for installation from the source only.
 
-To build TDengine, use [CMake](https://cmake.org/) 2.8.12.x or higher versions in the project directory. 
+To build TDengine, use [CMake](https://cmake.org/) 3.0.2 or higher versions in the project directory.
 
 ## Install tools
 
@@ -47,7 +47,7 @@ sudo apt-get install -y gcc cmake3 build-essential git binutils-2.26
 export PATH=/usr/lib/binutils-2.26/bin:$PATH
 ```
 
-To compile and package the JDBC driver source code, you should have a Java jdk-8 or higher and Apache Maven 2.7 or higher installed. 
+To compile and package the JDBC driver source code, you should have a Java jdk-8 or higher and Apache Maven 2.7 or higher installed.
 To install openjdk-8:
 ```bash
 sudo apt-get install -y openjdk-8-jdk
@@ -60,7 +60,10 @@ sudo apt-get install -y  maven
 
 ### Centos 7:
 ```bash
-sudo yum install -y gcc gcc-c++ make cmake git
+sudo yum install epel-release
+sudo yum update
+sudo yum install -y gcc gcc-c++ make cmake3 git
+sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake
 ```
 
 To install openjdk-8:
@@ -236,7 +239,7 @@ In another terminal, use the TDengine shell to connect the server:
 ./build/bin/taos -c test/cfg
 ```
 
-option "-c test/cfg" specifies the system configuration file directory. 
+option "-c test/cfg" specifies the system configuration file directory.
 
 # Try TDengine
 It is easy to run SQL commands from TDengine shell which is the same as other SQL databases.

cmake/define.inc

@@ -125,8 +125,13 @@ IF (TD_APLHINE)
 ENDIF ()
 
 IF (TD_LINUX)
-  IF (TD_BUILD_HTTP)
+  IF (TD_ARM_32)
+    SET(TD_BUILD_HTTP TRUE)
     ADD_DEFINITIONS(-DHTTP_EMBEDDED)
+  ELSE ()
+    IF (TD_BUILD_HTTP)
+      ADD_DEFINITIONS(-DHTTP_EMBEDDED)
+    ENDIF ()
   ENDIF ()
 ELSE ()
   SET(TD_BUILD_HTTP TRUE)

deps/CMakeLists.txt

 PROJECT(TDengine)
 
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 ELSE ()
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 ENDIF ()
 
 ADD_SUBDIRECTORY(zlib-1.2.11)

deps/MQTT-C/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 
 # MQTT-C build options
 option(MQTT_C_OpenSSL_SUPPORT "Build MQTT-C with OpenSSL support?" OFF)

deps/MsvcLibX/CMakeLists.txt

 PROJECT(TDengine)
 
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 ELSE ()
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 ENDIF ()
 
 IF (TD_WINDOWS)

deps/iconv/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_WINDOWS)

deps/pthread/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_WINDOWS)

deps/regex/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_WINDOWS)

deps/wepoll/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_WINDOWS)

deps/zlib-1.2.11/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_WINDOWS)

documentation20/cn/00.index/docs.md

@@ -53,6 +53,8 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [Schemaless 写入](/insert#schemaless)：免于预先建表，将数据直接写入时自动维护元数据结构
 * [Prometheus 写入](/insert#prometheus)：配置Prometheus, 不用任何代码，将数据直接写入
 * [Telegraf 写入](/insert#telegraf)：配置Telegraf, 不用任何代码，将采集数据直接写入
+* [collectd 直接写入](/insert#collectd)：配置 collectd，不用任何代码，将采集数据直接写入
+* [StatsD 直接写入](/insert#statsd)：配置 StatsD，不用任何代码，将采集数据直接写入
 * [EMQ X Broker](/insert#emq)：配置EMQ X，不用任何代码，就可将MQTT数据直接写入
 * [HiveMQ Broker](/insert#hivemq)：配置HiveMQ，不用任何代码，就可将MQTT数据直接写入
 

documentation20/cn/05.insert/docs.md

 # 高效写入数据
 
-TDengine支持多种接口写入数据，包括SQL, Prometheus, Telegraf, EMQ MQTT Broker, HiveMQ Broker, CSV文件等，后续还将提供Kafka, OPC等接口。数据可以单条插入，也可以批量插入，可以插入一个数据采集点的数据，也可以同时插入多个数据采集点的数据。支持多线程插入，支持时间乱序数据插入，也支持历史数据插入。
+TDengine支持多种接口写入数据，包括SQL，Prometheus，Telegraf，collectd，StatsD，EMQ MQTT Broker，HiveMQ Broker，CSV文件等，后续还将提供Kafka，OPC等接口。数据可以单条插入，也可以批量插入，可以插入一个数据采集点的数据，也可以同时插入多个数据采集点的数据。支持多线程插入，支持时间乱序数据插入，也支持历史数据插入。
 
 ## <a class="anchor" id="sql"></a>SQL 写入
 
@@ -98,7 +98,7 @@ Schemaless 按照如下原则来处理行数据：
 
 用户需要从github下载[Bailongma](https://github.com/taosdata/Bailongma)的源码，使用Golang语言编译器编译生成可执行文件。在开始编译前，需要准备好以下条件：
 - Linux操作系统的服务器
-- 安装好Golang，1.10版本以上
+- 安装好Golang，1.14版本以上
 - 对应的TDengine版本。因为用到了TDengine的客户端动态链接库，因此需要安装好和服务端相同版本的TDengine程序；比如服务端版本是TDengine 2.0.0, 则在Bailongma所在的Linux服务器（可以与TDengine在同一台服务器，或者不同服务器）
 
 Bailongma项目中有一个文件夹blm_prometheus，存放了prometheus的写入API程序。编译过程如下：
@@ -184,16 +184,18 @@ select * from apiserver_request_latencies_bucket;
 ```
 
 ## <a class="anchor" id="telegraf"></a> Telegraf 直接写入(通过 BLM v3)
-TDengine 新版本（2.3.0.0+）将包含一个 BLM3 独立程序，负责接受其他多种应用的数据写入。
+安装 Telegraf 请参考[官方文档](https://portal.influxdata.com/downloads/)。
+
+TDengine 新版本（2.3.0.0+）包含一个 BLM3 独立程序，负责接收包括 Telegraf 的多种应用的数据写入。
 
-配置方法，假设 TDengine 使用默认用户名 root 和密码 taosdata。在 /etc/telegraf/telegraf.conf 增加如下文字：
+配置方法，在 /etc/telegraf/telegraf.conf 增加如下文字，其中 database name 请填写希望在 TDengine 保存 Telegraf 数据的数据库名，TDengine server/cluster host、username和 password 填写 TDengine 实际值：
 ```
 [[outputs.http]]
-  url = "http://<TDengine server/cluster host>:6041/influxdb/v1/write?db=metrics"
+  url = "http://<TDengine server/cluster host>:6041/influxdb/v1/write?db=<database name>"
   method = "POST"
   timeout = "5s"
-  username = "root"
-  password = "taosdata"
+  username = "<TDengine's username>"
+  password = "<TDengine's password>"
   data_format = "influx"
   influx_max_line_bytes = 250
 ```
@@ -207,16 +209,15 @@ sudo systemctl start telegraf
 BLM v3 相关配置参数请参考 blm3 --help 命令输出以及相关文档。
 
 ## <a class="anchor" id="collectd"></a> collectd 直接写入(通过 BLM v3)
-安装 collectd
-```
-apt-get install collectd
-```
+安装 collectd，请参考[官方文档](https://collectd.org/download.shtml)。
+
+TDengine 新版本（2.3.0.0+）包含一个 BLM3 独立程序，负责接收包括 collectd 的多种应用的数据写入。
 
-在 /etc/collectd/collectd.conf 文件中增加如下内容：
+在 /etc/collectd/collectd.conf 文件中增加如下内容，其中 host 和 port 请填写 TDengine 和 BLM3 配置的实际值：
 ```
 LoadPlugin network
 <Plugin network>
-  Server "192.168.17.180" "25826"
+  Server "<TDengine cluster/server host>" "<port for collectd>"
 </Plugin>
 ```
 重启 collectd
@@ -229,13 +230,15 @@ BLM v3 相关配置参数请参考 blm3 --help 命令输出以及相关文档。
 安装 StatsD
 请参考[官方文档](https://github.com/statsd/statsd)。
 
-在 config.js 文件中增加如下内容后启动 StatsD：
+TDengine 新版本（2.3.0.0+）包含一个 BLM3 独立程序，负责接收包括 StatsD 的多种应用的数据写入。
+
+在 config.js 文件中增加如下内容后启动 StatsD，其中 host 和 port 请填写 TDengine 和 BLM3 配置的实际值：
 ```
 backends 部分添加 "./backends/repeater"
-repeater 部分添加 { host:'<TDengine server/cluster host>', port: 8126 }
+repeater 部分添加 { host:'<TDengine server/cluster host>', port: <port for StatsD>}
 ```
 
-实例配置文件：
+示例配置文件：
 ```
 {
 port: 8125

documentation20/cn/13.faq/docs.md

@@ -183,7 +183,22 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 | TCP | 6035      | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
 | TCP | 6040      | 多节点集群的节点间数据同步。        | 随 serverPort 端口变化。         |
 | TCP | 6041      | 客户端与服务端之间的 RESTful 通讯。 | 随 serverPort 端口变化。        |
-| TCP | 6042      | Arbitrator 的服务端口。           | 因 Arbitrator 启动参数设置变化。 |
+| TCP | 6042      | Arbitrator 的服务端口。             | 随 Arbitrator 启动参数设置变化。 |
+| TCP | 6043      | 支持 collectd 数据接入端口。        | 随 BLM3 启动参数设置变化（2.3.0.1+以上版本）。 |
+| TCP | 6044      | 支持 StatsD 的数据接入端口。        | 随 BLM3 启动参数设置变化（2.3.0.1+以上版本）。 |
 | TCP | 6060      | 企业版内 Monitor 服务的网络端口。   |                               |
 | UDP | 6030-6034 | 客户端与服务端之间通讯。            | 随 serverPort 端口变化。        |
 | UDP | 6035-6039 | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
+
+## 20. go 语言编写组件编译失败怎样解决？
+
+新版本 TDengine 2.3.0.0 包含一个使用 go 语言开发的 BLM3 组件，取代之前内置的 httpd ，提供包含原  httpd 功能以及支持多种其他软件（Prometheus、Telegraf、collectd、StatsD等）的数据接入功能。
+使用最新 develop 分支代码编译需要先 git submodule update --init --recursive 下载 blm3 仓库代码后再编译。
+
+目前编译方式默认自动编译 blm3。go 语言版本要求 1.14 以上，如果发生 go 编译错误，往往是国内访问 go mod 问题，可以通过设置 go 环境变量来解决：
+go env -w GO111MODULE=on
+go env -w GOPROXY=https://goproxy.cn,direct
+
+如果希望继续使用之前的内置 httpd，可以关闭 blm3 编译，使用 
+cmake .. -DBUILD_HTTP=true 使用原来内置的 httpd。
+

documentation20/cn/14.devops/01.telegraf/docs.md

@@ -39,17 +39,18 @@ IT 运维监测数据通常都是对时间特性比较敏感的数据，例如
 ```
 
 ### 修改 /etc/telegraf/telegraf.conf 
-假设 TDengine 使用默认用户名 root 和密码 taosdata。增加如下文字：
+配置方法，在 /etc/telegraf/telegraf.conf 增加如下文字，其中 database name 请填写希望在 TDengine 保存 Telegraf 数据的数据库名，TDengine server/cluster host、username和 password 填写 TDengine 实际值：
 ```
 [[outputs.http]]
-  url = "http://<TDengine server/cluster host>:6041/influxdb/v1/write?db=metrics"
+  url = "http://<TDengine server/cluster host>:6041/influxdb/v1/write?db=<database name>"
   method = "POST"
   timeout = "5s"
-  username = "root"
-  password = "taosdata"
+  username = "<TDengine's username>"
+  password = "<TDengine's password>"
   data_format = "influx"
   influx_max_line_bytes = 250
 ```
+
 然后重启 telegraf：
 ```
 sudo systemctl start telegraf

documentation20/cn/14.devops/02.collectd/docs.md

@@ -38,21 +38,21 @@ IT 运维监测数据通常都是对时间特性比较敏感的数据，例如
 ```
 
 ### 配置 collectd
-在 /etc/collectd/collectd.conf 文件中增加如下内容后启动 collectd：
+在 /etc/collectd/collectd.conf 文件中增加如下内容，其中 host 和 port 请填写 TDengine 和 BLM3 配置的实际值：
 ```
 LoadPlugin network
 <Plugin network>
-  Server "<TDengine server/cluster host>" "25826"
+  Server "<TDengine cluster/server host>" "<port for collectd>"
 </Plugin>
 
 sudo systemctl start collectd
 ```
 
 ### 配置 StatsD
-在 config.js 文件中增加如下内容后启动 StatsD：
+在 config.js 文件中增加如下内容后启动 StatsD，其中 host 和 port 请填写 TDengine 和 BLM3 配置的实际值：
 ```
 backends 部分添加 "./backends/repeater"
-repeater 部分添加 { host:'<TDengine server/cluster host>', port: 8126 }
+repeater 部分添加 { host:'<TDengine server/cluster host>', port: <port for StatsD>}
 ```
 
 ### 导入 Dashboard

src/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 # Base compile

src/balance/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)

src/client/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/client/tests/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)

src/common/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/connector/jdbc/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 
 PROJECT(TDengine)
 

src/connector/odbc/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_LINUX_64)

src/connector/odbc/src/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 add_subdirectory(base)

src/connector/odbc/src/base/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 aux_source_directory(. SRC)

src/cq/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/cq/test/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 LIST(APPEND CQTEST_SRC ./cqtest.c)

src/dnode/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)

src/kit/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 ADD_SUBDIRECTORY(shell)

src/kit/shell/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)

src/kit/taosdemo/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)

src/kit/taosdump/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)

src/kit/taospack/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)

src/mnode/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)

src/os/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_LINUX)

src/os/src/darwin/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)

src/os/src/detail/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(.)

src/os/src/linux/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)

src/os/src/windows/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)

src/os/tests/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)

src/plugins/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 if(NOT WIN32)
@@ -31,7 +31,24 @@ IF (TD_BUILD_HTTP)
 ELSE ()
   MESSAGE("")
   MESSAGE("${Green} use blm3 as httpd ${ColourReset}")
-  MESSAGE("")
+  EXECUTE_PROCESS(
+      COMMAND cd blm3
+      )
+  EXECUTE_PROCESS(
+      COMMAND git rev-parse --short HEAD
+      RESULT_VARIABLE commit_sha1
+      OUTPUT_VARIABLE blm3_commit_sha1
+      )
+  IF ("${blm3_commit_sha1}" STREQUAL "")
+        SET(blm3_commit_sha1 "unknown")
+  ELSE ()
+        STRING(SUBSTRING "${blm3_commit_sha1}" 0 7 blm3_commit_sha1)
+        STRING(STRIP "${blm3_commit_sha1}" blm3_commit_sha1)
+  ENDIF ()
+  MESSAGE("${Green} blm3 commit: ${blm3_commit_sha1} ${ColourReset}")
+  EXECUTE_PROCESS(
+      COMMAND cd ..
+      )
   include(ExternalProject)
   ExternalProject_Add(blm3
     PREFIX        "blm3"
@@ -40,7 +57,7 @@ ELSE ()
     DEPENDS             taos
     BUILD_IN_SOURCE     1
     CONFIGURE_COMMAND cmake -E echo "blm3 no need cmake to config"
-    BUILD_COMMAND  CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build
+    BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -ldflags "-s -w -X github.com/taosdata/blm3/version.CommitID=${blm3_commit_sha1}"
     INSTALL_COMMAND cmake -E copy blm3 ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E copy ./example/config/blm.toml ${CMAKE_BINARY_DIR}/test/cfg/
   )
 ENDIF ()

src/plugins/http/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)

src/plugins/monitor/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/plugins/mqtt/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/query/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)

src/query/tests/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)

src/rpc/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/rpc/test/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/rpc/inc)

src/sync/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/sync/test/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_LINUX)

src/tfs/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/tsdb/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(inc)

src/util/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/rpc/inc)

src/util/tests/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)

src/vnode/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)

src/wal/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 ADD_DEFINITIONS(-DWAL_CHECKSUM_WHOLE)

src/wal/test/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_LINUX)

tests/CMakeLists.txt

@@ -3,7 +3,7 @@
 # generate release version:
 # mkdir release; cd release; cmake -DCMAKE_BUILD_TYPE=Release ..
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 SET(CMAKE_C_STANDARD 11)

tests/comparisonTest/tdengine/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 IF (TD_LINUX)

tests/pytest/fulltest.sh

@@ -218,9 +218,9 @@ python3 ./test.py -f perfbenchmark/bug3433.py
 python3 ./test.py -f perfbenchmark/taosdemoInsert.py
 
 #taosdemo
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertAllType.py
+#python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
+# python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
+# python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertAllType.py
 
 #query
 python3 test.py -f query/distinctOneColTb.py

tests/script/jenkins/basic.txt

@@ -15,6 +15,7 @@ cd ../../../debug; make
 ./test.sh -f general/field/smallint.sim
 ./test.sh -f general/field/tinyint.sim
 
+
 # ./test.sh -f general/http/autocreate.sim
 # ./test.sh -f general/http/chunked.sim
 # ./test.sh -f general/http/gzip.sim
@@ -102,7 +103,7 @@ cd ../../../debug; make
 #======================b2-start===============
 
 
-./test.sh -f general/wal/sync.sim
+#./test.sh -f general/wal/sync.sim
 ./test.sh -f general/wal/kill.sim
 ./test.sh -f general/wal/maxtables.sim
 

tests/test/c/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)