Merge pull request #22020 from taosdata/fix/liaohj

other: merge main
taosdata · Jul 13, 2023 · e0ea0f2 · e0ea0f2
2 parents f424923 + 0cc7dca
commit e0ea0f2
Show file tree

Hide file tree

Showing 109 changed files with 3,527 additions and 887 deletions.
diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 3.0
+        GIT_TAG main
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

diff --git a/docs/en/12-taos-sql/02-database.md b/docs/en/12-taos-sql/02-database.md
@@ -41,7 +41,7 @@ database_option: {
 
 ## Parameters
 
-- BUFFER: specifies the size (in MB) of the write buffer for each vnode. Enter a value between 3 and 16384. The default value is 96.
+- BUFFER: specifies the size (in MB) of the write buffer for each vnode. Enter a value between 3 and 16384. The default value is 256.
 - CACHEMODEL: specifies how the latest data in subtables is stored in the cache. The default value is none.
   - none: The latest data is not cached.
   - last_row: The last row of each subtable is cached. This option significantly improves the performance of the LAST_ROW function.

diff --git a/docs/en/12-taos-sql/19-limit.md b/docs/en/12-taos-sql/19-limit.md
@@ -36,7 +36,7 @@ The following characters cannot occur in a password: single quotation marks ('),
 - Maximum numbers of databases, STables, tables are dependent only on the system resources.
 - The number of replicas can only be 1 or 3.
 - The maximum length of a username is 23 bytes.
-- The maximum length of a password is 128 bytes.
+- The maximum length of a password is 31 bytes.
 - The maximum number of rows depends on system resources.
 - The maximum number of vnodes in a database is 1024.
 

diff --git a/docs/en/12-taos-sql/25-grant.md b/docs/en/12-taos-sql/25-grant.md
@@ -16,7 +16,7 @@ This statement creates a user account.
 
 The maximum length of user_name is 23 bytes.
 
-The maximum length of password is 128 bytes. The password can include leters, digits, and special characters excluding single quotation marks, double quotation marks, backticks, backslashes, and spaces. The password cannot be empty.
+The maximum length of password is 31 bytes. The password can include leters, digits, and special characters excluding single quotation marks, double quotation marks, backticks, backslashes, and spaces. The password cannot be empty.
 
 `SYSINFO` indicates whether the user is allowed to view system information. `1` means allowed, `0` means not allowed. System information includes server configuration, dnode, vnode, storage. The default value is `1`.
 

diff --git a/docs/en/12-taos-sql/27-index.md b/docs/en/12-taos-sql/27-index.md
@@ -28,6 +28,24 @@ Performs pre-aggregation on the specified column over the time window defined by
 - WATERMARK: Enter a value between 0ms and 900000ms. The most precise unit supported is milliseconds. The default value is 5 seconds. This option can be used only on supertables.
 - MAX_DELAY: Enter a value between 1ms and 900000ms. The most precise unit supported is milliseconds. The default value is the value of interval provided that it does not exceed 900000ms. This option can be used only on supertables. Note: Retain the default value if possible. Configuring a small MAX_DELAY may cause results to be frequently pushed, affecting storage and query performance.
 
+```sql
+DROP DATABASE IF EXISTS d0;
+CREATE DATABASE d0;
+USE d0;
+CREATE TABLE IF NOT EXISTS st1 (ts timestamp, c1 int, c2 float, c3 double) TAGS (t1 int unsigned);
+CREATE TABLE ct1 USING st1 TAGS(1000);
+CREATE TABLE ct2 USING st1 TAGS(2000);
+INSERT INTO ct1 VALUES(now+0s, 10, 2.0, 3.0);
+INSERT INTO ct1 VALUES(now+1s, 11, 2.1, 3.1)(now+2s, 12, 2.2, 3.2)(now+3s, 13, 2.3, 3.3);
+CREATE SMA INDEX sma_index_name1 ON st1 FUNCTION(max(c1),max(c2),min(c1)) INTERVAL(5m,10s) SLIDING(5m) WATERMARK 5s MAX_DELAY 1m;
+-- query from SMA Index
+ALTER LOCAL 'querySmaOptimize' '1';
+SELECT max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+SELECT _wstart,_wend,_wduration,max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+-- query from raw data
+ALTER LOCAL 'querySmaOptimize' '0';
+```
+
 ### FULLTEXT Indexing
 
 Creates a text index for the specified column. FULLTEXT indexing improves performance for queries with text filtering. The index_option syntax is not supported for FULLTEXT indexing. FULLTEXT indexing is supported for JSON tag columns only. Multiple columns cannot be indexed together. However, separate indices can be created for each column.
@@ -41,7 +59,6 @@ DROP INDEX index_name;
 ## View Indices
 
 ````sql
-```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
 SHOW INDEXES FROM [db_name.]tbl_name ;
 ````

diff --git a/docs/en/14-reference/05-taosbenchmark.md b/docs/en/14-reference/05-taosbenchmark.md
@@ -470,3 +470,26 @@ The configuration parameters for subscribing to a super table are set in `super_
   - **sql**: The SQL command to be executed. For the query SQL of super table, keep "xxxx" in the SQL command. The program will automatically replace it with all the sub-table names of the super table.
     Replace it with all the sub-table names in the super table.
   - **result**: The file to save the query result. If not specified, taosBenchmark will not save result.
+
+#### data type on taosBenchmark
+
+| #   |   **TDengine**     | **taosBenchmark** 
+| --- | :----------------: | :---------------:
+| 1   |  TIMESTAMP         |    timestamp
+| 2   |  INT               |    int
+| 3   |  INT UNSIGNED      |    uint
+| 4   |  BIGINT            |    bigint
+| 5   |  BIGINT UNSIGNED   |    ubigint
+| 6   |  FLOAT             |    float
+| 7   |  DOUBLE            |    double
+| 8   |  BINARY            |    binary
+| 9   |  SMALLINT          |    smallint
+| 10  |  SMALLINT UNSIGNED |    usmallint
+| 11  |  TINYINT           |    tinyint
+| 12  |  TINYINT UNSIGNED  |    utinyint
+| 13  |  BOOL              |    bool
+| 14  |  NCHAR             |    nchar
+| 15  |  VARCHAR           |    varchar
+| 15  |  JSON              |    json
+
+note：Lowercase characters must be used on taosBenchmark datatype
diff --git a/docs/en/20-third-party/14-dbeaver.md b/docs/en/20-third-party/14-dbeaver.md
@@ -12,50 +12,25 @@ To use DBeaver to manage TDengine, you need to prepare the following:
 
 - Install DBeaver. DBeaver supports mainstream operating systems including Windows, macOS, and Linux. Please make sure you download and install the correct version (23.1.1+) and platform package. Please refer to the [official DBeaver documentation](https://github.com/dbeaver/dbeaver/wiki/Installation) for detailed installation steps.
 - If you use an on-premises TDengine cluster, please make sure that TDengine and taosAdapter are deployed and running properly. For detailed information, please refer to the taosAdapter User Manual.
-- If you use TDengine Cloud, please [register](https://cloud.tdengine.com/) for an account.
 
-## Usage
-
-### Use DBeaver to access on-premises TDengine cluster
+## Use DBeaver to access on-premises TDengine cluster
 
 1. Start the DBeaver application, click the button or menu item to choose **New Database Connection**, and then select **TDengine** in the **Timeseries** category.
 
-![Connect TDengine with DBeaver](./dbeaver/dbeaver-connect-tdengine-en.webp)
+ ![Connect TDengine with DBeaver](./dbeaver/dbeaver-connect-tdengine-en.webp)
 
 2. Configure the TDengine connection by filling in the host address, port number, username, and password. If TDengine is deployed on the local machine, you are only required to fill in the username and password. The default username is root and the default password is taosdata. Click **Test Connection** to check whether the connection is workable. If you do not have the TDengine Java connector installed on the local machine, DBeaver will prompt you to download and install it.
 
-![Configure the TDengine connection](./dbeaver/dbeaver-config-tdengine-en.webp))
+ ![Configure the TDengine connection](./dbeaver/dbeaver-config-tdengine-en.webp))
 
 3. If the connection is successful, it will be displayed as shown in the following figure. If the connection fails, please check whether the TDengine service and taosAdapter are running correctly and whether the host address, port number, username, and password are correct.
 
-![Connection successful](./dbeaver/dbeaver-connect-tdengine-test-en.webp)
+ ![Connection successful](./dbeaver/dbeaver-connect-tdengine-test-en.webp)
 
 4. Use DBeaver to select databases and tables and browse your data stored in TDengine.
 
-![Browse TDengine data with DBeaver](./dbeaver/dbeaver-browse-data-en.webp)
+ ![Browse TDengine data with DBeaver](./dbeaver/dbeaver-browse-data-en.webp)
 
 5. You can also manipulate TDengine data by executing SQL commands.
 
-![Use SQL commands to manipulate TDengine data in DBeaver](./dbeaver/dbeaver-sql-execution-en.webp)
-
-### Use DBeaver to access TDengine Cloud
-
-1. Log in to the TDengine Cloud service, select **Programming** > **Java** in the management console, and then copy the string value of `TDENGINE_JDBC_URL` displayed in the **Config** section.
-
-![Copy JDBC URL from TDengine Cloud](./dbeaver/tdengine-cloud-jdbc-dsn-en.webp)
-
-2. Start the DBeaver application, click the button or menu item to choose **New Database Connection**, and then select **TDengine Cloud** in the **Timeseries** category.
-
-![Connect TDengine Cloud with DBeaver](./dbeaver/dbeaver-connect-tdengine-cloud-en.webp)
-
-3. Configure the TDengine Cloud connection by filling in the JDBC URL value. Click **Test Connection**. If you do not have the TDengine Java connector installed on the local machine, DBeaver will prompt you to download and install it. If the connection is successful, it will be displayed as shown in the following figure. If the connection fails, please check whether the TDengine Cloud service is running properly and whether the JDBC URL is correct.
-
-![Configure the TDengine Cloud connection](./dbeaver/dbeaver-connect-tdengine-cloud-test-en.webp)
-
-4. Use DBeaver to select databases and tables and browse your data stored in TDengine Cloud.
-
-![Browse TDengine Cloud data with DBeaver](./dbeaver/dbeaver-browse-data-cloud-en.webp)
-
-5. You can also manipulate TDengine Cloud data by executing SQL commands.
-
-![Use SQL commands to manipulate TDengine Cloud data in DBeaver](./dbeaver/dbeaver-sql-execution-cloud-en.webp)
+ ![Use SQL commands to manipulate TDengine data in DBeaver](./dbeaver/dbeaver-sql-execution-en.webp)
diff --git a/docs/zh/08-connector/30-python.mdx b/docs/zh/08-connector/30-python.mdx
@@ -1,4 +1,5 @@
 ---
+toc_max_heading_level: 4
 sidebar_label: Python
 title: TDengine Python Connector
 description: "taospy 是 TDengine 的官方 Python 连接器。taospy 提供了丰富的 API， 使得 Python 应用可以很方便地使用 TDengine。tasopy 对 TDengine 的原生接口和 REST 接口都进行了封装， 分别对应 tasopy 的两个子模块：taos 和 taosrest。除了对原生接口和 REST 接口的封装，taospy 还提供了符合 Python 数据访问规范(PEP 249)的编程接口。这使得 taospy 和很多第三方工具集成变得简单，比如 SQLAlchemy 和 pandas"

diff --git a/docs/zh/12-taos-sql/02-database.md b/docs/zh/12-taos-sql/02-database.md
@@ -41,7 +41,7 @@ database_option: {
 
 ### 参数说明
 
-- BUFFER: 一个 VNODE 写入内存池大小，单位为 MB，默认为 96，最小为 3，最大为 16384。
+- BUFFER: 一个 VNODE 写入内存池大小，单位为 MB，默认为 256，最小为 3，最大为 16384。
 - CACHEMODEL：表示是否在内存中缓存子表的最近数据。默认为 none。
   - none：表示不缓存。
   - last_row：表示缓存子表最近一行数据。这将显著改善 LAST_ROW 函数的性能表现。

diff --git a/docs/zh/12-taos-sql/19-limit.md b/docs/zh/12-taos-sql/19-limit.md
@@ -36,7 +36,7 @@ description: 合法字符集和命名中的限制规则
 - 库的数目，超级表的数目、表的数目，系统不做限制，仅受系统资源限制
 - 数据库的副本数只能设置为 1 或 3
 - 用户名的最大长度是 23 字节
-- 用户密码的最大长度是 128 字节
+- 用户密码的最大长度是 31 字节
 - 总数据行数取决于可用资源
 - 单个数据库的虚拟结点数上限为 1024
 

diff --git a/docs/zh/12-taos-sql/25-grant.md b/docs/zh/12-taos-sql/25-grant.md
@@ -16,7 +16,7 @@ CREATE USER use_name PASS 'password' [SYSINFO {1|0}];
 
 use_name 最长为 23 字节。
 
-password 最长为 128 字节，合法字符包括"a-zA-Z0-9!?$%^&*()_–+={[}]:;@~#|<,>.?/"，不可以出现单双引号、撇号、反斜杠和空格，且不可以为空。
+password 最长为 31 字节，合法字符包括"a-zA-Z0-9!?$%^&*()_–+={[}]:;@~#|<,>.?/"，不可以出现单双引号、撇号、反斜杠和空格，且不可以为空。
 
 SYSINFO 表示用户是否可以查看系统信息。1 表示可以查看，0 表示不可以查看。系统信息包括服务端配置信息、服务端各种节点信息（如 DNODE、QNODE等）、存储相关的信息等。默认为可以查看系统信息。
 

diff --git a/docs/zh/12-taos-sql/27-index.md b/docs/zh/12-taos-sql/27-index.md
@@ -28,6 +28,24 @@ functions:
 - WATERMARK: 最小单位毫秒，取值范围 [0ms, 900000ms]，默认值为 5 秒，只可用于超级表。
 - MAX_DELAY: 最小单位毫秒，取值范围 [1ms, 900000ms]，默认值为 interval 的值(但不能超过最大值)，只可用于超级表。注：不建议 MAX_DELAY 设置太小，否则会过于频繁的推送结果，影响存储和查询性能，如无特殊需求，取默认值即可。
 
+```sql
+DROP DATABASE IF EXISTS d0;
+CREATE DATABASE d0;
+USE d0;
+CREATE TABLE IF NOT EXISTS st1 (ts timestamp, c1 int, c2 float, c3 double) TAGS (t1 int unsigned);
+CREATE TABLE ct1 USING st1 TAGS(1000);
+CREATE TABLE ct2 USING st1 TAGS(2000);
+INSERT INTO ct1 VALUES(now+0s, 10, 2.0, 3.0);
+INSERT INTO ct1 VALUES(now+1s, 11, 2.1, 3.1)(now+2s, 12, 2.2, 3.2)(now+3s, 13, 2.3, 3.3);
+CREATE SMA INDEX sma_index_name1 ON st1 FUNCTION(max(c1),max(c2),min(c1)) INTERVAL(5m,10s) SLIDING(5m) WATERMARK 5s MAX_DELAY 1m;
+-- 从 SMA 索引查询
+ALTER LOCAL 'querySmaOptimize' '1';
+SELECT max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+SELECT _wstart,_wend,_wduration,max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+-- 从原始数据查询
+ALTER LOCAL 'querySmaOptimize' '0'; 
+```
+
 ### FULLTEXT 索引
 
 对指定列建立文本索引，可以提升含有文本过滤的查询的性能。FULLTEXT 索引不支持 index_option 语法。现阶段只支持对 JSON 类型的标签列创建 FULLTEXT 索引。不支持多列联合索引，但可以为每个列分布创建 FULLTEXT 索引。
@@ -41,7 +59,6 @@ DROP INDEX index_name;
 ## 查看索引
 
 ````sql
-```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
 SHOW INDEXES FROM [db_name.]tbl_name;
 ````

diff --git a/docs/zh/14-reference/05-taosbenchmark.md b/docs/zh/14-reference/05-taosbenchmark.md
@@ -437,3 +437,29 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
 
 - **sqls** ：
   - **sql** : 执行的 SQL 命令，必填。
+
+#### 配置文件中数据类型书写对照表
+
+| #   |     **引擎**      | **taosBenchmark** 
+| --- | :----------------: | :---------------:
+| 1   |  TIMESTAMP         |    timestamp
+| 2   |  INT               |    int
+| 3   |  INT UNSIGNED      |    uint
+| 4   |  BIGINT            |    bigint
+| 5   |  BIGINT UNSIGNED   |    ubigint
+| 6   |  FLOAT             |    float
+| 7   |  DOUBLE            |    double
+| 8   |  BINARY            |    binary
+| 9   |  SMALLINT          |    smallint
+| 10  |  SMALLINT UNSIGNED |    usmallint
+| 11  |  TINYINT           |    tinyint
+| 12  |  TINYINT UNSIGNED  |    utinyint
+| 13  |  BOOL              |    bool
+| 14  |  NCHAR             |    nchar
+| 15  |  VARCHAR           |    varchar
+| 15  |  JSON              |    json
+
+注意：taosBenchmark 配置文件中数据类型必须小写方可识别
+
+
+
diff --git a/docs/zh/20-third-party/13-dbeaver.md b/docs/zh/20-third-party/13-dbeaver.md
@@ -8,21 +8,16 @@ DBeaver 是一款流行的跨平台数据库管理工具，方便开发者、数
 
 ## 前置条件
 
-### 安装 DBeaver
-
 使用 DBeaver 管理 TDengine 需要以下几方面的准备工作。
 
 - 安装 DBeaver。DBeaver 支持主流操作系统包括 Windows、macOS 和 Linux。请注意[下载](https://dbeaver.io/download/)正确平台和版本（23.1.1+）的安装包。详细安装步骤请参考 [DBeaver 官方文档](https://github.com/dbeaver/dbeaver/wiki/Installation)。
 - 如果使用独立部署的 TDengine 集群，请确认 TDengine 正常运行，并且 taosAdapter 已经安装并正常运行，具体细节请参考 [taosAdapter 的使用手册](/reference/taosadapter)。
-- 如果使用 TDengine Cloud，请[注册](https://cloud.taosdata.com/)相应账号。
-
-## 使用步骤
 
-### 使用 DBeaver 访问内部部署的 TDengine
+## 使用 DBeaver 访问内部部署的 TDengine
 
 1. 启动 DBeaver 应用，点击按钮或菜单项选择“连接到数据库”，然后在时间序列分类栏中选择 TDengine。
 
-![DBeaver 连接 TDengine](./dbeaver/dbeaver-connect-tdengine-zh.webp)
+ ![DBeaver 连接 TDengine](./dbeaver/dbeaver-connect-tdengine-zh.webp)
 
 2. 配置 TDengine 连接，填入主机地址、端口号、用户名和密码。如果 TDengine 部署在本机，可以只填用户名和密码，默认用户名为 root，默认密码为 taosdata。点击“测试连接”可以对连接是否可用进行测试。如果本机没有安装 TDengine Java
  连接器，DBeaver 会提示下载安装。
@@ -31,37 +26,12 @@ DBeaver 是一款流行的跨平台数据库管理工具，方便开发者、数
 
 3. 连接成功将显示如下图所示。如果显示连接失败，请检查 TDengine 服务和 taosAdapter 是否正确运行，主机地址、端口号、用户名和密码是否正确。
 
-![连接成功](./dbeaver/dbeaver-connect-tdengine-test-zh.webp)
+ ![连接成功](./dbeaver/dbeaver-connect-tdengine-test-zh.webp)
 
 4. 使用 DBeaver 选择数据库和表可以浏览 TDengine 服务的数据。
 
-![DBeaver 浏览 TDengine 数据](./dbeaver/dbeaver-browse-data-zh.webp)
+ ![DBeaver 浏览 TDengine 数据](./dbeaver/dbeaver-browse-data-zh.webp)
 
 5. 也可以通过执行 SQL 命令的方式对 TDengine 数据进行操作。
 
-![DBeaver SQL 命令](./dbeaver/dbeaver-sql-execution-zh.webp)
-
-### 使用 DBeaver 访问 TDengine Cloud
-
-1. 登录 TDengine Cloud 服务，在管理界面中选择“编程”和“Java”，然后复制 TDENGINE_JDBC_URL 的字符串值。
-
-![复制 TDengine Cloud DSN](./dbeaver/tdengine-cloud-jdbc-dsn-zh.webp)
-
-2. 启动 DBeaver 应用，点击按钮或菜单项选择“连接到数据库”，然后在时间序列分类栏中选择 TDengine Cloud。
-
-![DBeaver 连接 TDengine Cloud](./dbeaver/dbeaver-connect-tdengine-cloud-zh.webp)
-
-
-3. 配置 TDengine Cloud 连接，填入 JDBC_URL 值。点击“测试连接”，如果本机没有安装 TDengine Java
- 连接器，DBeaver 会提示下载安装。连接成功将显示如下图所示。如果显示连接失败，请检查 TDengine Cloud 服务是否启动，JDBC_URL 是否正确。
-
- ![配置 TDengine Cloud 连接](./dbeaver/dbeaver-connect-tdengine-cloud-test-zh.webp)
-
-4. 使用 DBeaver 选择数据库和表可以浏览 TDengine Cloud 服务的数据。
-
-![DBeaver 浏览 TDengine Cloud 数据](./dbeaver/dbeaver-browse-cloud-data-zh.webp)
-
-5. 也可以通过执行 SQL 命令的方式对 TDengine Cloud 数据进行操作。
-
-![DBeaver SQL 命令 操作 TDengine Cloud](./dbeaver/dbeaver-sql-execution-cloud-zh.webp)
-
+ ![DBeaver SQL 命令](./dbeaver/dbeaver-sql-execution-zh.webp)
diff --git a/examples/C#/taosdemo/README.md b/examples/C#/taosdemo/README.md
@@ -36,7 +36,11 @@ dotnet build -c Release
 ## Usage
 
 ```
-Usage: mono taosdemo.exe [OPTION...]
+Usage with mono:
+$ mono taosdemo.exe [OPTION...]
+
+Usage with dotnet:
+Usage: .\bin\Release\net5.0\taosdemo.exe [OPTION...]
 
         --help                   Show usage.
 

diff --git a/examples/C#/taosdemo/taosdemo.cs b/examples/C#/taosdemo/taosdemo.cs
@@ -72,7 +72,7 @@ static void PrintHelp(String[] argv)
             {
                 if ("--help" == argv[i])
                 {
-                    Console.WriteLine("Usage: mono taosdemo.exe [OPTION...]");
+                    Console.WriteLine("Usage: taosdemo.exe [OPTION...]");
                     Console.WriteLine("");
                     HelpPrint("--help", "Show usage.");
                     Console.WriteLine("");
@@ -305,7 +305,7 @@ public void ConnectTDengine()
             this.conn = TDengine.Connect(this.host, this.user, this.password, db, this.port);
             if (this.conn == IntPtr.Zero)
             {
-                Console.WriteLine("Connect to TDengine failed");
+                Console.WriteLine("Connect to TDengine failed. Reason: {0}\n", TDengine.Error(0));
                 CleanAndExitProgram(1);
             }
             else