Merge branch '3.0' into wangmm0220-patch-8

README-CN.md

@@ -41,7 +41,7 @@ TDengine 是一款开源、高性能、云原生的时序数据库 (Time-Series
 
 TDengine 目前可以在 Linux、 Windows 等平台上安装和运行。任何 OS 的应用也可以选择 taosAdapter 的 RESTful 接口连接服务端 taosd。CPU 支持 X64/ARM64，后续会支持 MIPS64、Alpha64、ARM32、RISC-V 等 CPU 架构。
 
-用户可根据需求选择通过源码、[容器](https://docs.taosdata.com/get-started/docker/)、[安装包](https://docs.taosdata.com/get-started/package/)或[Kubenetes](https://docs.taosdata.com/deployment/k8s/)来安装。本快速指南仅适用于通过源码安装。
+用户可根据需求选择通过源码、[容器](https://docs.taosdata.com/get-started/docker/)、[安装包](https://docs.taosdata.com/get-started/package/)或[Kubernetes](https://docs.taosdata.com/deployment/k8s/)来安装。本快速指南仅适用于通过源码安装。
   
 TDengine 还提供一组辅助工具软件 taosTools，目前它包含 taosBenchmark（曾命名为 taosdemo）和 taosdump 两个软件。默认 TDengine 编译不包含 taosTools, 您可以在编译 TDengine 时使用`cmake .. -DBUILD_TOOLS=true` 来同时编译 taosTools。
 
@@ -104,6 +104,12 @@ sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgco
 sudo yum config-manager --set-enabled Powertools
 ```
 
+### macOS
+
+```
+sudo brew install argp-standalone pkgconfig
+```
+
 ### 设置 golang 开发环境
 
 TDengine 包含数个使用 Go 语言开发的组件，比如taosAdapter, 请参考 golang.org 官方文档设置 go 开发环境。
@@ -210,14 +216,14 @@ cmake .. -G "NMake Makefiles"
 nmake
 ```
 
-<!-- ### macOS 系统
+### macOS 系统
 
-安装 Xcode 命令行工具和 cmake. 在 Catalina 和 Big Sur 操作系统上，需要安装 XCode 11.4+ 版本。
+安装 XCode 命令行工具和 cmake. 在 Catalina 和 Big Sur 操作系统上，需要安装 XCode 11.4+ 版本。
 
 ```bash
 mkdir debug && cd debug
 cmake .. && cmake --build .
-``` -->
+```
 
 # 安装
 
@@ -263,6 +269,24 @@ nmake install
 sudo make install
 ```
 
+用户可以在[文件目录结构](https://docs.taosdata.com/reference/directory/)中了解更多在操作系统中生成的目录或文件。
+
+从源代码安装也会为 TDengine 配置服务管理 ，用户也可以选择[从安装包中安装](https://docs.taosdata.com/get-started/package/)。
+
+安装成功后，可以在应用程序中双击 TDengine 图标启动服务，或者在终端中启动 TDengine 服务：
+
+```bash
+launchctl start taosd
+```
+
+用户可以使用 TDengine CLI 来连接 TDengine 服务，在终端中，输入：
+
+```bash
+taos
+```
+
+如果 TDengine CLI 连接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印出错误消息。
+
 ## 快速运行
 
 如果不希望以服务方式运行 TDengine，也可以在终端中直接运行它。也即在生成完成后，执行以下命令（在 Windows 下，生成的可执行文件会带有 .exe 后缀，例如会名为 taosd.exe ）：

README.md

@@ -19,7 +19,7 @@ English | [简体中文](README-CN.md) | [Learn more about TSDB](https://tdengin
 
 # What is TDengine？
 
-TDengine is an open source, high-performance, cloud native [time-series database](https://tdengine.com/tsdb/) optimized for Internet of Things (IoT), Connected Cars, and Industrial IoT. It enables efficient, real-time data ingestion, processing, and monitoring of TB and even PB scale data per day, generated by billions of sensors and data collectors. TDengine differentiates itself from other time-seires databases with the following advantages:
+TDengine is an open source, high-performance, cloud native [time-series database](https://tdengine.com/tsdb/) optimized for Internet of Things (IoT), Connected Cars, and Industrial IoT. It enables efficient, real-time data ingestion, processing, and monitoring of TB and even PB scale data per day, generated by billions of sensors and data collectors. TDengine differentiates itself from other time-series databases with the following advantages:
 
 - **[High Performance](https://tdengine.com/tdengine/high-performance-time-series-database/)**: TDengine is the only time-series database to solve the high cardinality issue to support billions of data collection points while out performing other time-series databases for data ingestion, querying and data compression.
 
@@ -105,6 +105,12 @@ If the PowerTools installation fails, you can try to use:
 sudo yum config-manager --set-enabled powertools
 ```
 
+### macOS
+
+```
+sudo brew install argp-standalone pkgconfig
+```
+
 ### Setup golang environment
 
 TDengine includes a few components like taosAdapter developed by Go language. Please refer to golang.org official documentation for golang environment setup.
@@ -213,14 +219,14 @@ cmake .. -G "NMake Makefiles"
 nmake
 ```
 
-<!-- ### On macOS platform
+### On macOS platform
 
 Please install XCode command line tools and cmake. Verified with XCode 11.4+ on Catalina and Big Sur.
 
 ```shell
 mkdir debug && cd debug
 cmake .. && cmake --build .
-``` -->
+```
 
 # Installing
 
@@ -258,7 +264,7 @@ After building successfully, TDengine can be installed by:
 nmake install
 ```
 
-<!-- 
+
 ## On macOS platform
 
 After building successfully, TDengine can be installed by:
@@ -266,7 +272,24 @@ After building successfully, TDengine can be installed by:
 ```bash
 sudo make install
 ```
--->
+
+Users can find more information about directories installed on the system in the [directory and files](https://docs.tdengine.com/reference/directory/) section.
+
+Installing from source code will also configure service management for TDengine.Users can also choose to [install from packages](https://docs.tdengine.com/get-started/package/) for it.
+
+To start the service after installation, double-click the /applications/TDengine to start the program, or in a terminal, use:
+
+```bash
+launchctl start taosd
+```
+
+Then users can use the TDengine CLI to connect the TDengine server. In a terminal, use:
+
+```bash
+taos
+```
+
+If TDengine CLI connects the server successfully, welcome messages and version info are printed. Otherwise, an error message is shown.
 
 ## Quick Run
 

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 70f5a1c
+        GIT_TAG 85179e9
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

docs/en/05-get-started/03-package.md

@@ -7,7 +7,7 @@ import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 import PkgListV3 from "/components/PkgListV3";
 
-This document describes how to install TDengine on Linux and Windows and perform queries and inserts.
+This document describes how to install TDengine on Linux/Windows/macOS and perform queries and inserts.
 
 - The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). 
 - To get started with TDengine on Docker, see [Quick Install on Docker](../../get-started/docker).
@@ -17,7 +17,7 @@ The full package of TDengine includes the TDengine Server (`taosd`), TDengine Cl
 
 The standard server installation package includes `taos`, `taosd`, `taosAdapter`, `taosBenchmark`, and sample code. You can also download the Lite package that includes only `taosd` and the C/C++ connector.
 
-The TDengine Community Edition is released as Deb and RPM packages. The Deb package can be installed on Debian, Ubuntu, and derivative systems. The RPM package can be installed on CentOS, RHEL, SUSE, and derivative systems. A .tar.gz package is also provided for enterprise customers, and you can install TDengine over `apt-get` as well. The .tar.tz package includes `taosdump` and the TDinsight installation script. If you want to use these utilities with the Deb or RPM package, download and install taosTools separately. TDengine can also be installed on 64-bit Windows.
+The TDengine Community Edition is released as Deb and RPM packages. The Deb package can be installed on Debian, Ubuntu, and derivative systems. The RPM package can be installed on CentOS, RHEL, SUSE, and derivative systems. A .tar.gz package is also provided for enterprise customers, and you can install TDengine over `apt-get` as well. The .tar.tz package includes `taosdump` and the TDinsight installation script. If you want to use these utilities with the Deb or RPM package, download and install taosTools separately. TDengine can also be installed on x64 Windows and x64/m1 macOS.
 
 ## Installation
 
@@ -111,6 +111,13 @@ Note: TDengine only supports Windows Server 2016/2019 and Windows 10/11 on the W
    <PkgListV3 type={3}/>
 2. Run the downloaded package to install TDengine.
 
+</TabItem>
+<TabItem label="macOS" value="macos">
+
+1. Download the macOS installation package.
+   <PkgListV3 type={7}/>
+2. Run the downloaded package to install TDengine.
+
 </TabItem>
 </Tabs>
 
@@ -178,12 +185,33 @@ The following `systemctl` commands can help you manage TDengine service:
 
 After the installation is complete, run `C:\TDengine\taosd.exe` to start TDengine Server.
 
+</TabItem>
+
+<TabItem label="macOS" value="macos">
+
+After the installation is complete, double-click the /applications/TDengine to start the program, or run `launchctl start taosd` to start TDengine Server.
+
+The following `launchctl` commands can help you manage TDengine service:
+
+- Start TDengine Server: `launchctl start taosd`
+
+- Stop TDengine Server: `launchctl stop taosd`
+
+- Check TDengine Server status: `launchctl list | grep taosd`
+
+:::info
+
+- The `launchctl` command  does not require _root_ privileges. You don't need to use the `sudo` command.
+- The first content returned by the `launchctl list | grep taosd` command is the PID of the program, if '-' indicates that the TDengine service is not running.
+
+:::
+
 </TabItem>
 </Tabs>
 
 ## Command Line Interface (CLI)
 
-You can use the TDengine CLI to monitor your TDengine deployment and execute ad hoc queries. To open the CLI, you can execute `taos` in the Linux terminal where TDengine is installed, or you can run `taos.exe` in the `C:\TDengine` directory of the Windows terminal where TDengine is installed to start the TDengine command line.
+You can use the TDengine CLI to monitor your TDengine deployment and execute ad hoc queries. To open the CLI, you can execute `taos` in the Linux/macOS terminal where TDengine is installed, or you can run `taos.exe` in the `C:\TDengine` directory of the Windows terminal where TDengine is installed to start the TDengine command line.
 
 ```bash
 taos
@@ -213,13 +241,13 @@ SELECT * FROM t;
 Query OK, 2 row(s) in set (0.003128s)
 ```
 
-You can also can monitor the deployment status, add and remove user accounts, and manage running instances. You can run the TDengine CLI on either Linux or Windows machines. For more information, see [TDengine CLI](../../reference/taos-shell/).
+You can also can monitor the deployment status, add and remove user accounts, and manage running instances. You can run the TDengine CLI on either machines. For more information, see [TDengine CLI](../../reference/taos-shell/).
 
 ## Test data insert performance
 
 After your TDengine Server is running normally, you can run the taosBenchmark utility to test its performance:
 
-Start TDengine service and execute `taosBenchmark` (formerly named `taosdemo`) in a Linux or Windows terminal.
+Start TDengine service and execute `taosBenchmark` (formerly named `taosdemo`) in a terminal.
 
 ```bash
 taosBenchmark

docs/zh/05-get-started/03-package.md

@@ -10,11 +10,11 @@ import PkgListV3 from "/components/PkgListV3";
 
 您可以[用 Docker 立即体验](../../get-started/docker/) TDengine。如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装.
 
-TDengine 完整的软件包包括服务端（taosd）、应用驱动（taosc）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、命令行程序（CLI，taos）和一些工具软件。目前 taosAdapter 仅在 Linux 系统上安装和运行，后续将支持 Windows、macOS 等系统。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](../../reference/taosadapter/) 提供 [RESTful 接口](../../connector/rest-api/)。
+TDengine 完整的软件包包括服务端（taosd）、应用驱动（taosc）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、命令行程序（CLI，taos）和一些工具软件。目前 taosdump、TDinsight 仅在 Linux 系统上安装和运行，后续将支持 Windows、macOS 等系统。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](../../reference/taosadapter/) 提供 [RESTful 接口](../../connector/rest-api/)。
 
 为方便使用，标准的服务端安装包包含了 taosd、taosAdapter、taosc、taos、taosdump、taosBenchmark、TDinsight 安装脚本和示例代码；如果您只需要用到服务端程序和客户端连接的 C/C++ 语言支持，也可以仅下载 Lite 版本的安装包。
 
-在 Linux 系统上，TDengine 社区版提供 Deb 和 RPM 格式安装包，用户可以根据自己的运行环境选择合适的安装包。其中 Deb 支持 Debian/Ubuntu 及其衍生系统，RPM 支持 CentOS/RHEL/SUSE 及其衍生系统。同时我们也为企业用户提供 tar.gz 格式安装包，也支持通过 `apt-get` 工具从线上进行安装。需要注意的是，RPM 和 Deb 包不含 `taosdump` 和 TDinsight 安装脚本，这些工具需要通过安装 taosTool 包获得。TDengine 也提供 Windows x64 平台的安装包。
+在 Linux 系统上，TDengine 社区版提供 Deb 和 RPM 格式安装包，用户可以根据自己的运行环境选择合适的安装包。其中 Deb 支持 Debian/Ubuntu 及其衍生系统，RPM 支持 CentOS/RHEL/SUSE 及其衍生系统。同时我们也为企业用户提供 tar.gz 格式安装包，也支持通过 `apt-get` 工具从线上进行安装。需要注意的是，RPM 和 Deb 包不含 `taosdump` 和 TDinsight 安装脚本，这些工具需要通过安装 taosTools 包获得。TDengine 也提供 Windows x64 平台和 macOS x64/m1 平台的安装包。
 
 ## 安装
 
@@ -110,6 +110,13 @@ apt-get 方式只适用于 Debian 或 Ubuntu 系统。
    <PkgListV3 type={3}/>
 2. 运行可执行程序来安装 TDengine。
 
+</TabItem>
+<TabItem label="macOS 安装" value="macos">
+
+1. 从列表中下载获得 pkg 安装程序；
+   <PkgListV3 type={7}/>
+2. 运行可执行程序来安装 TDengine。
+
 </TabItem>
 </Tabs>
 
@@ -177,12 +184,33 @@ Active: inactive (dead)
 
 安装后，在 `C:\TDengine` 目录下，运行 `taosd.exe` 来启动 TDengine 服务进程。
 
+</TabItem>
+
+<TabItem label="macOS 系统" value="macos">
+
+安装后，在应用程序目录下，双击 TDengine 图标来启动程序，也可以运行 `launchctl start taosd` 来启动 TDengine 服务进程。
+
+如下 `launchctl` 命令可以帮助你管理 TDengine 服务：
+
+- 启动服务进程：`launchctl start taosd`
+
+- 停止服务进程：`launchctl stop taosd`
+
+- 查看服务状态：`launchctl list | grep taosd`
+
+:::info
+
+- `launchctl` 命令不需要管理员权限，请不要在前面加 `sudo`。
+- `launchctl list | grep taosd` 指令返回的第一个内容是程序的 PID，若为 `-` 则说明 TDengine 服务未运行。
+
+:::
+
 </TabItem>
 </Tabs>
 
 ## TDengine 命令行（CLI）
 
-为便于检查 TDengine 的状态，执行数据库（Database）的各种即席（Ad Hoc）查询，TDengine 提供一命令行应用程序（以下简称为 TDengine CLI）taos。要进入 TDengine 命令行，您只要在安装有 TDengine 的 Linux 终端执行 `taos` 即可，也可以在安装有 TDengine 的 Windows 终端的 C:\TDengine 目录下，运行 taos.exe 来启动 TDengine 命令行。
+为便于检查 TDengine 的状态，执行数据库（Database）的各种即席（Ad Hoc）查询，TDengine 提供一命令行应用程序（以下简称为 TDengine CLI）taos。要进入 TDengine 命令行，您只要在安装有 TDengine 的 Linux、macOS 终端执行 `taos` 即可，也可以在安装有 TDengine 的 Windows 终端的 C:\TDengine 目录下，运行 taos.exe 来启动 TDengine 命令行。
 
 ```bash
 taos
@@ -212,13 +240,13 @@ SELECT * FROM t;
 Query OK, 2 row(s) in set (0.003128s)
 ```
 
-除执行 SQL 语句外，系统管理员还可以从 TDengine CLI 进行检查系统运行状态、添加删除用户账号等操作。TDengine CLI 连同应用驱动也可以独立安装在 Linux 或 Windows 机器上运行，更多细节请参考 [TDengine 命令行](../../reference/taos-shell/)。
+除执行 SQL 语句外，系统管理员还可以从 TDengine CLI 进行检查系统运行状态、添加删除用户账号等操作。TDengine CLI 连同应用驱动也可以独立安装在机器上运行，更多细节请参考 [TDengine 命令行](../../reference/taos-shell/)。
 
 ## 使用 taosBenchmark 体验写入速度
 
 可以使用 TDengine 的自带工具 taosBenchmark 快速体验 TDengine 的写入速度。
 
-启动 TDengine 的服务，在 Linux 或 Windows 终端执行 `taosBenchmark`（曾命名为 `taosdemo`）：
+启动 TDengine 服务，然后在终端执行 `taosBenchmark`（曾命名为 `taosdemo`）：
 
 ```bash
 $ taosBenchmark
@@ -249,7 +277,7 @@ SELECT AVG(current), MAX(voltage), MIN(phase) FROM test.meters;
 查询 location = "California.SanFrancisco" 的记录总条数：
 
 ```sql
-SELECT COUNT(*) FROM test.meters WHERE location = "Calaifornia.SanFrancisco";
+SELECT COUNT(*) FROM test.meters WHERE location = "California.SanFrancisco";
 ```
 
 查询 groupId = 10 的所有记录的平均值、最大值、最小值等：

docs/zh/07-develop/03-insert-data/02-influxdb-line.mdx

@@ -70,6 +70,7 @@ meters,location=California.LosAngeles,groupid=2 current=13.4,voltage=223,phase=0
 ## SQL查询示例
 - meters 是插入数据的超级表名
 - 可以通过超级表的tag来过滤数据，比如查询 `location=California.LosAngeles,groupid=2` 可以通过如下sql：
-``` sql
-select * from meters where location=California.LosAngeles and groupid=2
+
+``` cmd
+select * from meters where location="California.LosAngeles" and groupid=2
 ```

docs/zh/07-develop/03-insert-data/03-opentsdb-telnet.mdx

@@ -81,6 +81,10 @@ taos> select tbname, * from `meters.current`;
  t_7e7b26dd860280242c6492a16... | 2022-03-28 09:56:51.250 |              12.600000000 | 2       | California.SanFrancisco               |
 Query OK, 4 row(s) in set (0.005399s)
 ```
-## 查询示例：
-想要查询 location=California.LosAngeles groupid=3 的数据，可以通过如下sql:
-select * from `meters.voltage` where location="California.LosAngeles" and groupid=3
+
+## SQL查询示例
+- `meters.current` 是插入数据的超级表名
+- 可以通过超级表的tag来过滤数据，比如查询 `location=California.LosAngeles groupid=3` 可以通过如下sql：
+``` cmd
+select * from `meters.current` where location="California.LosAngeles" and groupid=3
+```

docs/zh/07-develop/03-insert-data/04-opentsdb-json.mdx

@@ -96,6 +96,9 @@ taos> select * from `meters.current`;
 Query OK, 2 row(s) in set (0.004076s)
 ```
 
-## 查询示例
-想要查询"tags": {"location": "California.LosAngeles", "groupid": 1} 的数据，可以通过如下sql：
+## SQL查询示例
+- `meters.voltage` 是插入数据的超级表名
+- 可以通过超级表的tag来过滤数据，比如查询 `location=California.LosAngeles groupid=1` 可以通过如下sql：
+``` cmd
 select * from `meters.voltage` where location="California.LosAngeles" and groupid=1
+```

docs/zh/07-develop/06-stream.md

@@ -70,7 +70,7 @@ insert into d1004 values("2018-10-03 14:38:06.500", 11.50000, 221, 0.35000);
 ### 查询以观察结果
 
 ```sql
-taos> select start, end, max_current from current_stream_output_stb;
+taos> select start, wend, max_current from current_stream_output_stb;
           start          |          wend           |     max_current      |
 ===========================================================================
  2018-10-03 14:38:05.000 | 2018-10-03 14:38:10.000 |             10.30000 |

include/common/tdataformat.h

@@ -27,6 +27,7 @@
 extern "C" {
 #endif
 
+typedef struct SBuffer       SBuffer;
 typedef struct SSchema       SSchema;
 typedef struct STColumn      STColumn;
 typedef struct STSchema      STSchema;
@@ -56,6 +57,18 @@ const static uint8_t BIT2_MAP[4][4] = {{0b00000000, 0b00000001, 0b00000010, 0},
 #define SET_BIT2(p, i, v) ((p)[(i) >> 2] = (p)[(i) >> 2] & N1(BIT2_MAP[(i)&3][3]) | BIT2_MAP[(i)&3][(v)])
 #define GET_BIT2(p, i)    (((p)[(i) >> 2] >> BIT2_MAP[(i)&3][3]) & ((uint8_t)3))
 
+// SBuffer ================================
+struct SBuffer {
+  int64_t  nBuf;
+  uint8_t *pBuf;
+};
+
+#define tBufferCreate() \
+  (SBuffer) { .nBuf = 0, .pBuf = NULL }
+void    tBufferDestroy(SBuffer *pBuffer);
+int32_t tBufferInit(SBuffer *pBuffer, int64_t size);
+int32_t tBufferPut(SBuffer *pBuffer, const void *pData, int64_t nData);
+
 // STSchema ================================
 int32_t tTSchemaCreate(int32_t sver, SSchema *pSchema, int32_t nCols, STSchema **ppTSchema);
 void    tTSchemaDestroy(STSchema *pTSchema);
@@ -162,17 +175,7 @@ struct STSRowBuilder {
 
 struct SValue {
   union {
-    int8_t   i8;   // TSDB_DATA_TYPE_BOOL||TSDB_DATA_TYPE_TINYINT
-    uint8_t  u8;   // TSDB_DATA_TYPE_UTINYINT
-    int16_t  i16;  // TSDB_DATA_TYPE_SMALLINT
-    uint16_t u16;  // TSDB_DATA_TYPE_USMALLINT
-    int32_t  i32;  // TSDB_DATA_TYPE_INT
-    uint32_t u32;  // TSDB_DATA_TYPE_UINT
-    int64_t  i64;  // TSDB_DATA_TYPE_BIGINT
-    uint64_t u64;  // TSDB_DATA_TYPE_UBIGINT
-    TSKEY    ts;   // TSDB_DATA_TYPE_TIMESTAMP
-    float    f;    // TSDB_DATA_TYPE_FLOAT
-    double   d;    // TSDB_DATA_TYPE_DOUBLE
+    int64_t val;
     struct {
       uint32_t nData;
       uint8_t *pData;

include/common/ttypes.h

@@ -333,10 +333,10 @@ typedef struct tDataTypeDescriptor {
   char   *name;
   int64_t minValue;
   int64_t maxValue;
-  int32_t (*compFunc)(const char *const input, int32_t inputSize, const int32_t nelements, char *const output,
-                      int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
-  int32_t (*decompFunc)(const char *const input, int32_t compressedSize, const int32_t nelements, char *const output,
-                        int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
+  int32_t (*compFunc)(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                      int32_t nBuf);
+  int32_t (*decompFunc)(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
   void (*statisFunc)(int8_t bitmapMode, const void *pBitmap, const void *pData, int32_t numofrow, int64_t *min,
                      int64_t *max, int64_t *sum, int16_t *minindex, int16_t *maxindex, int16_t *numofnull);
 } tDataTypeDescriptor;
@@ -356,7 +356,6 @@ void  operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
 void *getDataMin(int32_t type);
 void *getDataMax(int32_t type);
 
-
 #ifdef __cplusplus
 }
 #endif

include/os/osDir.h

@@ -38,9 +38,9 @@ extern "C" {
 #define TD_LOG_DIR_PATH "C:\\TDengine\\log\\"
 #elif defined(_TD_DARWIN_64)
 #define TD_TMP_DIR_PATH "/tmp/taosd/"
-#define TD_CFG_DIR_PATH "/usr/local/etc/taos/"
-#define TD_DATA_DIR_PATH "/usr/local/var/lib/taos/"
-#define TD_LOG_DIR_PATH "/usr/local/var/log/taos/"
+#define TD_CFG_DIR_PATH "/etc/taos/"
+#define TD_DATA_DIR_PATH "/var/lib/taos/"
+#define TD_LOG_DIR_PATH "/var/log/taos/"
 #else
 #define TD_TMP_DIR_PATH "/tmp/"
 #define TD_CFG_DIR_PATH "/etc/taos/"

include/util/tcoding.h

@@ -23,8 +23,8 @@ extern "C" {
 #endif
 
 #define ENCODE_LIMIT  (((uint8_t)1) << 7)
-#define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
-#define ZIGZAGD(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
+#define ZIGZAGE(T, v) (((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1))  // zigzag encode
+#define ZIGZAGD(T, v) (((v) >> 1) ^ -((T)((v)&1)))                                 // zigzag decode
 
 /* ------------------------ LEGACY CODES ------------------------ */
 #if 1
@@ -70,7 +70,7 @@ static FORCE_INLINE int32_t taosEncodeFixedBool(void **buf, bool value) {
 }
 
 static FORCE_INLINE void *taosDecodeFixedBool(const void *buf, bool *value) {
-  *value = ( (((int8_t *)buf)[0] == 0) ? false : true );
+  *value = ((((int8_t *)buf)[0] == 0) ? false : true);
   return POINTER_SHIFT(buf, sizeof(int8_t));
 }
 

include/util/tcompression.h

@@ -51,287 +51,12 @@ extern "C" {
 #define HEAD_MODE(x) x % 2
 #define HEAD_ALGO(x) x / 2
 
-extern int32_t tsCompressINTImp(const char *const input, const int32_t nelements, char *const output, const char type);
-extern int32_t tsDecompressINTImp(const char *const input, const int32_t nelements, char *const output,
-                                  const char type);
-extern int32_t tsCompressBoolImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressBoolImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressStringImp(const char *const input, int32_t inputSize, char *const output, int32_t outputSize);
-extern int32_t tsDecompressStringImp(const char *const input, int32_t compressedSize, char *const output,
-                                     int32_t outputSize);
-extern int32_t tsCompressTimestampImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressTimestampImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressDoubleImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressDoubleImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressFloatImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressFloatImp(const char *const input, const int32_t nelements, char *const output);
-// lossy
-extern int32_t tsCompressFloatLossyImp(const char *input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressFloatLossyImp(const char *input, int32_t compressedSize, const int32_t nelements,
-                                         char *const output);
-extern int32_t tsCompressDoubleLossyImp(const char *input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressDoubleLossyImp(const char *input, int32_t compressedSize, const int32_t nelements,
-                                          char *const output);
-
 #ifdef TD_TSZ
 extern bool lossyFloat;
 extern bool lossyDouble;
 int32_t     tsCompressInit();
 void        tsCompressExit();
-#endif
-
-static FORCE_INLINE int32_t tsCompressTinyint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                              char *const output, int32_t outputSize, char algorithm,
-                                              char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressTinyint(const char *const input, int32_t compressedSize,
-                                                const int32_t nelements, char *const output, int32_t outputSize,
-                                                char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressSmallint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressSmallint(const char *const input, int32_t compressedSize,
-                                                 const int32_t nelements, char *const output, int32_t outputSize,
-                                                 char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressInt(const char *const input, int32_t inputSize, const int32_t nelements,
-                                          char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                          int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressInt(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                            char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                            int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressBigint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressBigint(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressBool(const char *const input, int32_t inputSize, const int32_t nelements,
-                                           char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                           int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressBoolImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressBool(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressBoolImp(buffer, nelements, output);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressString(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  return tsCompressStringImp(input, inputSize, output, outputSize);
-}
-
-static FORCE_INLINE int32_t tsDecompressString(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  return tsDecompressStringImp(input, compressedSize, output, outputSize);
-}
-
-static FORCE_INLINE int32_t tsCompressFloat(const char *const input, int32_t inputSize, const int32_t nelements,
-                                            char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                            int32_t bufferSize) {
-#ifdef TD_TSZ
-  // lossy mode
-  if (lossyFloat) {
-    return tsCompressFloatLossyImp(input, nelements, output);
-    // lossless mode
-  } else {
-#endif
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsCompressFloatImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      int32_t len = tsCompressFloatImp(input, nelements, buffer);
-      return tsCompressStringImp(buffer, len, output, outputSize);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsDecompressFloat(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                              char *const output, int32_t outputSize, char algorithm,
-                                              char *const buffer, int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY) {
-    // decompress lossy
-    return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
-  } else {
-#endif
-    // decompress lossless
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsDecompressFloatImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-      return tsDecompressFloatImp(buffer, nelements, output);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsCompressDouble(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (lossyDouble) {
-    // lossy mode
-    return tsCompressDoubleLossyImp(input, nelements, output);
-  } else {
-#endif
-    // lossless mode
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsCompressDoubleImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      int32_t len = tsCompressDoubleImp(input, nelements, buffer);
-      return tsCompressStringImp(buffer, len, output, outputSize);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsDecompressDouble(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY) {
-    // decompress lossy
-    return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
-  } else {
-#endif
-    // decompress lossless
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsDecompressDoubleImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-      return tsDecompressDoubleImp(buffer, nelements, output);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
 
-#ifdef TD_TSZ
-//
-//  lossy float double
-//
 static FORCE_INLINE int32_t tsCompressFloatLossy(const char *const input, int32_t inputSize, const int32_t nelements,
                                                  char *const output, int32_t outputSize, char algorithm,
                                                  char *const buffer, int32_t bufferSize) {
@@ -358,33 +83,56 @@ static FORCE_INLINE int32_t tsDecompressDoubleLossy(const char *const input, int
 
 #endif
 
-static FORCE_INLINE int32_t tsCompressTimestamp(const char *const input, int32_t inputSize, const int32_t nelements,
-                                                char *const output, int32_t outputSize, char algorithm,
-                                                char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressTimestampImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressTimestamp(const char *const input, int32_t compressedSize,
-                                                  const int32_t nelements, char *const output, int32_t outputSize,
-                                                  char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressTimestampImp(buffer, nelements, output);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
+/*************************************************************************
+ *                  REGULAR COMPRESSION
+ *************************************************************************/
+int32_t tsCompressTimestamp(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                            int32_t nBuf);
+int32_t tsDecompressTimestamp(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg,
+                              void *pBuf, int32_t nBuf);
+int32_t tsCompressFloat(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
+int32_t tsDecompressFloat(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                          int32_t nBuf);
+int32_t tsCompressDouble(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressDouble(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsCompressString(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressString(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsCompressBool(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                       int32_t nBuf);
+int32_t tsDecompressBool(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsCompressTinyint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                          int32_t nBuf);
+int32_t tsDecompressTinyint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                            int32_t nBuf);
+int32_t tsCompressSmallint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsDecompressSmallint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg,
+                             void *pBuf, int32_t nBuf);
+int32_t tsCompressInt(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                      int32_t nBuf);
+int32_t tsDecompressInt(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
+int32_t tsCompressBigint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressBigint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+
+/*************************************************************************
+ *                  STREAM COMPRESSION
+ *************************************************************************/
+typedef struct SCompressor SCompressor;
+
+int32_t tCompressorCreate(SCompressor **ppCmprsor);
+int32_t tCompressorDestroy(SCompressor *pCmprsor);
+int32_t tCompressStart(SCompressor *pCmprsor, int8_t type, int8_t cmprAlg);
+int32_t tCompressEnd(SCompressor *pCmprsor, const uint8_t **ppOut, int32_t *nOut, int32_t *nOrigin);
+int32_t tCompress(SCompressor *pCmprsor, const void *pData, int64_t nData);
 
 #ifdef __cplusplus
 }

packaging/tools/TDengine

+#!/usr/bin/env bash
+
+
+function showAlertMessage(){
+osascript <<EOF
+	set buttonStr to "${3}"
+	set oldDelimiters to AppleScript's text item delimiters
+	set AppleScript's text item delimiters to ","
+	set buttonList to every text item of buttonStr
+	set AppleScript's text item delimiters to oldDelimiters
+	get buttonList
+	set btns to buttonList
+	display dialog "${1}" with title "${2}" buttons btns with icon ${4}
+	get result 
+EOF
+}
+
+taosd_status=`Launchctl list | grep taosd | head -n 1 | awk '{print $1}'`
+if [ "$taosd_status"x = "-"x ]; then
+    launchctl start taosd
+    showAlertMessage "Taosd is running!" "TDengine" "ok" "note"
+else
+    choose_result=`showAlertMessage "Taosd is running!\nDo you want to close it?" "TDengine" "yes,cancel" "stop"`
+    if [ "$choose_result"x = "button returned:yes"x ]; then
+        launchctl stop taosd
+    fi
+fi
+

packaging/tools/com.taosdata.taosd.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>taosd</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>/usr/local/bin/taosd</string>
+    </array>
+    <key>ProcessType</key>
+    <string>Interactive</string>
+    <key>Disabled</key>
+    <false/>
+    <key>RunAtLoad</key>
+    <false/>
+    <key>LaunchOnlyOnce</key>
+    <false/>
+    <key>SessionCreate</key>
+    <true/>
+    <key>ExitTimeOut</key>
+    <integer>600</integer>
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+        <key>AfterInitialDemand</key>
+        <true/>
+    </dict>
+    <key>Program</key>
+    <string>/usr/local/bin/taosd</string>
+</dict>
+</plist>
\ No newline at end of file

packaging/tools/mac_before_install.txt

+TDengine is a high-efficient, scalable, high-available distributed time-series database, which makes a lot of optimizations on inserting and querying data, which is far more efficient than normal regular databases. So TDengine can meet the high requirements of IOT and other areas on storing and querying a large amount of data. 
+
+To configure TDengine : edit /etc/taos/taos.cfg
+To start service : launchctl start taosd
+To access TDengine : use taos in shell
\ No newline at end of file

packaging/tools/make_install.sh

@@ -30,36 +30,31 @@ productName="TDengine"
 emailName="taosdata.com"
 uninstallScript="rmtaos"
 
-if [ "$osType" != "Darwin" ]; then
-  data_dir=${dataDir}
-  log_dir=${logDir}
-
-  cfg_install_dir=${configDir}
+data_dir=${dataDir}
+log_dir=${logDir}
+cfg_install_dir=${configDir}
 
+if [ "$osType" != "Darwin" ]; then
   bin_link_dir="/usr/bin"
   lib_link_dir="/usr/lib"
   lib64_link_dir="/usr/lib64"
   inc_link_dir="/usr/include"
-
-  install_main_dir=${installDir}
-
-  bin_dir="${installDir}/bin"
 else
-  data_dir="/usr/local${dataDir}"
-  log_dir="/usr/local${logDir}"
-
-  cfg_install_dir="/usr/local${configDir}"
-
   bin_link_dir="/usr/local/bin"
   lib_link_dir="/usr/local/lib"
   inc_link_dir="/usr/local/include"
 
-  install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
-  install_main_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}"
-
-  bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
-  bin_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}/bin"
+  if [ -d "/usr/local/Cellar/" ];then
+    installDir="/usr/local/Cellar/tdengine/${verNumber}"
+  elif [ -d "/opt/homebrew/Cellar/" ];then
+    installDir="/opt/homebrew/Cellar/tdengine/${verNumber}"
+  else
+    installDir="/usr/local/taos"
+  fi
 fi
+install_main_dir=${installDir}
+bin_dir="${installDir}/bin"
+cfg_dir="${installDir}/cfg"
 
 service_config_dir="/etc/systemd/system"
 
@@ -71,14 +66,16 @@ GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
 csudo=""
+csudouser=""
+if command -v sudo >/dev/null; then
+  csudo="sudo "
+  csudouser="sudo -u ${USER} "
+fi
 
 service_mod=2
 os_type=0
 
 if [ "$osType" != "Darwin" ]; then
-  if command -v sudo >/dev/null; then
-    csudo="sudo "
-  fi
   initd_mod=0
   if pidof systemd &>/dev/null; then
     service_mod=0
@@ -142,7 +139,6 @@ function kill_taosd() {
 
 function install_main_path() {
   #create install main dir and all sub dir
-  if [ "$osType" != "Darwin" ]; then
   ${csudo}rm -rf ${install_main_dir} || :
   ${csudo}mkdir -p ${install_main_dir}
   ${csudo}mkdir -p ${install_main_dir}/cfg
@@ -153,17 +149,6 @@ function install_main_path() {
   ${csudo}mkdir -p ${install_main_dir}/include
   ${csudo}mkdir -p ${install_main_dir}/share
   #    ${csudo}mkdir -p ${install_main_dir}/init.d
-  else
-    ${csudo}rm -rf ${install_main_dir} || ${csudo}rm -rf ${install_main_2_dir} || :
-    ${csudo}mkdir -p ${install_main_dir} || ${csudo}mkdir -p ${install_main_2_dir}
-    ${csudo}mkdir -p ${install_main_dir}/cfg || ${csudo}mkdir -p ${install_main_2_dir}/cfg
-    ${csudo}mkdir -p ${install_main_dir}/bin || ${csudo}mkdir -p ${install_main_2_dir}/bin
-    #    ${csudo}mkdir -p ${install_main_dir}/connector || ${csudo}mkdir -p ${install_main_2_dir}/connector
-    ${csudo}mkdir -p ${install_main_dir}/driver || ${csudo}mkdir -p ${install_main_2_dir}/driver
-    ${csudo}mkdir -p ${install_main_dir}/examples || ${csudo}mkdir -p ${install_main_2_dir}/examples
-    ${csudo}mkdir -p ${install_main_dir}/include || ${csudo}mkdir -p ${install_main_2_dir}/include
-    ${csudo}mkdir -p ${install_main_dir}/share || ${csudo}mkdir -p ${install_main_2_dir}/share
-  fi
 }
 
 function install_bin() {
@@ -175,11 +160,11 @@ function install_bin() {
   ${csudo}rm -f ${bin_link_dir}/taosdemo || :
   ${csudo}rm -f ${bin_link_dir}/taosdump || :
   ${csudo}rm -f ${bin_link_dir}/taosx || :
+  ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
 
   if [ "$osType" != "Darwin" ]; then
     ${csudo}rm -f ${bin_link_dir}/perfMonitor || :
     ${csudo}rm -f ${bin_link_dir}/set_core || :
-    ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
 
     ${csudo}cp -r ${binary_dir}/build/bin/${clientName} ${install_main_dir}/bin || :
     [ -f ${binary_dir}/build/bin/taosBenchmark ] && ${csudo}cp -r ${binary_dir}/build/bin/taosBenchmark ${install_main_dir}/bin || :
@@ -209,18 +194,26 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   else
 
-    ${csudo}cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin || ${csudo}cp -r ${binary_dir}/build/bin/* ${install_main_2_dir}/bin || :
-    ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb ${install_main_dir}/bin || ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb ${install_main_2_dir} || :
-    ${csudo}cp -r ${script_dir}/remove_client.sh ${install_main_dir}/bin || ${csudo}cp -r ${script_dir}/remove_client.sh ${install_main_2_dir}/bin || :
-    ${csudo}chmod 0555 ${install_main_dir}/bin/* || ${csudo}chmod 0555 ${install_main_2_dir}/bin/*
+    ${csudo}cp -r ${binary_dir}/build/bin/${clientName} ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/taosBenchmark ] && ${csudo}cp -r ${binary_dir}/build/bin/taosBenchmark ${install_main_dir}/bin || :
+    [ -f ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -sf ${install_main_dir}/bin/taosBenchmark ${install_main_dir}/bin/taosdemo || :
+    [ -f ${binary_dir}/build/bin/taosdump ] && ${csudo}cp -r ${binary_dir}/build/bin/taosdump ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/taosadapter ] && ${csudo}cp -r ${binary_dir}/build/bin/taosadapter ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/udfd ] && ${csudo}cp -r ${binary_dir}/build/bin/udfd ${install_main_dir}/bin || :
+    [ -f ${binary_dir}/build/bin/taosx ] && ${csudo}cp -r ${binary_dir}/build/bin/taosx ${install_main_dir}/bin || :
+    ${csudo}cp -r ${binary_dir}/build/bin/${serverName} ${install_main_dir}/bin || :
+
+    ${csudo}cp -r ${script_dir}/remove.sh ${install_main_dir}/bin || :
+    ${csudo}chmod 0555 ${install_main_dir}/bin/*
     #Make link
-    [ -x ${install_main_dir}/bin/${clientName} ] || [ -x ${install_main_2_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || ${csudo}ln -s ${install_main_2_dir}/bin/${clientName} || :
-    [ -x ${install_main_dir}/bin/${serverName} ] || [ -x ${install_main_2_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || ${csudo}ln -s ${install_main_2_dir}/bin/${serverName} || :
-    [ -x ${install_main_dir}/bin/taosadapter ] || [ -x ${install_main_2_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || ${csudo}ln -s ${install_main_2_dir}/bin/taosadapter || :
-    [ -x ${install_main_dir}/bin/udfd ] || [ -x ${install_main_2_dir}/bin/udfd ] && ${csudo}ln -s ${install_main_dir}/bin/udfd ${bin_link_dir}/udfd || ${csudo}ln -s ${install_main_2_dir}/bin/udfd || :
-    [ -x ${install_main_dir}/bin/taosdump ] || [ -x ${install_main_2_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || ln -s ${install_main_2_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
-    [ -x ${install_main_dir}/bin/taosdemo ] || [ -x ${install_main_2_dir}/bin/taosdemo ] && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || ln -s ${install_main_2_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
-    [ -x ${install_main_dir}/bin/taosx ] || [ -x ${install_main_2_dir}/bin/taosx ] && ${csudo}ln -s ${install_main_dir}/bin/taosx ${bin_link_dir}/taosx || ln -s ${install_main_2_dir}/bin/taosx ${bin_link_dir}/taosx || :
+    [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || :
+    [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
+    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
+    [ -x ${install_main_dir}/bin/udfd ] && ${csudo}ln -s ${install_main_dir}/bin/udfd ${bin_link_dir}/udfd || :
+    [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+    [ -f ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -sf ${install_main_dir}/bin/taosBenchmark ${install_main_dir}/bin/taosdemo || :
+    [ -x ${install_main_dir}/bin/taosx ] && ${csudo}ln -s ${install_main_dir}/bin/taosx ${bin_link_dir}/taosx || :
+    [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   fi
 }
 
@@ -331,28 +324,20 @@ function install_lib() {
     fi
   else
     ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
-      ${install_main_dir}/driver ||
-      ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
-        ${install_main_2_dir}/driver &&
-      ${csudo}chmod 777 ${install_main_dir}/driver/* ||
-      ${csudo}chmod 777 ${install_main_2_dir}/driver/*
-
-    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* \
-      ${install_main_dir}/driver/libtaos.1.dylib ||
-      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.* \
-        ${install_main_2_dir}/driver/libtaos.1.dylib || :
-
-    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.1.dylib \
-      ${install_main_dir}/driver/libtaos.dylib ||
-      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.1.dylib \
-        ${install_main_2_dir}/driver/libtaos.dylib || :
+      ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     ${csudo}ln -sf ${install_main_dir}/driver/libtaos.${verNumber}.dylib \
-      ${lib_link_dir}/libtaos.1.dylib ||
-      ${csudo}ln -sf ${install_main_2_dir}/driver/libtaos.${verNumber}.dylib \
       ${lib_link_dir}/libtaos.1.dylib || :
 
     ${csudo}ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib || :
+
+    if [ -f ${binary_dir}/build/lib/libtaosws.dylib ]; then
+        ${csudo}cp ${binary_dir}/build/lib/libtaosws.dylib \
+            ${install_main_dir}/driver &&
+            ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.dylib ||:
+
+        ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.dylib ${lib_link_dir}/libtaosws.dylib || :
+    fi
   fi
 
   install_jemalloc
@@ -365,8 +350,6 @@ function install_lib() {
 }
 
 function install_header() {
-
-  if [ "$osType" != "Darwin" ]; then
   ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
   [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h ||:
   ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
@@ -382,20 +365,15 @@ function install_header() {
   ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
   ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h
 
-  else
-    ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
-      ${install_main_dir}/include ||
-      ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
-        ${install_main_2_dir}/include &&
-      ${csudo}chmod 644 ${install_main_dir}/include/* || ${csudo}chmod 644 ${install_main_2_dir}/include/*
-  fi
+  ${csudo}chmod 644 ${install_main_dir}/include/*
 }
 
 function install_config() {
   if [ ! -f ${cfg_install_dir}/${configFile} ]; then
     ${csudo}mkdir -p ${cfg_install_dir}
     [ -f ${script_dir}/../cfg/${configFile} ] &&
-      ${csudo}cp ${script_dir}/../cfg/${configFile} ${cfg_install_dir}
+      ${csudo}cp ${script_dir}/../cfg/${configFile} ${cfg_install_dir} &&
+      ${csudo}cp ${script_dir}/../cfg/${configFile} ${cfg_dir}
     ${csudo}chmod 644 ${cfg_install_dir}/${configFile}
     ${csudo}cp -f ${script_dir}/../cfg/${configFile} \
       ${cfg_install_dir}/${configFile}.${verNumber}
@@ -404,6 +382,7 @@ function install_config() {
   else
     ${csudo}cp -f ${script_dir}/../cfg/${configFile} \
       ${cfg_install_dir}/${configFile}.${verNumber}
+    ${csudo}cp -f ${script_dir}/../cfg/${configFile} ${cfg_dir}
   fi
 }
 
@@ -411,7 +390,8 @@ function install_taosadapter_config() {
   if [ ! -f "${cfg_install_dir}/taosadapter.toml" ]; then
     ${csudo}mkdir -p ${cfg_install_dir} || :
     [ -f ${binary_dir}/test/cfg/taosadapter.toml ] &&
-      ${csudo}cp ${binary_dir}/test/cfg/taosadapter.toml ${cfg_install_dir} || :
+      ${csudo}cp ${binary_dir}/test/cfg/taosadapter.toml ${cfg_install_dir} &&
+      ${csudo}cp ${binary_dir}/test/cfg/taosadapter.toml ${cfg_dir} || :
     [ -f ${cfg_install_dir}/taosadapter.toml ] &&
       ${csudo}chmod 644 ${cfg_install_dir}/taosadapter.toml || :
     [ -f ${binary_dir}/test/cfg/taosadapter.toml ] &&
@@ -424,6 +404,7 @@ function install_taosadapter_config() {
     if [ -f "${binary_dir}/test/cfg/taosadapter.toml" ]; then
       ${csudo}cp -f ${binary_dir}/test/cfg/taosadapter.toml \
         ${cfg_install_dir}/taosadapter.toml.${verNumber} || :
+      ${csudo}cp -f ${binary_dir}/test/cfg/taosadapter.toml ${cfg_dir} || :
     fi
   fi
 }
@@ -431,20 +412,12 @@ function install_taosadapter_config() {
 function install_log() {
   ${csudo}rm -rf ${log_dir} || :
   ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
-  if [ "$osType" != "Darwin" ]; then
   ${csudo}ln -s ${log_dir} ${install_main_dir}/log
-  else
-    ${csudo}ln -s ${log_dir} ${install_main_dir}/log || ${csudo}ln -s ${log_dir} ${install_main_2_dir}/log
-  fi
 }
 
 function install_data() {
-  ${csudo}mkdir -p ${data_dir}
-  if [ "$osType" != "Darwin" ]; then
+  ${csudo}mkdir -p ${data_dir} && ${csudo}chmod 777 ${data_dir}
   ${csudo}ln -s ${data_dir} ${install_main_dir}/data
-  else
-    ${csudo}ln -s ${data_dir} ${install_main_dir}/data || ${csudo}ln -s ${data_dir} ${install_main_2_dir}/data
-  fi
 }
 
 function install_connector() {
@@ -453,31 +426,17 @@ function install_connector() {
   else
     echo "WARNING: go connector not found, please check if want to use it!"
   fi
-  if [ "$osType" != "Darwin" ]; then
   ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || :
   ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_dir}/connector/*.jar || echo &>/dev/null || :
-  else
-    ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || ${csudo}cp -rf ${source_dir}/src/connector/python ${install_main_2_dir}/connector || :
-    ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_dir}/connector/*.jar || echo &>/dev/null || :
-    ${csudo}cp ${binary_dir}/build/lib/*.jar ${install_main_2_dir}/connector &>/dev/null && ${csudo}chmod 777 ${install_main_2_dir}/connector/*.jar || echo &>/dev/null || :
-  fi
 }
 
 function install_examples() {
-  if [ "$osType" != "Darwin" ]; then
   ${csudo}cp -rf ${source_dir}/examples/* ${install_main_dir}/examples || :
-  else
-    ${csudo}cp -rf ${source_dir}/examples/* ${install_main_dir}/examples || ${csudo}cp -rf ${source_dir}/examples/* ${install_main_2_dir}/examples || :
-  fi
 }
 
 function install_web() {
   if [ -d "${binary_dir}/build/share" ]; then
-    if [ "$osType" != "Darwin" ]; then
     ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || :
-    else
-      ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_2_dir}/share || :
-    fi
   fi
 }
 
@@ -575,7 +534,14 @@ function install_taosadapter_service() {
   fi
 }
 
+function install_service_on_launchctl() {
+  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+  ${csudo}cp ${script_dir}/com.taosdata.taosd.plist /Library/LaunchDaemons/com.taosdata.taosd.plist
+  ${csudouser}launchctl load -w /Library/LaunchDaemons/com.taosdata.taosd.plist || :
+}
+
 function install_service() {
+  if [ "$osType" != "Darwin" ]; then
     if ((${service_mod} == 0)); then
       install_service_on_systemd
     elif ((${service_mod} == 1)); then
@@ -583,6 +549,22 @@ function install_service() {
     else
       kill_taosd
     fi
+  else
+    install_service_on_launchctl
+  fi
+}
+function install_app() {
+  if [ "$osType" = "Darwin" ]; then
+    ${csudo}rm -rf /Applications/TDengine.app &&
+      ${csudo}mkdir -p /Applications/TDengine.app/Contents/MacOS/ &&
+      ${csudo}cp ${script_dir}/TDengine /Applications/TDengine.app/Contents/MacOS/ &&
+      echo "<plist><dict></dict></plist>" | ${csudo}tee /Applications/TDengine.app/Contents/Info.plist > /dev/null &&
+      ${csudo}sips -i ${script_dir}/logo.png > /dev/null && 
+      DeRez -only icns ${script_dir}/logo.png | ${csudo}tee /Applications/TDengine.app/mac_logo.rsrc > /dev/null &&
+      ${csudo}rez -append /Applications/TDengine.app/mac_logo.rsrc -o $'/Applications/TDengine.app/Icon\r' &&
+      ${csudo}SetFile -a C /Applications/TDengine.app/ &&
+      ${csudo}rm /Applications/TDengine.app/mac_logo.rsrc
+  fi
 }
 
 function update_TDengine() {
@@ -610,6 +592,7 @@ function update_TDengine() {
   install_examples
   install_web
   install_bin
+  install_app
 
   install_service
   install_taosadapter_service
@@ -633,7 +616,11 @@ function update_TDengine() {
     [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
       echo -e "${GREEN_DARK}To start Taos Adapter ${NC}: ${csudo}service taosadapter start${NC}"
   else
+    if [ "$osType" != "Darwin" ]; then
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${serverName}${NC}"
+    else
+      echo -e "${GREEN_DARK}To start service      ${NC}: launchctl start ${serverName}${NC}"
+    fi
     [ -f ${installDir}/bin/taosadapter ] && \
       echo -e "${GREEN_DARK}To start Taos Adapter ${NC}: taosadapter &${NC}"
   fi
@@ -656,6 +643,7 @@ function install_TDengine() {
   #  install_connector
   install_examples
   install_bin
+  install_app
 
   install_service
   install_taosadapter_service
@@ -679,7 +667,11 @@ function install_TDengine() {
     [ -f ${service_config_dir}/taosadapter.service ] && [ -f ${installDir}/bin/taosadapter ] && \
       echo -e "${GREEN_DARK}To start Taos Adapter ${NC}: ${csudo}service taosadapter start${NC}"
   else
-    echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ./${serverName}${NC}"
+    if [ "$osType" != "Darwin" ]; then
+      echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${serverName}${NC}"
+    else
+      echo -e "${GREEN_DARK}To start service      ${NC}: launchctl start ${serverName}${NC}"
+    fi
     [ -f ${installDir}/bin/taosadapter ] && \
       echo -e "${GREEN_DARK}To start Taos Adapter ${NC}: taosadapter &${NC}"
   fi
@@ -694,14 +686,8 @@ echo source directory: $1
 echo binary directory: $2
 if [ -x ${data_dir}/dnode/dnodeCfg.json ]; then
   echo -e "\033[44;31;5mThe default data directory ${data_dir} contains old data of tdengine 2.x, please clear it before installing!\033[0m"
-elif [ "$osType" != "Darwin" ]; then
-  if [ -x ${bin_dir}/${clientName} ]; then
-    update_TDengine
-  else
-    install_TDengine
-  fi
 else
-  if [ -x ${bin_dir}/${clientName} ] || [ -x ${bin_2_dir}/${clientName} ]; then
+  if [ -x ${bin_dir}/${clientName} ]; then
     update_TDengine
   else
     install_TDengine

packaging/tools/post.sh

@@ -7,27 +7,52 @@
 iplist=""
 serverFqdn=""
 
-# -----------------------Variables definition---------------------
-script_dir=$(dirname $(readlink -f "$0"))
+osType=`uname`
+
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
-data_link_dir="/usr/local/taos/data"
-log_link_dir="/usr/local/taos/log"
-install_main_dir="/usr/local/taos"
+cfg_install_dir="/etc/taos"
 
-# static directory
-cfg_dir="/usr/local/taos/cfg"
-bin_dir="/usr/local/taos/bin"
-lib_dir="/usr/local/taos/driver"
-init_d_dir="/usr/local/taos/init.d"
-inc_dir="/usr/local/taos/include"
+if [ "$osType" != "Darwin" ]; then
+  script_dir=$(dirname $(readlink -f "$0"))
+  verNumber=""
+  lib_file_ext="so"
 
-cfg_install_dir="/etc/taos"
-bin_link_dir="/usr/bin"
-lib_link_dir="/usr/lib"
-lib64_link_dir="/usr/lib64"
-inc_link_dir="/usr/include"
+  bin_link_dir="/usr/bin"
+  lib_link_dir="/usr/lib"
+  lib64_link_dir="/usr/lib64"
+  inc_link_dir="/usr/include"
+  
+  install_main_dir="/usr/local/taos"
+else
+  script_dir=${source_dir}/packaging/tools
+  verNumber=`ls tdengine/driver | grep -E "libtaos\.[0-9]\.[0-9]" | sed "s/libtaos.//g" |  sed "s/.dylib//g" | head -n 1`
+  lib_file_ext="dylib"
+
+  bin_link_dir="/usr/local/bin"
+  lib_link_dir="/usr/local/lib"
+  lib64_link_dir="/usr/local/lib"
+  inc_link_dir="/usr/local/include"
+
+  if [ -d "/usr/local/Cellar/" ];then
+    install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
+  elif [ -d "/opt/homebrew/Cellar/" ];then
+    install_main_dir="/opt/homebrew/Cellar/tdengine/${verNumber}"
+  else
+    install_main_dir="/usr/local/taos"
+  fi
+fi
+
+data_link_dir="${install_main_dir}/data"
+log_link_dir="${install_main_dir}/log"
+
+# static directory
+cfg_dir="${install_main_dir}/cfg"
+bin_dir="${install_main_dir}/bin"
+lib_dir="${install_main_dir}/driver"
+init_d_dir="${install_main_dir}/init.d"
+inc_dir="${install_main_dir}/include"
 
 service_config_dir="/etc/systemd/system"
 
@@ -40,8 +65,10 @@ GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
 csudo=""
+csudouser=""
 if command -v sudo > /dev/null; then
     csudo="sudo "
+    csudouser="sudo -u ${USER} "
 fi
 
 initd_mod=0
@@ -63,6 +90,14 @@ elif $(which service &> /dev/null); then
 else
     service_mod=2
 fi
+if [ "$osType" = "Darwin" ]; then
+  if [ -d "${install_main_dir}" ];then
+    ${csudo}rm -rf ${install_main_dir}
+  fi
+  ${csudo}mkdir -p ${install_main_dir}
+  ${csudo}rm -rf ${install_main_dir}
+  ${csudo}cp -rf tdengine ${install_main_dir}
+fi
 
 function kill_taosadapter() {
 #  ${csudo}pkill -f taosadapter || :
@@ -96,22 +131,24 @@ function install_lib() {
     ${csudo}rm -f ${lib_link_dir}/libtaos* || :
     ${csudo}rm -f ${lib64_link_dir}/libtaos* || :
 
-    [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so || :
-    [ -f ${lib64_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.so || :
+    [ -f ${lib_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.${lib_file_ext} || :
+    [ -f ${lib64_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.${lib_file_ext} || :
 
     ${csudo}ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1
     ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
 
-    [ -f ${lib_dir}/libtaosws.so ] && ${csudo}ln -sf ${lib_dir}/libtaosws.so ${lib_link_dir}/libtaosws.so ||:
+    [ -f ${lib_dir}/libtaosws.${lib_file_ext} ] && ${csudo}ln -sf ${lib_dir}/libtaosws.${lib_file_ext} ${lib_link_dir}/libtaosws.${lib_file_ext} ||:
 
     if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
       ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
       ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
 
-      [ -f ${lib_dir}/libtaosws.so ] && ${csudo}ln -sf ${lib_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so           || :
+      [ -f ${lib_dir}/libtaosws.${lib_file_ext} ] && ${csudo}ln -sf ${lib_dir}/libtaosws.${lib_file_ext} ${lib64_link_dir}/libtaosws.${lib_file_ext} || :
     fi
 
+    if [ "$osType" != "Darwin" ]; then
       ${csudo}ldconfig
+    fi
 }
 
 function install_bin() {
@@ -138,6 +175,7 @@ function install_bin() {
     [ -x ${bin_dir}/TDinsight.sh ] && ${csudo}ln -sf ${bin_dir}/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
     [ -x ${bin_dir}/taosdump ] && ${csudo}ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
     [ -x ${bin_dir}/set_core.sh ] && ${csudo}ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
+    [ -x ${bin_dir}/remove.sh ] && ${csudo}ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || :
 }
 
 function add_newHostname_to_hosts() {
@@ -466,6 +504,14 @@ function install_service_on_systemd() {
     ${csudo}systemctl enable taosd
 }
 
+function install_service_on_launchctl() {
+  if [ -f ${install_main_dir}/service/com.taosdata.taosd.plist ]; then
+    ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+    ${csudo}cp ${install_main_dir}/service/com.taosdata.taosd.plist /Library/LaunchDaemons/com.taosdata.taosd.plist || :
+    ${csudouser}launchctl load -w /Library/LaunchDaemons/com.taosdata.taosd.plist || :
+  fi
+}
+
 function install_taosadapter_service() {
     if ((${service_mod}==0)); then
         [ -f ${script_dir}/../cfg/taosadapter.service ] &&\
@@ -476,6 +522,7 @@ function install_taosadapter_service() {
 }
 
 function install_service() {
+  if [ "$osType" != "Darwin" ]; then
     if ((${service_mod}==0)); then
         install_service_on_systemd
     elif ((${service_mod}==1)); then
@@ -485,6 +532,25 @@ function install_service() {
         kill_taosadapter
         kill_taosd
     fi
+  else
+    install_service_on_launchctl
+  fi
+}
+
+function install_app() {
+  if [ "$osType" = "Darwin" ]; then
+    if [ -f ${install_main_dir}/service/TDengine ]; then
+      ${csudo}rm -rf /Applications/TDengine.app &&
+        ${csudo}mkdir -p /Applications/TDengine.app/Contents/MacOS/ &&
+        ${csudo}cp ${install_main_dir}/service/TDengine /Applications/TDengine.app/Contents/MacOS/ &&
+        echo "<plist><dict></dict></plist>" | ${csudo}tee /Applications/TDengine.app/Contents/Info.plist > /dev/null &&
+        ${csudo}sips -i ${install_main_dir}/service/logo.png > /dev/null && 
+        DeRez -only icns ${install_main_dir}/service/logo.png | ${csudo}tee /Applications/TDengine.app/mac_logo.rsrc > /dev/null &&
+        ${csudo}rez -append /Applications/TDengine.app/mac_logo.rsrc -o $'/Applications/TDengine.app/Icon\r' &&
+        ${csudo}SetFile -a C /Applications/TDengine.app/ &&
+        ${csudo}rm /Applications/TDengine.app/mac_logo.rsrc
+    fi
+  fi
 }
 
 function install_TDengine() {
@@ -492,7 +558,7 @@ function install_TDengine() {
 
     #install log and data dir , then ln to /usr/local/taos
     ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
-    ${csudo}mkdir -p ${data_dir}
+    ${csudo}mkdir -p ${data_dir} && ${csudo}chmod 777 ${data_dir}
 
     ${csudo}rm -rf ${log_link_dir}   || :
     ${csudo}rm -rf ${data_link_dir}  || :
@@ -508,6 +574,7 @@ function install_TDengine() {
     install_taosadapter_config
     install_taosadapter_service
     install_service
+    install_app
 
     # Ask if to start the service
     #echo

packaging/tools/remove.sh

@@ -6,12 +6,31 @@ set -e
 #set -x
 
 verMode=edge
+osType=`uname`
 
 RED='\033[0;31m'
 GREEN='\033[1;32m'
 NC='\033[0m'
 
-installDir="/usr/local/taos"
+if [ "$osType" != "Darwin" ]; then
+  installDir="/usr/local/taos"
+  bin_link_dir="/usr/bin"
+  lib_link_dir="/usr/lib"
+  lib64_link_dir="/usr/lib64"
+  inc_link_dir="/usr/include"
+else
+  if [ -d "/usr/local/Cellar/" ];then
+    installDir="/usr/local/Cellar/tdengine/${verNumber}"
+  elif [ -d "/opt/homebrew/Cellar/" ];then
+    installDir="/opt/homebrew/Cellar/tdengine/${verNumber}"
+  else
+    installDir="/usr/local/taos"
+  fi
+  bin_link_dir="/usr/local/bin"
+  lib_link_dir="/usr/local/lib"
+  lib64_link_dir="/usr/local/lib"
+  inc_link_dir="/usr/local/include"
+fi
 serverName="taosd"
 clientName="taos"
 uninstallScript="rmtaos"
@@ -22,11 +41,8 @@ install_main_dir=${installDir}
 data_link_dir=${installDir}/data
 log_link_dir=${installDir}/log
 cfg_link_dir=${installDir}/cfg
-bin_link_dir="/usr/bin"
 local_bin_link_dir="/usr/local/bin"
-lib_link_dir="/usr/lib"
-lib64_link_dir="/usr/lib64"
-inc_link_dir="/usr/include"
+
 
 service_config_dir="/etc/systemd/system"
 taos_service_name=${serverName}
@@ -82,6 +98,7 @@ function clean_bin() {
   # Remove link
   ${csudo}rm -f ${bin_link_dir}/${clientName} || :
   ${csudo}rm -f ${bin_link_dir}/${serverName} || :
+  ${csudo}rm -f ${bin_link_dir}/udfd || :
   ${csudo}rm -f ${bin_link_dir}/taosadapter || :
   ${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
   ${csudo}rm -f ${bin_link_dir}/taosdemo || :
@@ -103,7 +120,7 @@ function clean_lib() {
   [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so || :
 
   ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
-  [ -f ${lib64_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.so || :
+  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
   #${csudo}rm -rf ${v15_java_app_dir}           || :
 }
 
@@ -195,12 +212,20 @@ function clean_service_on_sysvinit() {
   fi
 }
 
+function clean_service_on_launchctl() {
+  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+  ${csudo}rm /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+}
+
 function clean_service() {
   if ((${service_mod} == 0)); then
     clean_service_on_systemd
   elif ((${service_mod} == 1)); then
     clean_service_on_sysvinit
   else
+    if [ "$osType" = "Darwin" ]; then
+      clean_service_on_launchctl
+    fi
     kill_taosadapter
     kill_taosd
     kill_tarbitrator
@@ -241,6 +266,9 @@ elif echo $osinfo | grep -qwi "centos"; then
   #  echo "this is centos system"
   ${csudo}rpm -e --noscripts tdengine >/dev/null 2>&1 || :
 fi
+if [ "$osType" = "Darwin" ]; then
+  ${csudo}rm -rf /Applications/TDengine.app
+fi
 
 echo -e "${GREEN}${productName} is removed successfully!${NC}"
 echo

source/common/src/tdataformat.c

@@ -20,6 +20,30 @@
 #include "tdatablock.h"
 #include "tlog.h"
 
+// SBuffer ================================
+void tBufferDestroy(SBuffer *pBuffer) {
+  tFree(pBuffer->pBuf);
+  pBuffer->pBuf = NULL;
+}
+
+int32_t tBufferInit(SBuffer *pBuffer, int64_t size) {
+  pBuffer->nBuf = 0;
+  return tRealloc(&pBuffer->pBuf, size);
+}
+
+int32_t tBufferPut(SBuffer *pBuffer, const void *pData, int64_t nData) {
+  int32_t code = 0;
+
+  code = tRealloc(&pBuffer->pBuf, pBuffer->nBuf + nData);
+  if (code) return code;
+
+  memcpy(pBuffer->pBuf + pBuffer->nBuf, pData, nData);
+  pBuffer->nBuf += nData;
+
+  return code;
+}
+
+// ================================
 static int32_t tGetTagVal(uint8_t *p, STagVal *pTagVal, int8_t isJson);
 
 #pragma pack(push, 1)
@@ -33,105 +57,21 @@ typedef struct {
 
 // SValue
 int32_t tPutValue(uint8_t *p, SValue *pValue, int8_t type) {
-  int32_t n = 0;
-
   if (IS_VAR_DATA_TYPE(type)) {
-    n += tPutBinary(p ? p + n : p, pValue->pData, pValue->nData);
+    return tPutBinary(p, pValue->pData, pValue->nData);
   } else {
-    switch (type) {
-      case TSDB_DATA_TYPE_BOOL:
-        n += tPutI8(p ? p + n : p, pValue->i8 ? 1 : 0);
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-        n += tPutI8(p ? p + n : p, pValue->i8);
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        n += tPutI16(p ? p + n : p, pValue->i16);
-        break;
-      case TSDB_DATA_TYPE_INT:
-        n += tPutI32(p ? p + n : p, pValue->i32);
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-        n += tPutI64(p ? p + n : p, pValue->i64);
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        n += tPutFloat(p ? p + n : p, pValue->f);
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        n += tPutDouble(p ? p + n : p, pValue->d);
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-        n += tPutI64(p ? p + n : p, pValue->ts);
-        break;
-      case TSDB_DATA_TYPE_UTINYINT:
-        n += tPutU8(p ? p + n : p, pValue->u8);
-        break;
-      case TSDB_DATA_TYPE_USMALLINT:
-        n += tPutU16(p ? p + n : p, pValue->u16);
-        break;
-      case TSDB_DATA_TYPE_UINT:
-        n += tPutU32(p ? p + n : p, pValue->u32);
-        break;
-      case TSDB_DATA_TYPE_UBIGINT:
-        n += tPutU64(p ? p + n : p, pValue->u64);
-        break;
-      default:
-        ASSERT(0);
-    }
+    if (p) memcpy(p, &pValue->val, tDataTypes[type].bytes);
+    return tDataTypes[type].bytes;
   }
-
-  return n;
 }
 
 int32_t tGetValue(uint8_t *p, SValue *pValue, int8_t type) {
-  int32_t n = 0;
-
   if (IS_VAR_DATA_TYPE(type)) {
-    n += tGetBinary(p, &pValue->pData, pValue ? &pValue->nData : NULL);
+    return tGetBinary(p, &pValue->pData, pValue ? &pValue->nData : NULL);
   } else {
-    switch (type) {
-      case TSDB_DATA_TYPE_BOOL:
-        n += tGetI8(p, &pValue->i8);
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-        n += tGetI8(p, &pValue->i8);
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        n += tGetI16(p, &pValue->i16);
-        break;
-      case TSDB_DATA_TYPE_INT:
-        n += tGetI32(p, &pValue->i32);
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-        n += tGetI64(p, &pValue->i64);
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        n += tGetFloat(p, &pValue->f);
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        n += tGetDouble(p, &pValue->d);
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-        n += tGetI64(p, &pValue->ts);
-        break;
-      case TSDB_DATA_TYPE_UTINYINT:
-        n += tGetU8(p, &pValue->u8);
-        break;
-      case TSDB_DATA_TYPE_USMALLINT:
-        n += tGetU16(p, &pValue->u16);
-        break;
-      case TSDB_DATA_TYPE_UINT:
-        n += tGetU32(p, &pValue->u32);
-        break;
-      case TSDB_DATA_TYPE_UBIGINT:
-        n += tGetU64(p, &pValue->u64);
-        break;
-      default:
-        ASSERT(0);
-    }
+    memcpy(&pValue->val, p, tDataTypes[type].bytes);
+    return tDataTypes[type].bytes;
   }
-
-  return n;
 }
 
 int tValueCmprFn(const SValue *pValue1, const SValue *pValue2, int8_t type) {
@@ -1219,124 +1159,138 @@ static FORCE_INLINE int32_t tColDataPutValue(SColData *pColData, SColVal *pColVa
 _exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue0(SColData *pColData, SColVal *pColVal) {  // 0
+static FORCE_INLINE int32_t tColDataAppendValue00(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
-
-  if (COL_VAL_IS_NONE(pColVal)) {
-    pColData->flag = HAS_NONE;
-  } else if (COL_VAL_IS_NULL(pColVal)) {
-    pColData->flag = HAS_NULL;
-  } else {
   pColData->flag = HAS_VALUE;
   code = tColDataPutValue(pColData, pColVal);
-    if (code) goto _exit;
-  }
+  if (code) return code;
+  pColData->nVal++;
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue01(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+  pColData->flag = HAS_NONE;
+  pColData->nVal++;
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue02(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+  pColData->flag = HAS_NULL;
   pColData->nVal++;
-
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue1(SColData *pColData, SColVal *pColVal) {  // HAS_NONE
+static FORCE_INLINE int32_t tColDataAppendValue10(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (!COL_VAL_IS_NONE(pColVal)) {
   int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
-
   code = tRealloc(&pColData->pBitMap, nBit);
-    if (code) goto _exit;
+  if (code) return code;
 
   memset(pColData->pBitMap, 0, nBit);
   SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
 
-    if (COL_VAL_IS_NULL(pColVal)) {
-      pColData->flag |= HAS_NULL;
-    } else {
   pColData->flag |= HAS_VALUE;
 
   if (pColData->nVal) {
     if (IS_VAR_DATA_TYPE(pColData->type)) {
       int32_t nOffset = sizeof(int32_t) * pColData->nVal;
       code = tRealloc((uint8_t **)(&pColData->aOffset), nOffset);
-          if (code) goto _exit;
+      if (code) return code;
       memset(pColData->aOffset, 0, nOffset);
     } else {
       pColData->nData = tDataTypes[pColData->type].bytes * pColData->nVal;
       code = tRealloc(&pColData->pData, pColData->nData);
-          if (code) goto _exit;
+      if (code) return code;
       memset(pColData->pData, 0, pColData->nData);
     }
   }
 
   code = tColDataPutValue(pColData, pColVal);
-      if (code) goto _exit;
-    }
-  }
+  if (code) return code;
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue2(SColData *pColData, SColVal *pColVal) {  // HAS_NULL
+static FORCE_INLINE int32_t tColDataAppendValue11(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+  pColData->nVal++;
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue12(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (!COL_VAL_IS_NULL(pColVal)) {
   int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
   code = tRealloc(&pColData->pBitMap, nBit);
-    if (code) goto _exit;
+  if (code) return code;
 
-    if (COL_VAL_IS_NONE(pColVal)) {
-      pColData->flag |= HAS_NONE;
+  memset(pColData->pBitMap, 0, nBit);
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
 
-      memset(pColData->pBitMap, 255, nBit);
-      SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
-    } else {
-      pColData->flag |= HAS_VALUE;
+  pColData->flag |= HAS_NULL;
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue20(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
+  code = tRealloc(&pColData->pBitMap, nBit);
+  if (code) return code;
 
   memset(pColData->pBitMap, 0, nBit);
   SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
 
+  pColData->flag |= HAS_VALUE;
+
   if (pColData->nVal) {
     if (IS_VAR_DATA_TYPE(pColData->type)) {
       int32_t nOffset = sizeof(int32_t) * pColData->nVal;
       code = tRealloc((uint8_t **)(&pColData->aOffset), nOffset);
-          if (code) goto _exit;
+      if (code) return code;
       memset(pColData->aOffset, 0, nOffset);
     } else {
       pColData->nData = tDataTypes[pColData->type].bytes * pColData->nVal;
       code = tRealloc(&pColData->pData, pColData->nData);
-          if (code) goto _exit;
+      if (code) return code;
       memset(pColData->pData, 0, pColData->nData);
     }
   }
 
   code = tColDataPutValue(pColData, pColVal);
-      if (code) goto _exit;
-    }
-  }
+  if (code) return code;
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue3(SColData *pColData, SColVal *pColVal) {  // HAS_NULL|HAS_NONE
+static FORCE_INLINE int32_t tColDataAppendValue21(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (COL_VAL_IS_NONE(pColVal)) {
-    code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
+  int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
+  code = tRealloc(&pColData->pBitMap, nBit);
+  if (code) return code;
 
+  memset(pColData->pBitMap, 255, nBit);
   SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
-  } else if (COL_VAL_IS_NULL(pColVal)) {
-    code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
 
-    SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
-  } else {
+  pColData->flag |= HAS_NONE;
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue22(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+  pColData->nVal++;
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue30(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
   pColData->flag |= HAS_VALUE;
 
   uint8_t *pBitMap = NULL;
   code = tRealloc(&pBitMap, BIT2_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
+  if (code) return code;
 
   for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
     SET_BIT2(pBitMap, iVal, GET_BIT1(pColData->pBitMap, iVal));
@@ -1350,61 +1304,129 @@ static FORCE_INLINE int32_t tColDataAppendValue3(SColData *pColData, SColVal *pC
     if (IS_VAR_DATA_TYPE(pColData->type)) {
       int32_t nOffset = sizeof(int32_t) * pColData->nVal;
       code = tRealloc((uint8_t **)(&pColData->aOffset), nOffset);
-        if (code) goto _exit;
+      if (code) return code;
       memset(pColData->aOffset, 0, nOffset);
     } else {
       pColData->nData = tDataTypes[pColData->type].bytes * pColData->nVal;
       code = tRealloc(&pColData->pData, pColData->nData);
-        if (code) goto _exit;
+      if (code) return code;
       memset(pColData->pData, 0, pColData->nData);
     }
   }
 
   code = tColDataPutValue(pColData, pColVal);
-    if (code) goto _exit;
-  }
+  if (code) return code;
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue4(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE
+static FORCE_INLINE int32_t tColDataAppendValue31(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
+
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue32(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
+
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue40(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue41(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (!COL_VAL_IS_VALUE(pColVal)) {
-    if (COL_VAL_IS_NONE(pColVal)) {
   pColData->flag |= HAS_NONE;
-    } else {
+
+  int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
+  code = tRealloc(&pColData->pBitMap, nBit);
+  if (code) return code;
+
+  memset(pColData->pBitMap, 255, nBit);
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
+
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue42(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
   pColData->flag |= HAS_NULL;
-    }
 
   int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
   code = tRealloc(&pColData->pBitMap, nBit);
-    if (code) goto _exit;
+  if (code) return code;
 
   memset(pColData->pBitMap, 255, nBit);
   SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
 
   code = tColDataPutValue(pColData, pColVal);
-    if (code) goto _exit;
-  } else {
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue50(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
+
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
+
   code = tColDataPutValue(pColData, pColVal);
-    if (code) goto _exit;
-  }
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue51(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
+
+  SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
+
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue5(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE|HAS_NONE
+static FORCE_INLINE int32_t tColDataAppendValue52(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (COL_VAL_IS_NULL(pColVal)) {
   pColData->flag |= HAS_NULL;
 
   uint8_t *pBitMap = NULL;
   code = tRealloc(&pBitMap, BIT2_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
+  if (code) return code;
 
   for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
     SET_BIT2(pBitMap, iVal, GET_BIT1(pColData->pBitMap, iVal) ? 2 : 0);
@@ -1413,33 +1435,36 @@ static FORCE_INLINE int32_t tColDataAppendValue5(SColData *pColData, SColVal *pC
 
   tFree(pColData->pBitMap);
   pColData->pBitMap = pBitMap;
-  } else {
-    code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
 
-    if (COL_VAL_IS_NONE(pColVal)) {
-      SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
-    } else {
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue60(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
   SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
-    }
-  }
+
   code = tColDataPutValue(pColData, pColVal);
-  if (code) goto _exit;
+  if (code) return code;
 
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue6(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE|HAS_NULL
+static FORCE_INLINE int32_t tColDataAppendValue61(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
-  if (COL_VAL_IS_NONE(pColVal)) {
   pColData->flag |= HAS_NONE;
 
   uint8_t *pBitMap = NULL;
   code = tRealloc(&pBitMap, BIT2_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
+  if (code) return code;
 
   for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
     SET_BIT2(pBitMap, iVal, GET_BIT1(pColData->pBitMap, iVal) ? 2 : 1);
@@ -1448,59 +1473,83 @@ static FORCE_INLINE int32_t tColDataAppendValue6(SColData *pColData, SColVal *pC
 
   tFree(pColData->pBitMap);
   pColData->pBitMap = pBitMap;
-  } else {
-    code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
-    if (code) goto _exit;
 
-    if (COL_VAL_IS_NULL(pColVal)) {
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue62(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
+  if (code) return code;
   SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
-    } else {
-      SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
-    }
-  }
+
   code = tColDataPutValue(pColData, pColVal);
-  if (code) goto _exit;
+  if (code) return code;
 
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static FORCE_INLINE int32_t tColDataAppendValue7(SColData *pColData,
-                                                 SColVal  *pColVal) {  // HAS_VALUE|HAS_NULL|HAS_NONE
+static FORCE_INLINE int32_t tColDataAppendValue70(SColData *pColData, SColVal *pColVal) {
   int32_t code = 0;
 
   code = tRealloc(&pColData->pBitMap, BIT2_SIZE(pColData->nVal + 1));
-  if (code) goto _exit;
+  if (code) return code;
+  SET_BIT2(pColData->pBitMap, pColData->nVal, 2);
 
-  if (COL_VAL_IS_NONE(pColVal)) {
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue71(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT2_SIZE(pColData->nVal + 1));
+  if (code) return code;
   SET_BIT2(pColData->pBitMap, pColData->nVal, 0);
-  } else if (COL_VAL_IS_NULL(pColVal)) {
+
+  code = tColDataPutValue(pColData, pColVal);
+  if (code) return code;
+
+  pColData->nVal++;
+
+  return code;
+}
+static FORCE_INLINE int32_t tColDataAppendValue72(SColData *pColData, SColVal *pColVal) {
+  int32_t code = 0;
+
+  code = tRealloc(&pColData->pBitMap, BIT2_SIZE(pColData->nVal + 1));
+  if (code) return code;
   SET_BIT2(pColData->pBitMap, pColData->nVal, 1);
-  } else {
-    SET_BIT2(pColData->pBitMap, pColData->nVal, 2);
-  }
+
   code = tColDataPutValue(pColData, pColVal);
-  if (code) goto _exit;
+  if (code) return code;
 
   pColData->nVal++;
 
-_exit:
   return code;
 }
-static int32_t (*tColDataAppendValueImpl[])(SColData *pColData, SColVal *pColVal) = {
-    tColDataAppendValue0,  // 0
-    tColDataAppendValue1,  // HAS_NONE
-    tColDataAppendValue2,  // HAS_NULL
-    tColDataAppendValue3,  // HAS_NULL|HAS_NONE
-    tColDataAppendValue4,  // HAS_VALUE
-    tColDataAppendValue5,  // HAS_VALUE|HAS_NONE
-    tColDataAppendValue6,  // HAS_VALUE|HAS_NULL
-    tColDataAppendValue7   // HAS_VALUE|HAS_NULL|HAS_NONE
+static int32_t (*tColDataAppendValueImpl[8][3])(SColData *pColData, SColVal *pColVal) = {
+    {tColDataAppendValue00, tColDataAppendValue01, tColDataAppendValue02},  // 0
+    {tColDataAppendValue10, tColDataAppendValue11, tColDataAppendValue12},  // HAS_NONE
+    {tColDataAppendValue20, tColDataAppendValue21, tColDataAppendValue22},  // HAS_NULL
+    {tColDataAppendValue30, tColDataAppendValue31, tColDataAppendValue32},  // HAS_NULL|HAS_NONE
+    {tColDataAppendValue40, tColDataAppendValue41, tColDataAppendValue42},  // HAS_VALUE
+    {tColDataAppendValue50, tColDataAppendValue51, tColDataAppendValue52},  // HAS_VALUE|HAS_NONE
+    {tColDataAppendValue60, tColDataAppendValue61, tColDataAppendValue62},  // HAS_VALUE|HAS_NULL
+    {tColDataAppendValue70, tColDataAppendValue71, tColDataAppendValue72},  // HAS_VALUE|HAS_NULL|HAS_NONE
 };
 int32_t tColDataAppendValue(SColData *pColData, SColVal *pColVal) {
   ASSERT(pColData->cid == pColVal->cid && pColData->type == pColVal->type);
-  return tColDataAppendValueImpl[pColData->flag](pColData, pColVal);
+  return tColDataAppendValueImpl[pColData->flag][pColVal->flag](pColData, pColVal);
 }
 
 static FORCE_INLINE void tColDataGetValue1(SColData *pColData, int32_t iVal, SColVal *pColVal) {  // HAS_NONE

source/common/src/trow.c

@@ -689,7 +689,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
         memcpy(varDataVal(varBuf), pColVal->value.pData, pColVal->value.nData);
         val = varBuf;
       } else {
-        val = (const void *)&pColVal->value.i64;
+        val = (const void *)&pColVal->value.val;
       }
     } else {
       pColVal = NULL;

source/common/test/dataformatTest.cpp

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if 0
 #include <gtest/gtest.h>
 
 #include <taoserror.h>
@@ -477,3 +478,4 @@ TEST(testCase, NoneTest) {
   taosMemoryFree(pTSchema);
 }
 #endif
+#endif
\ No newline at end of file

source/dnode/mnode/impl/src/mndDef.c

@@ -42,9 +42,23 @@ int32_t tEncodeSStreamObj(SEncoder *pEncoder, const SStreamObj *pObj) {
   if (tEncodeI64(pEncoder, pObj->targetStbUid) < 0) return -1;
   if (tEncodeI32(pEncoder, pObj->fixedSinkVgId) < 0) return -1;
 
+  if (pObj->sql != NULL) {
     if (tEncodeCStr(pEncoder, pObj->sql) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }
+
+  if (pObj->ast != NULL) {
     if (tEncodeCStr(pEncoder, pObj->ast) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }
+
+  if (pObj->physicalPlan != NULL) {
     if (tEncodeCStr(pEncoder, pObj->physicalPlan) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }
 
   int32_t sz = taosArrayGetSize(pObj->tasks);
   if (tEncodeI32(pEncoder, sz) < 0) return -1;

source/dnode/mnode/impl/src/mndStb.c

@@ -554,7 +554,7 @@ int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate) {
 
   for (int32_t i = 0; i < pCreate->numOfColumns; ++i) {
     SField *pField1 = taosArrayGet(pCreate->pColumns, i);
-    if (pField1->type < 0) {
+    if (pField1->type >= TSDB_DATA_TYPE_MAX) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
@@ -570,7 +570,7 @@ int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate) {
 
   for (int32_t i = 0; i < pCreate->numOfTags; ++i) {
     SField *pField1 = taosArrayGet(pCreate->pTags, i);
-    if (pField1->type < 0) {
+    if (pField1->type >= TSDB_DATA_TYPE_MAX) {
       terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
       return -1;
     }
@@ -982,8 +982,8 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
           goto _OVER;
         }
       } else {
-        mError("stb:%s, already exist while create, input tagVer:%d colVer:%d is invalid", createReq.name,
-               createReq.tagVer, createReq.colVer, pStb->tagVer, pStb->colVer);
+        mError("stb:%s, already exist while create, input tagVer:%d colVer:%d is invalid, origin tagVer:%d colVer:%d",
+               createReq.name, createReq.tagVer, createReq.colVer, pStb->tagVer, pStb->colVer);
         terrno = TSDB_CODE_MND_INVALID_SCHEMA_VER;
         goto _OVER;
       }
@@ -1603,9 +1603,9 @@ static int32_t mndBuildStbSchemaImp(SDbObj *pDb, SStbObj *pStb, const char *tbNa
     return -1;
   }
 
-  strcpy(pRsp->dbFName, pStb->db);
-  strcpy(pRsp->tbName, tbName);
-  strcpy(pRsp->stbName, tbName);
+  tstrncpy(pRsp->dbFName, pStb->db, sizeof(pRsp->dbFName));
+  tstrncpy(pRsp->tbName, tbName, sizeof(pRsp->tbName));
+  tstrncpy(pRsp->stbName, tbName, sizeof(pRsp->stbName));
   pRsp->dbId = pDb->uid;
   pRsp->numOfTags = pStb->numOfTags;
   pRsp->numOfColumns = pStb->numOfColumns;
@@ -1649,9 +1649,9 @@ static int32_t mndBuildStbCfgImp(SDbObj *pDb, SStbObj *pStb, const char *tbName,
     return -1;
   }
 
-  strcpy(pRsp->dbFName, pStb->db);
-  strcpy(pRsp->tbName, tbName);
-  strcpy(pRsp->stbName, tbName);
+  tstrncpy(pRsp->dbFName, pStb->db, sizeof(pRsp->dbFName));
+  tstrncpy(pRsp->tbName, tbName, sizeof(pRsp->tbName));
+  tstrncpy(pRsp->stbName, tbName, sizeof(pRsp->stbName));
   pRsp->numOfTags = pStb->numOfTags;
   pRsp->numOfColumns = pStb->numOfColumns;
   pRsp->tableType = TSDB_SUPER_TABLE;
@@ -2551,7 +2551,7 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)maxDelay, false);
 
-    char    rollup[128 + VARSTR_HEADER_SIZE] = {0};
+    char    rollup[160 + VARSTR_HEADER_SIZE] = {0};
     int32_t rollupNum = (int32_t)taosArrayGetSize(pStb->pFuncs);
     for (int32_t i = 0; i < rollupNum; ++i) {
       char *funcName = taosArrayGet(pStb->pFuncs, i);

source/dnode/mnode/impl/src/mndStream.c

@@ -425,8 +425,10 @@ static int32_t mndSetStreamRecover(SMnode *pMnode, STrans *pTrans, const SStream
   SStreamObj streamObj = {0};
   memcpy(streamObj.name, pStream->name, TSDB_STREAM_FNAME_LEN);
   streamObj.status = STREAM_STATUS__RECOVER;
+
   SSdbRaw *pCommitRaw = mndStreamActionEncode(&streamObj);
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
+  if (pCommitRaw == NULL) return -1;
+  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
     mError("stream trans:%d, failed to append commit log since %s", pTrans->id, terrstr());
     mndTransDrop(pTrans);
     return -1;
@@ -771,12 +773,14 @@ static int32_t mndProcessDropStreamReq(SRpcMsg *pReq) {
   if (mndDropStreamTasks(pMnode, pTrans, pStream) < 0) {
     mError("stream:%s, failed to drop task since %s", dropReq.name, terrstr());
     sdbRelease(pMnode->pSdb, pStream);
+    mndTransDrop(pTrans);
     return -1;
   }
 
   // drop stream
   if (mndPersistDropStreamLog(pMnode, pTrans, pStream) < 0) {
     sdbRelease(pMnode->pSdb, pStream);
+    mndTransDrop(pTrans);
     return -1;
   }
 
@@ -945,10 +949,8 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     SName            n;
     int32_t          cols = 0;
 
-    char streamName[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->name, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(streamName));
-    varDataSetLen(streamName, strlen(varDataVal(streamName)));
+    char streamName[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(streamName, mndGetDbStr(pStream->name), sizeof(streamName));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)streamName, false);
 
@@ -956,28 +958,24 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     colDataAppend(pColInfo, numOfRows, (const char *)&pStream->createTime, false);
 
     char sql[TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE] = {0};
-    tstrncpy(&sql[VARSTR_HEADER_SIZE], pStream->sql, TSDB_SHOW_SQL_LEN);
-    varDataSetLen(sql, strlen(&sql[VARSTR_HEADER_SIZE]));
+    STR_WITH_MAXSIZE_TO_VARSTR(sql, pStream->sql, sizeof(sql));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)sql, false);
 
     char status[20 + VARSTR_HEADER_SIZE] = {0};
-    mndShowStreamStatus(&status[VARSTR_HEADER_SIZE], pStream);
-    varDataSetLen(status, strlen(varDataVal(status)));
+    char status2[20] = {0};
+    mndShowStreamStatus(status2, pStream);
+    STR_WITH_MAXSIZE_TO_VARSTR(status, status2, sizeof(status));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)&status, false);
 
     char sourceDB[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->sourceDb, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(sourceDB));
-    varDataSetLen(sourceDB, strlen(varDataVal(sourceDB)));
+    STR_WITH_MAXSIZE_TO_VARSTR(sourceDB, mndGetDbStr(pStream->sourceDb), sizeof(sourceDB));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)&sourceDB, false);
 
     char targetDB[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->targetDb, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(targetDB));
-    varDataSetLen(targetDB, strlen(varDataVal(targetDB)));
+    STR_WITH_MAXSIZE_TO_VARSTR(targetDB, mndGetDbStr(pStream->targetDb), sizeof(targetDB));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)&targetDB, false);
 
@@ -986,9 +984,7 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
       colDataAppend(pColInfo, numOfRows, NULL, true);
     } else {
       char targetSTB[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-      tNameFromString(&n, pStream->targetSTbName, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
-      strcpy(&targetSTB[VARSTR_HEADER_SIZE], tNameGetTableName(&n));
-      varDataSetLen(targetSTB, strlen(varDataVal(targetSTB)));
+      STR_WITH_MAXSIZE_TO_VARSTR(targetSTB, mndGetStbStr(pStream->targetSTbName), sizeof(targetSTB));
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
       colDataAppend(pColInfo, numOfRows, (const char *)&targetSTB, false);
     }
@@ -997,8 +993,9 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     colDataAppend(pColInfo, numOfRows, (const char *)&pStream->watermark, false);
 
     char trigger[20 + VARSTR_HEADER_SIZE] = {0};
-    mndShowStreamTrigger(&trigger[VARSTR_HEADER_SIZE], pStream);
-    varDataSetLen(trigger, strlen(varDataVal(trigger)));
+    char trigger2[20] = {0};
+    mndShowStreamTrigger(trigger2, pStream);
+    STR_WITH_MAXSIZE_TO_VARSTR(trigger, trigger2, sizeof(trigger));
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)&trigger, false);
 

source/dnode/vnode/inc/vnode.h

@@ -96,7 +96,7 @@ void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
 int         metaGetTableEntryByName(SMetaReader *pReader, const char *name);
 int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags);
-int32_t     metaGetTableTagsOpt(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags);
+int32_t     metaGetTableTagsByUids(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags);
 int32_t     metaReadNext(SMetaReader *pReader);
 const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
@@ -159,7 +159,7 @@ uint64_t getReaderMaxVersion(STsdbReader *pReader);
 
 int32_t tsdbCacherowsReaderOpen(void *pVnode, int32_t type, SArray *pTableIdList, int32_t numOfCols, void **pReader);
 int32_t tsdbRetrieveCacheRows(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, SArray *pTableUids);
-void*   tsdbCacherowsReaderClose(void *pReader);
+void   *tsdbCacherowsReaderClose(void *pReader);
 int32_t tsdbGetTableSchema(SVnode *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);
 
 void   tsdbCacheSetCapacity(SVnode *pVnode, size_t capacity);

source/dnode/vnode/src/inc/tsdb.h

@@ -71,6 +71,10 @@ typedef struct SSmaInfo      SSmaInfo;
 typedef struct SBlockCol        SBlockCol;
 typedef struct SVersionRange    SVersionRange;
 typedef struct SLDataIter       SLDataIter;
+typedef struct SDiskCol         SDiskCol;
+typedef struct SDiskData        SDiskData;
+typedef struct SDiskDataBuilder SDiskDataBuilder;
+typedef struct SBlkInfo         SBlkInfo;
 
 #define TSDB_FILE_DLMT     ((uint32_t)0xF00AFA0F)
 #define TSDB_MAX_SUBBLOCKS 8
@@ -170,7 +174,7 @@ int32_t   tCmprBlockData(SBlockData *pBlockData, int8_t cmprAlg, uint8_t **ppOut
                          int32_t aBufN[]);
 int32_t   tDecmprBlockData(uint8_t *pIn, int32_t szIn, SBlockData *pBlockData, uint8_t *aBuf[]);
 // SDiskDataHdr
-int32_t tPutDiskDataHdr(uint8_t *p, void *ph);
+int32_t tPutDiskDataHdr(uint8_t *p, const SDiskDataHdr *pHdr);
 int32_t tGetDiskDataHdr(uint8_t *p, void *ph);
 // SDelIdx
 int32_t tPutDelIdx(uint8_t *p, void *ph);
@@ -267,6 +271,7 @@ int32_t tsdbWriteDataBlk(SDataFWriter *pWriter, SMapData *mDataBlk, SBlockIdx *p
 int32_t tsdbWriteSttBlk(SDataFWriter *pWriter, SArray *aSttBlk);
 int32_t tsdbWriteBlockData(SDataFWriter *pWriter, SBlockData *pBlockData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo,
                            int8_t cmprAlg, int8_t toLast);
+int32_t tsdbWriteDiskData(SDataFWriter *pWriter, const SDiskData *pDiskData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo);
 
 int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo);
 // SDataFReader
@@ -300,7 +305,7 @@ int32_t tsdbMerge(STsdb *pTsdb);
 #define TSDB_CACHE_LAST_ROW(c) (((c).cacheLast & 1) > 0)
 #define TSDB_CACHE_LAST(c)     (((c).cacheLast & 2) > 0)
 
-// tsdbCache
+// tsdbCache ==============================================================================================
 int32_t tsdbOpenCache(STsdb *pTsdb);
 void    tsdbCloseCache(STsdb *pTsdb);
 int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb *pTsdb);
@@ -318,6 +323,15 @@ size_t tsdbCacheGetCapacity(SVnode *pVnode);
 
 int32_t tsdbCacheLastArray2Row(SArray *pLastArray, STSRow **ppRow, STSchema *pSchema);
 
+// tsdbDiskData ==============================================================================================
+int32_t tDiskDataBuilderCreate(SDiskDataBuilder **ppBuilder);
+void   *tDiskDataBuilderDestroy(SDiskDataBuilder *pBuilder);
+int32_t tDiskDataBuilderInit(SDiskDataBuilder *pBuilder, STSchema *pTSchema, TABLEID *pId, uint8_t cmprAlg,
+                             uint8_t calcSma);
+int32_t tDiskDataBuilderClear(SDiskDataBuilder *pBuilder);
+int32_t tDiskDataAddRow(SDiskDataBuilder *pBuilder, TSDBROW *pRow, STSchema *pTSchema, TABLEID *pId);
+int32_t tGnrtDiskData(SDiskDataBuilder *pBuilder, const SDiskData **ppDiskData, const SBlkInfo **ppBlkInfo);
+
 // structs =======================
 struct STsdbFS {
   SDelFile *pDelFile;
@@ -438,6 +452,17 @@ struct SSmaInfo {
   int32_t size;
 };
 
+struct SBlkInfo {
+  int64_t minUid;
+  int64_t maxUid;
+  TSKEY   minKey;
+  TSKEY   maxKey;
+  int64_t minVer;
+  int64_t maxVer;
+  TSDBKEY minTKey;
+  TSDBKEY maxTKey;
+};
+
 struct SDataBlk {
   TSDBKEY    minKey;
   TSDBKEY    maxKey;
@@ -661,6 +686,38 @@ typedef struct {
   STSchema *pTSchema;
 } SSkmInfo;
 
+struct SDiskCol {
+  SBlockCol      bCol;
+  const uint8_t *pBit;
+  const uint8_t *pOff;
+  const uint8_t *pVal;
+  SColumnDataAgg agg;
+};
+
+struct SDiskData {
+  SDiskDataHdr   hdr;
+  const uint8_t *pUid;
+  const uint8_t *pVer;
+  const uint8_t *pKey;
+  SArray        *aDiskCol;  // SArray<SDiskCol>
+};
+
+struct SDiskDataBuilder {
+  int64_t      suid;
+  int64_t      uid;
+  int32_t      nRow;
+  uint8_t      cmprAlg;
+  uint8_t      calcSma;
+  SCompressor *pUidC;
+  SCompressor *pVerC;
+  SCompressor *pKeyC;
+  int32_t      nBuilder;
+  SArray      *aBuilder;  // SArray<SDiskColBuilder>
+  uint8_t     *aBuf[2];
+  SDiskData    dd;
+  SBlkInfo     bi;
+};
+
 int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFReader, uint64_t suid, uint64_t uid,
                        STimeWindow *pTimeWindow, SVersionRange *pVerRange, SSttBlockLoadInfo *pBlockLoadInfo,
                        bool destroyLoadInfo, const char *idStr);

source/dnode/vnode/src/meta/metaQuery.c

@@ -207,17 +207,17 @@ int metaGetTableUidByName(void *meta, char *tbName, uint64_t *uid) {
   SMetaReader mr = {0};
   metaReaderInit(&mr, (SMeta *)meta, 0);
 
-  SMeta       *pMeta = mr.pMeta;
   SMetaReader *pReader = &mr;
 
   // query name.idx
-  if (tdbTbGet(pMeta->pNameIdx, tbName, strlen(tbName) + 1, &pReader->pBuf, &pReader->szBuf) < 0) {
+  if (tdbTbGet(pReader->pMeta->pNameIdx, tbName, strlen(tbName) + 1, &pReader->pBuf, &pReader->szBuf) < 0) {
     terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
     metaReaderClear(&mr);
     return -1;
   }
 
   *uid = *(tb_uid_t *)pReader->pBuf;
+
   metaReaderClear(&mr);
 
   return 0;
@@ -228,11 +228,11 @@ int metaGetTableTypeByName(void *meta, char *tbName, ETableType *tbType) {
   SMetaReader mr = {0};
   metaReaderInit(&mr, (SMeta *)meta, 0);
 
-  if (metaGetTableEntryByName(&mr, tbName) == 0) {
-    *tbType = mr.me.type;
-  }
+  code = metaGetTableEntryByName(&mr, tbName);
+  if (code == 0) *tbType = mr.me.type;
+
   metaReaderClear(&mr);
-  return 0;
+  return code;
 }
 
 int metaReadNext(SMetaReader *pReader) {
@@ -1134,21 +1134,49 @@ END:
   return ret;
 }
 
-int32_t metaGetTableTagsOpt(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags) {
+static int32_t metaGetTableTagByUid(SMeta *pMeta, uint64_t suid, uint64_t uid, void **tag, int32_t *len, bool lock) {
+  int ret = 0;
+  if (lock) {
+    metaRLock(pMeta);
+  }
+
+  SCtbIdxKey ctbIdxKey = {.suid = suid, .uid = uid};
+  ret = tdbTbGet(pMeta->pCtbIdx, &ctbIdxKey, sizeof(SCtbIdxKey), tag, len);
+  if (lock) {
+    metaULock(pMeta);
+  }
+
+  return ret;
+}
+int32_t metaGetTableTagsByUids(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags) {
+  const int32_t LIMIT = 128;
+
+  int32_t isLock = false;
   int32_t sz = uidList ? taosArrayGetSize(uidList) : 0;
   for (int i = 0; i < sz; i++) {
     tb_uid_t *id = taosArrayGet(uidList, i);
-    SCtbIdxKey ctbIdxKey = {.suid = suid, .uid = *id};
 
+    if (i % LIMIT == 0) {
+      if (isLock) metaULock(pMeta);
+
+      metaRLock(pMeta);
+      isLock = true;
+    }
+
+    if (taosHashGet(tags, id, sizeof(tb_uid_t)) == NULL) {
       void   *val = NULL;
       int32_t len = 0;
-    if (taosHashGet(tags, id, sizeof(tb_uid_t)) == NULL &&
-        0 == tdbTbGet(pMeta->pCtbIdx, &ctbIdxKey, sizeof(SCtbIdxKey), &val, &len)) {
+      if (metaGetTableTagByUid(pMeta, suid, *id, &val, &len, false) == 0) {
         taosHashPut(tags, id, sizeof(tb_uid_t), val, len);
+        tdbFree(val);
+      }
     }
   }
+  if (isLock) metaULock(pMeta);
+
   return 0;
 }
+
 int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags) {
   SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
 

source/dnode/vnode/src/tsdb/tsdbCache.c

@@ -260,7 +260,7 @@ int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb
     SLastCol *tTsVal = (SLastCol *)taosArrayGet(pLast, iCol);
     if (keyTs > tTsVal->ts) {
       STColumn *pTColumn = &pTSchema->columns[0];
-      SColVal   tColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = keyTs});
+      SColVal   tColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = keyTs});
 
       taosArraySet(pLast, iCol, &(SLastCol){.ts = keyTs, .colVal = tColVal});
     }
@@ -447,7 +447,7 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow) {
       if (--state->iFileSet >= 0) {
         pFileSet = (SDFileSet *)taosArrayGet(state->aDFileSet, state->iFileSet);
       } else {
-        // tMergeTreeClose(&state->mergeTree);
+        tMergeTreeClose(&state->mergeTree);
 
         *ppRow = NULL;
         return code;
@@ -463,7 +463,7 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow) {
       bool hasVal = tMergeTreeNext(&state->mergeTree);
       if (!hasVal) {
         state->state = SFSLASTNEXTROW_FILESET;
-        // tMergeTreeClose(&state->mergeTree);
+        tMergeTreeClose(&state->mergeTree);
         goto _next_fileset;
       }
       state->state = SFSLASTNEXTROW_BLOCKROW;
@@ -590,7 +590,10 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
         goto _next_fileset;
       }
 
-      tMapDataReset(&state->blockMap);
+      if (state->blockMap.pData != NULL) {
+        tMapDataClear(&state->blockMap);
+      }
+
       code = tsdbReadDataBlk(state->pDataFReader, state->pBlockIdx, &state->blockMap);
       if (code) goto _err;
 
@@ -695,6 +698,10 @@ int32_t clearNextRowFromFS(void *iter) {
     state->pBlockData = NULL;
   }
 
+  if (state->blockMap.pData != NULL) {
+    tMapDataClear(&state->blockMap);
+  }
+
   return code;
 }
 
@@ -1052,7 +1059,7 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, bool *dup, STSRow **ppRo
       lastRowTs = TSDBROW_TS(pRow);
       STColumn *pTColumn = &pTSchema->columns[0];
 
-      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = lastRowTs});
+      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = lastRowTs});
       if (taosArrayPush(pColArray, pColVal) == NULL) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         goto _err;
@@ -1151,7 +1158,7 @@ static int32_t mergeLast(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray) {
       lastRowTs = rowTs;
       STColumn *pTColumn = &pTSchema->columns[0];
 
-      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = lastRowTs});
+      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = lastRowTs});
       if (taosArrayPush(pColArray, &(SLastCol){.ts = lastRowTs, .colVal = *pColVal}) == NULL) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         goto _err;

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -926,6 +926,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
     }
   }
 
+  // fill the mis-matched columns with null value
   while (i < numOfOutputCols) {
     pColData = taosArrayGet(pResBlock->pDataBlock, i);
     colDataAppendNNULL(pColData, 0, remain);
@@ -935,12 +936,15 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
   pResBlock->info.rows = remain;
   pDumpInfo->rowIndex += step * remain;
 
+  // check if current block are all handled
   if (pDumpInfo->rowIndex >= 0 && pDumpInfo->rowIndex < pBlock->nRow) {
-//    int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
-//    setBlockAllDumped(pDumpInfo, ts, pReader->order);
+    int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
+    if (outOfTimeWindow(ts, &pReader->window)) {  // the remain data has out of query time window, ignore current block
+      setBlockAllDumped(pDumpInfo, ts, pReader->order);
+    }
   } else {
-    int64_t k = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
-    setBlockAllDumped(pDumpInfo, k, pReader->order);
+    int64_t ts = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
+    setBlockAllDumped(pDumpInfo, ts, pReader->order);
   }
 
   double elapsedTime = (taosGetTimestampUs() - st) / 1000.0;

source/dnode/vnode/src/tsdb/tsdbReaderWriter.c

@@ -128,7 +128,7 @@ _exit:
   return code;
 }
 
-static int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size) {
+static int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size) {
   int32_t code = 0;
   int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage);
   int64_t pgno = OFFSET_PGNO(fOffset, pFD->szPage);
@@ -522,9 +522,6 @@ static int32_t tsdbWriteBlockSma(SDataFWriter *pWriter, SBlockData *pBlockData,
 
   // write
   if (pSmaInfo->size) {
-    code = tRealloc(&pWriter->aBuf[0], pSmaInfo->size);
-    if (code) goto _err;
-
     code = tsdbWriteFile(pWriter->pSmaFD, pWriter->fSma.size, pWriter->aBuf[0], pSmaInfo->size);
     if (code) goto _err;
 
@@ -607,6 +604,132 @@ _err:
   return code;
 }
 
+int32_t tsdbWriteDiskData(SDataFWriter *pWriter, const SDiskData *pDiskData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo) {
+  int32_t code = 0;
+  int32_t lino = 0;
+
+  STsdbFD *pFD = NULL;
+  if (pSmaInfo) {
+    pFD = pWriter->pDataFD;
+    pBlkInfo->offset = pWriter->fData.size;
+  } else {
+    pFD = pWriter->pSttFD;
+    pBlkInfo->offset = pWriter->fStt[pWriter->wSet.nSttF - 1].size;
+  }
+  pBlkInfo->szBlock = 0;
+  pBlkInfo->szKey = 0;
+
+  // hdr
+  int32_t n = tPutDiskDataHdr(NULL, &pDiskData->hdr);
+  code = tRealloc(&pWriter->aBuf[0], n);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+  tPutDiskDataHdr(pWriter->aBuf[0], &pDiskData->hdr);
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset, pWriter->aBuf[0], n);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += n;
+  pBlkInfo->szBlock += n;
+
+  // uid + ver + key
+  if (pDiskData->pUid) {
+    code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pUid, pDiskData->hdr.szUid);
+    TSDB_CHECK_CODE(code, lino, _exit);
+    pBlkInfo->szKey += pDiskData->hdr.szUid;
+    pBlkInfo->szBlock += pDiskData->hdr.szUid;
+  }
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pVer, pDiskData->hdr.szVer);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += pDiskData->hdr.szVer;
+  pBlkInfo->szBlock += pDiskData->hdr.szVer;
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pKey, pDiskData->hdr.szKey);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += pDiskData->hdr.szKey;
+  pBlkInfo->szBlock += pDiskData->hdr.szKey;
+
+  // aBlockCol
+  if (pDiskData->hdr.szBlkCol) {
+    code = tRealloc(&pWriter->aBuf[0], pDiskData->hdr.szBlkCol);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    n = 0;
+    for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+      SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+      n += tPutBlockCol(pWriter->aBuf[0] + n, pDiskCol);
+    }
+    ASSERT(n == pDiskData->hdr.szBlkCol);
+
+    code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pWriter->aBuf[0], pDiskData->hdr.szBlkCol);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    pBlkInfo->szBlock += pDiskData->hdr.szBlkCol;
+  }
+
+  // aDiskCol
+  for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+    SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+
+    if (pDiskCol->pBit) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pBit, pDiskCol->bCol.szBitmap);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szBitmap;
+    }
+
+    if (pDiskCol->pOff) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pOff, pDiskCol->bCol.szOffset);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szOffset;
+    }
+
+    if (pDiskCol->pVal) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pVal, pDiskCol->bCol.szValue);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szValue;
+    }
+  }
+
+  if (pSmaInfo) {
+    pWriter->fData.size += pBlkInfo->szBlock;
+  } else {
+    pWriter->fStt[pWriter->wSet.nSttF - 1].size += pBlkInfo->szBlock;
+    goto _exit;
+  }
+
+  pSmaInfo->offset = 0;
+  pSmaInfo->size = 0;
+  for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+    SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+
+    if (IS_VAR_DATA_TYPE(pDiskCol->bCol.type)) continue;
+    if (pDiskCol->bCol.flag == HAS_NULL || pDiskCol->bCol.flag == (HAS_NULL | HAS_NONE)) continue;
+    if (!pDiskCol->bCol.smaOn) continue;
+
+    code = tRealloc(&pWriter->aBuf[0], pSmaInfo->size + tPutColumnDataAgg(NULL, &pDiskCol->agg));
+    TSDB_CHECK_CODE(code, lino, _exit);
+    pSmaInfo->size += tPutColumnDataAgg(pWriter->aBuf[0] + pSmaInfo->size, &pDiskCol->agg);
+  }
+
+  if (pSmaInfo->size) {
+    pSmaInfo->offset = pWriter->fSma.size;
+
+    code = tsdbWriteFile(pWriter->pSmaFD, pSmaInfo->offset, pWriter->aBuf[0], pSmaInfo->size);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    pWriter->fSma.size += pSmaInfo->size;
+  }
+
+_exit:
+  if (code) {
+    tsdbError("vgId:%d %s failed at %d since %s", TD_VID(pWriter->pTsdb->pVnode), __func__, lino, tstrerror(code));
+  }
+  return code;
+}
+
 int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo) {
   int32_t   code = 0;
   int64_t   n;
@@ -946,8 +1069,8 @@ static int32_t tsdbReadBlockDataImpl(SDataFReader *pReader, SBlockInfo *pBlkInfo
 
   ASSERT(hdr.delimiter == TSDB_FILE_DLMT);
   ASSERT(pBlockData->suid == hdr.suid);
-  ASSERT(pBlockData->uid == hdr.uid);
 
+  pBlockData->uid = hdr.uid;
   pBlockData->nRow = hdr.nRow;
 
   // uid

source/dnode/vnode/src/vnd/vnodeSync.c

@@ -328,14 +328,14 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
   const STraceId *trace = &pMsg->info.traceId;
 
   if (!syncEnvIsStart()) {
-    vGError("vgId:%d, msg:%p failed to process since sync env not start", pVnode->config.vgId);
+    vGError("vgId:%d, msg:%p failed to process since sync env not start", pVnode->config.vgId, pMsg);
     terrno = TSDB_CODE_APP_ERROR;
     return -1;
   }
 
   SSyncNode *pSyncNode = syncNodeAcquire(pVnode->sync);
   if (pSyncNode == NULL) {
-    vGError("vgId:%d, msg:%p failed to process since invalid sync node", pVnode->config.vgId);
+    vGError("vgId:%d, msg:%p failed to process since invalid sync node", pVnode->config.vgId, pMsg);
     terrno = TSDB_CODE_SYN_INTERNAL_ERROR;
     return -1;
   }
@@ -394,7 +394,7 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
       SRpcMsg rsp = {.code = code, .info = pMsg->info};
       tmsgSendRsp(&rsp);
     } else {
-      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg->msgType);
+      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg, pMsg->msgType);
       code = -1;
     }
 
@@ -459,7 +459,7 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
       SRpcMsg rsp = {.code = code, .info = pMsg->info};
       tmsgSendRsp(&rsp);
     } else {
-      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg->msgType);
+      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg, pMsg->msgType);
       code = -1;
     }
   }
@@ -630,7 +630,7 @@ static int32_t vnodeSnapshotStartWrite(struct SSyncFSM *pFsm, void *pParam, void
       vInfo("vgId:%d, start write vnode snapshot since apply queue is empty", pVnode->config.vgId);
       break;
     } else {
-      vInfo("vgId:%d, write vnode snapshot later since %d items in apply queue", pVnode->config.vgId);
+      vInfo("vgId:%d, write vnode snapshot later since %d items in apply queue", pVnode->config.vgId, itemSize);
       taosMsleep(10);
     }
   } while (true);
@@ -683,7 +683,7 @@ static void vnodeRestoreFinish(struct SSyncFSM *pFsm) {
       vInfo("vgId:%d, apply queue is empty, restore finish", pVnode->config.vgId);
       break;
     } else {
-      vInfo("vgId:%d, restore not finish since %d items in apply queue", pVnode->config.vgId);
+      vInfo("vgId:%d, restore not finish since %d items in apply queue", pVnode->config.vgId, itemSize);
       taosMsleep(10);
     }
   } while (true);

source/libs/executor/src/executil.c

@@ -420,7 +420,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
       goto end;
     }
   } else {
-    metaGetTableTagsOpt(metaHandle, suid, uidList, tags);
+    metaGetTableTagsByUids(metaHandle, suid, uidList, tags);
     qInfo("succ to get table from meta idx, suid:%" PRIu64, suid);
   }
 

source/libs/index/src/indexFilter.c

@@ -468,6 +468,7 @@ static int32_t sifDoIndex(SIFParam *left, SIFParam *right, int8_t operType, SIFP
     SIndexMultiTermQuery *mtm = indexMultiTermQueryCreate(MUST);
     indexMultiTermQueryAdd(mtm, tm, qtype);
     ret = indexJsonSearch(arg->ivtIdx, mtm, output->result);
+    indexMultiTermQueryDestroy(mtm);
   } else {
     bool       reverse;
     FilterFunc filterFunc = sifGetFilterFunc(qtype, &reverse);
@@ -647,9 +648,8 @@ static int32_t sifExecOper(SOperatorNode *node, SIFCtx *ctx, SIFParam *output) {
   SIF_ERR_RET(sifInitOperParams(&params, node, ctx));
 
   if (params[0].status == SFLT_NOT_INDEX && (nParam > 1 && params[1].status == SFLT_NOT_INDEX)) {
-    for (int i = 0; i < nParam; i++) sifFreeParam(&params[i]);
     output->status = SFLT_NOT_INDEX;
-    return code;
+    goto _return;
   }
 
   // ugly code, refactor later

source/libs/index/src/indexFstDfa.c

@@ -139,6 +139,7 @@ bool dfaBuilderCacheState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *r
     }
   }
   if (taosArrayGetSize(tinsts) == 0) {
+    taosArrayDestroy(tinsts);
     return false;
   }
   uint32_t *v = taosHashGet(builder->cache, &tinsts, sizeof(POINTER_BYTES));

source/libs/parser/inc/parUtil.h

@@ -91,6 +91,7 @@ STableComInfo getTableInfo(const STableMeta* pTableMeta);
 STableMeta*   tableMetaDup(const STableMeta* pTableMeta);
 
 int32_t trimString(const char* src, int32_t len, char* dst, int32_t dlen);
+int32_t getInsTagsTableTargetName(int32_t acctId, SNode* pWhere, SName* pName);
 
 int32_t buildCatalogReq(SParseContext* pCxt, const SParseMetaCache* pMetaCache, SCatalogReq* pCatalogReq);
 int32_t putMetaDataToCache(const SCatalogReq* pCatalogReq, const SMetaData* pMetaData, SParseMetaCache* pMetaCache,

source/libs/parser/test/parSelectTest.cpp

@@ -420,9 +420,11 @@ TEST_F(ParserSelectTest, setOperatorSemanticCheck) {
 }
 
 TEST_F(ParserSelectTest, informationSchema) {
-  useDb("root", "test");
+  useDb("root", "information_schema");
+
+  run("SELECT * FROM ins_databases WHERE name = 'information_schema'");
 
-  run("SELECT * FROM information_schema.ins_databases WHERE name = 'information_schema'");
+  run("SELECT * FROM ins_tags WHERE db_name = 'test' and table_name = 'st1'");
 }
 
 TEST_F(ParserSelectTest, withoutFrom) {

source/libs/parser/test/parTestMain.cpp

@@ -53,7 +53,7 @@ class ParserEnv : public testing::Environment {
 
  private:
   void initLog(const char* path) {
-    int32_t logLevel = getLogLevel();
+    int32_t logLevel = getLogLevel() | DEBUG_SCREEN;
     dDebugFlag = logLevel;
     vDebugFlag = logLevel;
     mDebugFlag = logLevel;