Merge branch '3.0' into docs/readme_english

915588d0 · wenzhouwww · GitHub · 994f5d71 · 89adebc1 · 915588d0
8 changed file
--- a/README-CN.md
+++ b/README-CN.md
@@ -80,8 +80,10 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel

 #### 在 CentOS 上构建 taosTools 安装依赖软件

+
 #### CentOS 7.9

+
 ```
 sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel
 ```

--- a/README.md
+++ b/README.md
@@ -44,9 +44,11 @@ For user manual, system design and architecture, please refer to [TDengine Docum

 # Building

+
 At the moment, TDengine server supports running on Linux, Windows systems.Any OS application can also choose the RESTful interface of taosAdapter to connect the taosd service . TDengine supports X64/ARM64 CPU , and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future.


+
 You can choose to install through source code according to your needs, [container](https://docs.taosdata.com/3.0/get-started/docker/), [installation package](https://docs.taosdata.com/3.0/get-started/package/) or [Kubenetes](https://docs.taosdata.com/3.0/deployment/k8s/) to install. This quick guide only applies to installing from source.

   

--- a/docs/en/14-reference/03-connector/03-connector.mdx
+++ b/docs/en/14-reference/03-connector/03-connector.mdx
@@ -8,16 +8,13 @@ TDengine provides a rich set of APIs (application development interface). To fac

 ## Supported platforms

-Currently, TDengine's native interface connectors can support platforms such as X64/X86/ARM64/ARM32/MIPS/Alpha hardware platforms and Linux/Win64/Win32 development environments. The comparison matrix is as follows.
+Currently, TDengine's native interface connectors can support platforms such as X64/ARM64 hardware platforms and Linux/Win64 development environments. The comparison matrix is as follows.

 | **CPU** | **OS** | **JDBC** | **Python** | **Go** | **Node.js** | **C#** | **Rust** | C/C++ |
 | ------- | ------ | -------- | ---------- | ------ | ----------- | ------ | -------- | ----- |
 | **X86 64bit** | **Linux** | ● | ● | ● | ● | ● | ● | ● |
 | **X86 64bit** | **Win64** | ● | ● | ● | ● | ● | ● | ● |
-| **X86 64bit** | **Win32** | ● | ● | ● | ● | ○ | ○ | ● |
-| **X86 32bit** | **Win32** | ○ | ○ | ○ | ○ | ○ | ○ | ● |
 | **ARM64** | **Linux** | ● | ● | ● | ● | ○ | ○ | ● |
-| **MIPS** | **Linux** | ○ | ○ | ○ | ○ | ○ | ○ | ○ |

 Where ● means the official test verification passed, ○ means the unofficial test verification passed, -- means no assurance.


--- a/docs/en/14-reference/09-support-platform/index.md
+++ b/docs/en/14-reference/09-support-platform/index.md
@@ -5,11 +5,11 @@ description: "List of platforms supported by TDengine server, client, and connec

 ## List of supported platforms for TDengine server

-|                    | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **Other Linux** | **UOS** | **Kylin** | **Ningsi V60/V80** | **HUAWEI EulerOS** |
-| ------------------ | ----------------- | ---------------- | ---------------- | --------------- | ------- | --------- | ------------------ | ------------------ |
-| X64                | ●                 | ●                | ●                |                 | ●       | ●         | ●                  |                    |
-| Raspberry Pi ARM64 |                   |                  |                  | ●               |         |           |                    |                    |
-| HUAWEI cloud ARM64 |                   |                  |                  |                 |         |           |                    | ●                  |
+|                    | **Windows server 2016/2019** | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **UOS** | **kylin** | **Ningsi V60/V80** |
+| ------------------ | ---------------------------- | ----------------- | ---------------- | ---------------- | ------- | --------- | ------------------ |
+| X64                | ●                            | ●                 | ●                | ●                | ●       | ●         | ●                  |
+| Raspberry Pi ARM64 |                              |                   | ●                |                  |         |           |                    |
+| HUAWEI Cloud ARM64 |                              |                   |                  | ●                |         |           |                    |

 Note: ● means officially tested and verified, ○ means unofficially tested and verified.

@@ -19,15 +19,15 @@ TDengine's connector can support a wide range of platforms, including X64/X86/AR

 The comparison matrix is as follows.

-| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **MIPS**  | **Alpha** |
-| ----------- | ------------- | --------- | --------- | ------------- | --------- | --------- | --------- |
-| **OS**      | **Linux**     | **Win64** | **Win32** | **Win32**     | **Linux** | **Linux** | **Linux** |
-| **C/C++**   | ●             | ●         | ●         | ○             | ●         | ●         | ●         |
-| **JDBC**    | ●             | ●         | ●         | ○             | ●         | ●         | ●         |
-| **Python**  | ●             | ●         | ●         | ○             | ●         | ●         | --        |
-| **Go**      | ●             | ●         | ●         | ○             | ●         | ○         | --        |
-| **NodeJs**  | ●             | ●         | ○         | ○             | ●         | ○         | --        |
-| **C#**      | ●             | ●         | ○         | ○             | ○         | ○         | --        |
-| **RESTful** | ●             | ●         | ●         | ●             | ●         | ●         | ●         |
+| **CPU**     | **X64 64bit** | **X64 64bit** | **ARM64** |
+| ----------- | ------------- | ------------- | --------- |
+| **OS**      | **Linux**     | **Win64**     | **Linux** |
+| **C/C++**   | ●             | ●             | ●         |
+| **JDBC**    | ●             | ●             | ●         |
+| **Python**  | ●             | ●             | ●         |
+| **Go**      | ●             | ●             | ●         |
+| **NodeJs**  | ●             | ●             | ●         |
+| **C#**      | ●             | ●             | ○         |
+| **RESTful** | ●             | ●             | ●         |

 Note: ● means the official test is verified, ○ means the unofficial test is verified, -- means not verified.
--- a/docs/zh/14-reference/03-connector/03-connector.mdx
+++ b/docs/zh/14-reference/03-connector/03-connector.mdx
@@ -8,18 +8,13 @@ TDengine 提供了丰富的应用程序开发接口，为了便于用户快速

 ## 支持的平台

-目前 TDengine 的原生接口连接器可支持的平台包括：X64/X86/ARM64/ARM32/MIPS/Alpha 等硬件平台，以及 Linux/Win64/Win32 等开发环境。对照矩阵如下：
+目前 TDengine 的原生接口连接器可支持的平台包括：X64/ARM64 等硬件平台，以及 Linux/Win64 等开发环境。对照矩阵如下：

 | **CPU**        | **OS**    | **Java** | **Python** | **Go** | **Node.js** | **C#** | **Rust** | C/C++ |
 | -------------- | --------- | -------- | ---------- | ------ | ----------- | ------ | -------- | ----- |
 | **X86 64bit**  | **Linux** | ●        | ●          | ●      | ●           | ●      | ●        | ●     |
 | **X86 64bit**  | **Win64** | ●        | ●          | ●      | ●           | ●      | ●        | ●     |
-| **X86 64bit**  | **Win32** | ●        | ●          | ●      | ●           | ○      | ○        | ●     |
-| **X86 32bit**  | **Win32** | ○        | ○          | ○      | ○           | ○      | ○        | ●     |
 | **ARM64**      | **Linux** | ●        | ●          | ●      | ●           | ○      | ○        | ●     |
-| **MIPS 龙芯**  | **Linux** | ○        | ○          | ○      | ○           | ○      | ○        | ○     |
-| **Alpha 申威** | **Linux** | ○        | ○          | --     | --          | --     | --       | ○     |
-| **X86 海光**   | **Linux** | ○        | ○          | ○      | --          | --     | --       | ○     |

 其中 ● 表示官方测试验证通过，○ 表示非官方测试验证通过，-- 表示未经验证。


--- a/docs/zh/14-reference/09-support-platform/index.md
+++ b/docs/zh/14-reference/09-support-platform/index.md
@@ -5,11 +5,11 @@ description: "TDengine 服务端、客户端和连接器支持的平台列表"

 ## TDengine 服务端支持的平台列表

-|              | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **Other Linux** | **统信 UOS** | **银河/中标麒麟** | **凝思 V60/V80** | **华为 EulerOS** |
-| ------------ | ----------------- | ---------------- | ---------------- | --------------- | ------------ | ----------------- | ---------------- | ---------------- |
-| X64          | ●                 | ●                | ●                |                 | ●            | ●                 | ●                |                  |
-| 树莓派 ARM64 |                   |                  |                  | ●               |              |                   |                  |                  |
-| 华为云 ARM64 |                   |                  |                  |                 |              |                   |                  | ●                |
+|              | **Windows server 2016/2019** | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **统信 UOS** | **银河/中标麒麟** | **凝思 V60/V80** |
+| ------------ | ---------------------------- | ----------------- | ---------------- | ---------------- | ------------ | ----------------- | ---------------- |
+| X64          | ●                            | ●                 | ●                | ●                | ●            | ●                 | ●                |
+| 树莓派 ARM64 |                              |                   | ●                |                  |              |                   |                  |
+| 华为云 ARM64 |                              |                   |                  | ●                |              |                   |                  |

 注： ● 表示经过官方测试验证， ○ 表示非官方测试验证。

@@ -19,15 +19,15 @@ description: "TDengine 服务端、客户端和连接器支持的平台列表"

 对照矩阵如下：

-| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **MIPS 龙芯** | **Alpha 申威** | **X64 海光** |
-| ----------- | ------------- | --------- | --------- | ------------- | --------- | ------------- | -------------- | ------------ |
-| **OS**      | **Linux**     | **Win64** | **Win32** | **Win32**     | **Linux** | **Linux**     | **Linux**      | **Linux**    |
-| **C/C++**   | ●             | ●         | ●         | ○             | ●         | ●             | ●              | ●            |
-| **JDBC**    | ●             | ●         | ●         | ○             | ●         | ●             | ●              | ●            |
-| **Python**  | ●             | ●         | ●         | ○             | ●         | ●             | --             | ●            |
-| **Go**      | ●             | ●         | ●         | ○             | ●         | ○             | --             | --           |
-| **NodeJs**  | ●             | ●         | ○         | ○             | ●         | ○             | --             | --           |
-| **C#**      | ●             | ●         | ○         | ○             | ○         | ○             | --             | --           |
-| **RESTful** | ●             | ●         | ●         | ●             | ●         | ●             | ●              | ●            |
+| **CPU**     | **X64 64bit** | **X64 64bit** | **ARM64** |
+| ----------- | ------------- | ------------- | --------- |
+| **OS**      | **Linux**     | **Win64**     | **Linux** |
+| **C/C++**   | ●             | ●             | ●         |
+| **JDBC**    | ●             | ●             | ●         |
+| **Python**  | ●             | ●             | ●         |
+| **Go**      | ●             | ●             | ●         |
+| **NodeJs**  | ●             | ●             | ●         |
+| **C#**      | ●             | ●             | ○         |
+| **RESTful** | ●             | ●             | ●         |

 注：● 表示官方测试验证通过，○ 表示非官方测试验证通过，-- 表示未经验证。
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -359,7 +359,7 @@ typedef enum ELogicConditionType {
 #define TSDB_DEFAULT_DB_SCHEMALESS      TSDB_DB_SCHEMALESS_OFF

 #define TSDB_DB_MIN_WAL_RETENTION_PERIOD     -1
-#define TSDB_DEFAULT_DB_WAL_RETENTION_PERIOD (24 * 60 * 60 * 2)
+#define TSDB_DEFAULT_DB_WAL_RETENTION_PERIOD (24 * 60 * 60 * 4)
 #define TSDB_DB_MIN_WAL_RETENTION_SIZE       -1
 #define TSDB_DEFAULT_DB_WAL_RETENTION_SIZE   -1
 #define TSDB_DB_MIN_WAL_ROLL_PERIOD          0

--- a/tests/script/tsim/db/alter_option.sim
+++ b/tests/script/tsim/db/alter_option.sim
@@ -111,7 +111,7 @@ endi
 if $data21_db != 1000 then  # wal_level fsyncperiod
  return -1
 endi
-if $data22_db != 172800 then  # wal_retention_period
+if $data22_db != 345600 then  # wal_retention_period
  return -1
 endi
 if $data23_db != -1 then  # wal_retention_size