Merge branch '3.0' into feature/3.0_interval_hash_optimize

README-CN.md

@@ -19,7 +19,7 @@
 
 # TDengine 简介
 
-TDengine 是一款开源、高性能、云原生的时序数据库 (Time-Series Database, TSDB)。TDengine 能被广泛运用于物联网、工业互联网、车联网、IT 运维、金融等领域。除核心的时序数据库功能外，TDengine 还提供缓存、数据订阅、流式计算等功能，是一极简的时序数据处理平台，最大程度的减小系统设计的复杂度，降低研发和运营成本。TDengine 的主要优势如下：
+TDengine 是一款开源、高性能、云原生的时序数据库 (Time-Series Database, TSDB)。TDengine 能被广泛运用于物联网、工业互联网、车联网、IT 运维、金融等领域。除核心的时序数据库功能外，TDengine 还提供缓存、数据订阅、流式计算等功能，是一极简的时序数据处理平台，最大程度的减小系统设计的复杂度，降低研发和运营成本。与其他时序数据库相比，TDengine 的主要优势如下：
 
 - 高性能：通过创新的存储引擎设计，无论是数据写入还是查询，TDengine 的性能比通用数据库快 10 倍以上，也远超其他时序数据库，存储空间不及通用数据库的1/10。
 
@@ -35,13 +35,17 @@ TDengine 是一款开源、高性能、云原生的时序数据库 (Time-Series
 
 # 文档
 
-关于完整的使用手册，系统架构和更多细节，请参考 [TDengine 文档](https://docs.taosdata.com) 或者  [English Documents](https://docs.tdengine.com)。
+关于完整的使用手册，系统架构和更多细节，请参考 [TDengine 文档](https://docs.taosdata.com) 或者  [TDengine Documentation](https://docs.tdengine.com)。
 
 # 构建
 
 TDengine 目前可以在 Linux、 Windows 等平台上安装和运行。任何 OS 的应用也可以选择 taosAdapter 的 RESTful 接口连接服务端 taosd。CPU 支持 X64/ARM64，后续会支持 MIPS64、Alpha64、ARM32、RISC-V 等 CPU 架构。
 
-用户可根据需求选择通过[源码](https://www.taosdata.com/cn/getting-started/#通过源码安装)或者[安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装)来安装。本快速指南仅适用于通过源码安装。
+用户可根据需求选择通过源码、[容器](https://docs.taosdata.com/get-started/docker/)、[安装包](https://docs.taosdata.com/get-started/package/)或[Kubenetes](https://docs.taosdata.com/deployment/k8s/)来安装。本快速指南仅适用于通过源码安装。
+  
+TDengine 还提供一组辅助工具软件 taosTools，目前它包含 taosBenchmark（曾命名为 taosdemo）和 taosdump 两个软件。默认 TDengine 编译不包含 taosTools, 您可以在编译 TDengine 时使用`cmake .. -DBUILD_TOOLS=true` 来同时编译 taosTools。
+
+为了构建TDengine, 请使用 [CMake](https://cmake.org/) 3.0.2 或者更高版本。
 
 ## 安装工具
 
@@ -53,17 +57,13 @@ sudo apt-get install -y gcc cmake build-essential git libssl-dev
 
 #### 为 taos-tools 安装编译需要的软件
 
-taosTools 是用于 TDengine 的辅助工具软件集合。目前它包含 taosBenchmark（曾命名为 taosdemo）和 taosdump 两个软件。
-
-默认 TDengine 编译不包含 taosTools。您可以在编译 TDengine 时使用`cmake .. -DBUILD_TOOLS=true` 来同时编译 taosTools。
-
 为了在 Ubuntu/Debian 系统上编译 [taos-tools](https://github.com/taosdata/taos-tools) 需要安装如下软件：
 
 ```bash
 sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev pkg-config
 ```
 
-### CentOS 7.9：
+### CentOS 7.9
 
 ```bash
 sudo yum install epel-release
@@ -80,13 +80,15 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
 
 #### 在 CentOS 上构建 taosTools 安装依赖软件
 
-#### For CentOS 7/RHEL
+
+#### CentOS 7.9
+
 
 ```
 sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel
 ```
 
-#### For CentOS 8/Rocky Linux
+#### CentOS 8/Rocky Linux 
 
 ```
 sudo yum install -y epel-release
@@ -104,7 +106,7 @@ sudo yum config-manager --set-enabled Powertools
 
 ### 设置 golang 开发环境
 
-TDengine 包含数个使用 Go 语言开发的组件，请参考 golang.org 官方文档设置 go 开发环境。
+TDengine 包含数个使用 Go 语言开发的组件，比如taosAdapter, 请参考 golang.org 官方文档设置 go 开发环境。
 
 请使用 1.14 及以上版本。对于中国用户，我们建议使用代理来加速软件包下载。
 
@@ -113,7 +115,7 @@ go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 ```
 
-默认情况下，内嵌的 http 服务仍然可以从 TDengine 源码构建。当然您也可以使用以下命令选择构建 taosAdapter 作为 RESTful 接口的服务。
+缺省是不会构建 taosAdapter, 但您可以使用以下命令选择构建 taosAdapter 作为 RESTful 接口的服务。
 
 ```
 cmake .. -DBUILD_HTTP=false
@@ -131,14 +133,16 @@ TDengine 包含数个使用 Rust 语言开发的组件. 请参考 rust-lang.org
 git clone https://github.com/taosdata/TDengine.git
 cd TDengine
 ```
-
-Go 连接器和 Grafana 插件已移到其他独立仓库。
 如果使用 https 协议下载比较慢，可以通过修改 ~/.gitconfig 文件添加以下两行设置使用 ssh 协议下载。需要首先上传 ssh 密钥到 GitHub，详细方法请参考 GitHub 官方文档。
 
 ```
 [url "git@github.com:"]
     insteadOf = https://github.com/
 ```
+## 特别说明
+
+[JDBC 连接器](https://github.com/taosdata/taos-connector-jdbc)， [Go 连接器](https://github.com/taosdata/driver-go)，[Python 连接器](https://github.com/taosdata/taos-connector-python)，[Node.js 连接器](https://github.com/taosdata/taos-connector-node)，[C# 连接器](https://github.com/taosdata/taos-connector-dotnet) ，[Rust 连接器](https://github.com/taosdata/taos-connector-rust) 和 [Grafana 插件](https://github.com/taosdata/grafanaplugin)已移到独立仓库。
+
 
 ## 构建 TDengine
 
@@ -225,9 +229,9 @@ cmake .. && cmake --build .
 sudo make install
 ```
 
-用户可以在[文件目录结构](https://www.taosdata.com/cn/documentation/administrator#directories)中了解更多在操作系统中生成的目录或文件。
+用户可以在[文件目录结构](https://docs.taosdata.com/reference/directory/)中了解更多在操作系统中生成的目录或文件。
-从 2.0 版本开始, 从源代码安装也会为 TDengine 配置服务管理。
+
-用户也可以选择[从安装包中安装](https://www.taosdata.com/en/getting-started/#Install-from-Package)。
+从源代码安装也会为 TDengine 配置服务管理 ，用户也可以选择[从安装包中安装](https://docs.taosdata.com/get-started/package/)。
 
 安装成功后，在终端中启动 TDengine 服务：
 
@@ -235,13 +239,13 @@ sudo make install
 sudo systemctl start taosd
 ```
 
-用户可以使用 TDengine Shell 来连接 TDengine 服务，在终端中，输入：
+用户可以使用 TDengine CLI 来连接 TDengine 服务，在终端中，输入：
 
 ```bash
 taos
 ```
 
-如果 TDengine Shell 连接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印出错误消息。
+如果 TDengine CLI 连接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印出错误消息。
 
 ## Windows 系统
 
@@ -267,7 +271,7 @@ sudo make install
 ./build/bin/taosd -c test/cfg
 ```
 
-在另一个终端，使用 TDengine shell 连接服务器：
+在另一个终端，使用 TDengine CLI 连接服务器：
 
 ```bash
 ./build/bin/taos -c test/cfg

README.md

@@ -14,37 +14,50 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/kf3pwh2or5afsgl9/branch/master?svg=true)](https://ci.appveyor.com/project/sangshuduo/tdengine-2n8ge/branch/master)
 [![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=develop)](https://coveralls.io/github/taosdata/TDengine?branch=develop)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4201/badge)](https://bestpractices.coreinfrastructure.org/projects/4201)
-[![tdengine](https://snapcraft.io//tdengine/badge.svg)](https://snapcraft.io/tdengine)
+
 
 English | [简体中文](README-CN.md) | We are hiring, check [here](https://tdengine.com/careers)
 
 # What is TDengine？
 
-TDengine is an open source, cloud native time-series database 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 TSDBs with the following advantages.:
+
+TDengine is an open source, high performance , cloud native time-series database (Time-Series Database, TSDB).
+
+TDengine can be optimized for Internet of Things (IoT), Connected Cars, and Industrial IoT, IT operation and maintenance, finance and other fields. In addition to the core time series database functions, TDengine also provides functions such as caching, data subscription, and streaming computing. It is a minimalist time series data processing platform that minimizes the complexity of system design and reduces R&D and operating costs. Compared with other time series databases, the main advantages of TDengine are as follows:
+
 
 - High-Performance: 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.
 
 - Simplified Solution: Through built-in caching, stream processing and data subscription features, TDengine provides a simplified solution for time-series data processing. It reduces system design complexity and operation costs significantly.
 
-- Cloud Native: Through native distributed design, sharding and partitioning, separation of compute and storage, RAFT, support for kubernetes deployment and full observability, TDengine can be deployed on public, private or hybrid clouds.
+- Cloud Native: Through native distributed design, sharding and partitioning, separation of compute and storage, RAFT, support for kubernetes deployment and full observability, TDengine is a cloud native Time-Series Database and can be deployed on public, private or hybrid clouds.
-
-- Open Source: TDengine’s core modules, including cluster feature, are all available under open source licenses. It has gathered 18.8k stars on GitHub, an active developer community, and over 137k running instances worldwide.
 
 - Ease of Use: For administrators, TDengine significantly reduces the effort to deploy and maintain. For developers, it provides a simple interface, simplified solution and seamless integrations for third party tools. For data users, it gives easy data access. 
 
 - Easy Data Analytics: Through super tables, storage and compute separation, data partitioning by time interval, pre-computation and other means, TDengine makes it easy to explore, format, and get access to data in a highly efficient way. 
 
+- Open Source: TDengine’s core modules, including cluster feature, are all available under open source licenses. It has gathered 18.8k stars on GitHub, an active developer community, and over 137k running instances worldwide.
+
 # Documentation
 
-For user manual, system design and architecture, please refer to [TDengine Documentation](https://docs.tdengine.com) (中文版请点击[这里](https://docs.taosdata.com))
+For user manual, system design and architecture, please refer to [TDengine Documentation](https://docs.taosdata.com) ([TDengine 文档](https://docs.taosdata.com))
 
 # Building
 
-At the moment, TDengine server supports running on Linux, Windows, and macOS systems. You can choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) or build it from the source code. This quick guide is for installation from the source only.
+
+At the moment, TDengine server supports running on Linux, Windows systems.Any OS application can also choose the RESTful interface of taosAdapter to connect the taosd service . TDengine supports X64/ARM64 CPU , and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future.
+
+
+
+You can choose to install through source code according to your needs, [container](https://docs.taosdata.com/get-started/docker/), [installation package](https://docs.taosdata.com/get-started/package/) or [Kubenetes](https://docs.taosdata.com/deployment/k8s/) to install. This quick guide only applies to installing from source.
+
+   
+
+TDengine provide a few useful tools such as taosBenchmark (was named taosdemo) and taosdump. They were part of TDengine. By default, TDengine compiling does not include taosTools. You can use `cmake .. -DBUILD_TOOLS=true` to make them be compiled with TDengine.
 
 To build TDengine, use [CMake](https://cmake.org/) 3.0.2 or higher versions in the project directory.
 
-## Install build dependencies
+## Install build tools
 
 ### Ubuntu 18.04 and above or Debian
 
@@ -54,8 +67,6 @@ sudo apt-get install -y gcc cmake build-essential git libssl-dev
 
 #### Install build dependencies for taosTools
 
-We provide a few useful tools such as taosBenchmark (was named taosdemo) and taosdump. They were part of TDengine. From TDengine 2.4.0.0, taosBenchmark and taosdump were not released together with TDengine.
-By default, TDengine compiling does not include taosTools. You can use 'cmake .. -DBUILD_TOOLS=true' to make them be compiled with TDengine.
 
 To build the [taosTools](https://github.com/taosdata/taos-tools) on Ubuntu/Debian, the following packages need to be installed.
 
@@ -80,17 +91,33 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
 
 #### Install build dependencies for taosTools on CentOS
 
-To build the [taosTools](https://github.com/taosdata/taos-tools) on CentOS, the following packages need to be installed.
 
-```bash
+#### CentOS 7.9
-sudo yum install zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel
+
+```
+sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel
+```
+
+#### CentOS 8/Rocky Linux 
+
+```
+sudo yum install -y epel-release
+sudo yum install -y dnf-plugins-core
+sudo yum config-manager --set-enabled powertools
+sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel
 ```
 
 Note: Since snappy lacks pkg-config support (refer to [link](https://github.com/google/snappy/pull/86)), it leads a cmake prompt libsnappy not found. But snappy still works well.
 
+If the powertools installation fails, you can try to use:
+```
+sudo yum config-manager --set-enabled Powertools
+```
+
 ### Setup golang environment
 
-TDengine includes a few components developed by Go language. Please refer to golang.org official documentation for golang environment setup.
+
+TDengine includes a few components like taosAdapter developed by Go language. Please refer to golang.org official documentation for golang environment setup.
 
 Please use version 1.14+. For the user in China, we recommend using a proxy to accelerate package downloading.
 
@@ -99,9 +126,15 @@ go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 ```
 
+The default will not build taosAdapter, but you can use the following command to build taosAdapter as the service for RESTful interface.
+
+```
+cmake .. -DBUILD_HTTP=false
+```
+
 ### Setup rust environment
 
-TDengine includees a few compoments developed by Rust language. Please refer to rust-lang.org official documentation for rust environment setup.
+TDengine includes a few compoments developed by Rust language. Please refer to rust-lang.org official documentation for rust environment setup.
 
 ## Get the source codes
 
@@ -112,7 +145,6 @@ git clone https://github.com/taosdata/TDengine.git
 cd TDengine
 ```
 
-The connectors for go & Grafana and some tools have been moved to separated repositories.
 
 You can modify the file ~/.gitconfig to use ssh protocol instead of https for better download speed. You will need to upload ssh public key to GitHub first. Please refer to GitHub official documentation for detail.
 
@@ -121,10 +153,16 @@ You can modify the file ~/.gitconfig to use ssh protocol instead of https for be
     insteadOf = https://github.com/
 ```
 
+## Special Note
+
+
+[JDBC Connector](https://github.com/taosdata/taos-connector-jdbc)， [Go Connector](https://github.com/taosdata/driver-go)，[Python Connector](https://github.com/taosdata/taos-connector-python)，[Node.js Connector](https://github.com/taosdata/taos-connector-node)，[C# Connector](https://github.com/taosdata/taos-connector-dotnet) ，[Rust Connector](https://github.com/taosdata/taos-connector-rust) and [Grafana plugin](https://github.com/taosdata/grafanaplugin) has been moved to standalone repository.
+
 ## Build TDengine
 
 ### On Linux platform
 
+
 You can run the bash script `build.sh` to build both TDengine and taosTools including taosBenchmark and taosdump as below:
 
 ```bash
@@ -140,18 +178,6 @@ cmake .. -DBUILD_TOOLS=true
 make
 ```
 
-Note TDengine 2.3.x.0 and later use a component named 'taosAdapter' to play http daemon role by default instead of the http daemon embedded in the early version of TDengine. The taosAdapter is programmed by go language. If you pull TDengine source code to the latest from an existing codebase, please execute 'git submodule update --init --recursive' to pull taosAdapter source code. Please install go language version 1.14 or above for compiling taosAdapter. If you meet difficulties regarding 'go mod', especially you are from China, you can use a proxy to solve the problem.
-
-```
-go env -w GO111MODULE=on
-go env -w GOPROXY=https://goproxy.cn,direct
-```
-
-The embedded http daemon still be built from TDengine source code by default. Or you can use the following command to choose to build taosAdapter.
-
-```
-cmake .. -DBUILD_HTTP=false
-```
 
 You can use Jemalloc as memory allocator instead of glibc:
 
@@ -172,7 +198,7 @@ cmake .. -DCPUTYPE=aarch64 && cmake --build .
 ### On Windows platform
 
 If you use the Visual Studio 2013, please open a command window by executing "cmd.exe".
-Please specify "amd64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
+Please specify "amd64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat.
 
 ```cmd
 mkdir debug && cd debug
@@ -184,7 +210,7 @@ nmake
 If you use the Visual Studio 2019 or 2017:
 
 please open a command window by executing "cmd.exe".
-Please specify "x64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
+Please specify "x64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat.
 
 ```cmd
 mkdir debug && cd debug
@@ -220,8 +246,9 @@ After building successfully, TDengine can be installed by
 sudo make install
 ```
 
-Users can find more information about directories installed on the system in the [directory and files](https://www.taosdata.com/en/documentation/administrator/#Directory-and-Files) section. Since version 2.0, installing from source code will also configure service management for TDengine.
+Users can find more information about directories installed on the system in the [directory and files](https://docs.taosdata.com/reference/directory/) section.  
-Users can also choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) for it.
+
+Installing from source code will also configure service management for TDengine.Users can also choose to [install from packages](https://docs.taosdata.com/get-started/package/) for it.
 
 To start the service after installation, in a terminal, use:
 
@@ -229,26 +256,13 @@ To start the service after installation, in a terminal, use:
 sudo systemctl start taosd
 ```
 
-Then users can use the [TDengine shell](https://www.taosdata.com/en/getting-started/#TDengine-Shell) to connect the TDengine server. In a terminal, use:
+Then users can use the TDengine CLI to connect the TDengine server. In a terminal, use:
 
 ```bash
 taos
 ```
 
-If TDengine shell connects the server successfully, welcome messages and version info are printed. Otherwise, an error message is shown.
+If TDengine CLI connects the server successfully, welcome messages and version info are printed. Otherwise, an error message is shown.
-
-### Install TDengine by apt-get
-
-If you use Debian or Ubuntu system, you can use 'apt-get' command to install TDengine from official repository. Please use following commands to setup:
-
-```
-wget -qO - http://repos.taosdata.com/tdengine.key | sudo apt-key add -
-echo "deb [arch=amd64] http://repos.taosdata.com/tdengine-stable stable main" | sudo tee /etc/apt/sources.list.d/tdengine-stable.list
-[Optional] echo "deb [arch=amd64] http://repos.taosdata.com/tdengine-beta beta main" | sudo tee /etc/apt/sources.list.d/tdengine-beta.list
-sudo apt-get update
-apt-cache policy tdengine
-sudo apt-get install tdengine
-```
 
 ## On Windows platform
 
@@ -274,7 +288,7 @@ If you don't want to run TDengine as a service, you can run it in current shell.
 ./build/bin/taosd -c test/cfg
 ```
 
-In another terminal, use the TDengine shell to connect the server:
+In another terminal, use the TDengine CLI to connect the server:
 
 ```bash
 ./build/bin/taos -c test/cfg
@@ -284,7 +298,7 @@ option "-c test/cfg" specifies the system configuration file directory.
 
 # Try TDengine
 
-It is easy to run SQL commands from TDengine shell which is the same as other SQL databases.
+It is easy to run SQL commands from TDengine CLI which is the same as other SQL databases.
 
 ```sql
 CREATE DATABASE demo;
@@ -304,7 +318,7 @@ Query OK, 2 row(s) in set (0.001700s)
 
 ## Official Connectors
 
-TDengine provides abundant developing tools for users to develop on TDengine. Follow the links below to find your desired connectors and relevant documentation.
+TDengine provides abundant developing tools for users to develop on TDengine.  include C/C++、Java、Python、Go、Node.js、C# 、RESTful  ,Follow the links below to find your desired connectors and relevant documentation.
 
 - [Java](https://docs.taosdata.com/reference/connector/java/)
 - [C/C++](https://docs.taosdata.com/reference/connector/cpp/)
@@ -315,11 +329,6 @@ TDengine provides abundant developing tools for users to develop on TDengine. Fo
 - [C#](https://docs.taosdata.com/reference/connector/csharp/)
 - [RESTful API](https://docs.taosdata.com/reference/rest-api/)
 
-# How to run the test cases and how to add a new test case
-
-TDengine's test framework and all test cases are fully open source.
-Please refer to [this document](https://github.com/taosdata/TDengine/blob/develop/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md) for how to run test and develop new test case.
-
 # Contribute to TDengine
 
 Please follow the [contribution guidelines](CONTRIBUTING.md) to contribute to the project.
@@ -327,7 +336,3 @@ Please follow the [contribution guidelines](CONTRIBUTING.md) to contribute to th
 # Join TDengine WeChat Group
 
 Add WeChat “tdengine” to join the group，you can communicate with other users.
-
-# [User List](https://github.com/taosdata/TDengine/issues/2432)
-
-If you are using TDengine and feel it helps or you'd like to do some contributions, please add your company to [user list](https://github.com/taosdata/TDengine/issues/2432) and let us know your needs.

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 43924b8
+        GIT_TAG 53a0103
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

contrib/CMakeLists.txt

@@ -27,10 +27,6 @@ else ()
     cat("${TD_SUPPORT_DIR}/taosadapter_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
-if(TD_LINUX_64 AND JEMALLOC_ENABLED)
-    cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif()
-
 # pthread
 if(${BUILD_PTHREAD})
     cat("${TD_SUPPORT_DIR}/pthread_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
@@ -396,19 +392,6 @@ if(${BUILD_WITH_SQLITE})
     endif(NOT TD_WINDOWS)
 endif(${BUILD_WITH_SQLITE})
 
-# jemalloc
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
-    include(ExternalProject)
-    ExternalProject_Add(jemalloc
-        PREFIX        "jemalloc"
-        SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
-        BUILD_IN_SOURCE     1
-        CONFIGURE_COMMAND   ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
-        BUILD_COMMAND       ${MAKE}
-        )
-    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
-ENDIF ()
-
 # addr2line
 if(${BUILD_ADDR2LINE})
     if(NOT ${TD_WINDOWS})    

docs/en/05-get-started/01-docker.md

@@ -32,19 +32,6 @@ docker exec -it <container name> bash
 
 然后就可以执行相关的 Linux 命令操作和访问 TDengine
 
-:::info
-
-Docker 工具自身的下载请参考 [Docker 官网文档](https://docs.docker.com/get-docker/)。
-
-安装完毕后可以在命令行终端查看 Docker 版本。如果版本号正常输出，则说明 Docker 环境已经安装成功。
-
-```bash
-$ docker -v
-Docker version 20.10.3, build 48d30b5
-```
-
-:::
-
 ## 运行 TDengine CLI
 
 进入容器，执行 taos 

docs/en/14-reference/03-connector/03-connector.mdx

@@ -8,16 +8,13 @@ TDengine provides a rich set of APIs (application development interface). To fac
 
 ## Supported platforms
 
-Currently, TDengine's native interface connectors can support platforms such as X64/X86/ARM64/ARM32/MIPS/Alpha hardware platforms and Linux/Win64/Win32 development environments. The comparison matrix is as follows.
+Currently, TDengine's native interface connectors can support platforms such as X64/ARM64 hardware platforms and Linux/Win64 development environments. The comparison matrix is as follows.
 
 | **CPU** | **OS** | **JDBC** | **Python** | **Go** | **Node.js** | **C#** | **Rust** | C/C++ |
 | ------- | ------ | -------- | ---------- | ------ | ----------- | ------ | -------- | ----- |
 | **X86 64bit** | **Linux** | ● | ● | ● | ● | ● | ● | ● |
 | **X86 64bit** | **Win64** | ● | ● | ● | ● | ● | ● | ● |
-| **X86 64bit** | **Win32** | ● | ● | ● | ● | ○ | ○ | ● |
-| **X86 32bit** | **Win32** | ○ | ○ | ○ | ○ | ○ | ○ | ● |
 | **ARM64** | **Linux** | ● | ● | ● | ● | ○ | ○ | ● |
-| **MIPS** | **Linux** | ○ | ○ | ○ | ○ | ○ | ○ | ○ |
 
 Where ● means the official test verification passed, ○ means the unofficial test verification passed, -- means no assurance.
 

docs/en/14-reference/09-support-platform/index.md

@@ -5,11 +5,11 @@ description: "List of platforms supported by TDengine server, client, and connec
 
 ## List of supported platforms for TDengine server
 
-|                    | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **Other Linux** | **UOS** | **Kylin** | **Ningsi V60/V80** | **HUAWEI EulerOS** |
+|                    | **Windows server 2016/2019** | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **UOS** | **kylin** | **Ningsi V60/V80** |
-| ------------------ | ----------------- | ---------------- | ---------------- | --------------- | ------- | --------- | ------------------ | ------------------ |
+| ------------------ | ---------------------------- | ----------------- | ---------------- | ---------------- | ------- | --------- | ------------------ |
-| X64                | ●                 | ●                | ●                |                 | ●       | ●         | ●                  |                    |
+| X64                | ●                            | ●                 | ●                | ●                | ●       | ●         | ●                  |
-| Raspberry Pi ARM64 |                   |                  |                  | ●               |         |           |                    |                    |
+| Raspberry Pi ARM64 |                              |                   | ●                |                  |         |           |                    |
-| HUAWEI cloud ARM64 |                   |                  |                  |                 |         |           |                    | ●                  |
+| HUAWEI Cloud ARM64 |                              |                   |                  | ●                |         |           |                    |
 
 Note: ● means officially tested and verified, ○ means unofficially tested and verified.
 
@@ -19,15 +19,15 @@ TDengine's connector can support a wide range of platforms, including X64/X86/AR
 
 The comparison matrix is as follows.
 
-| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **MIPS**  | **Alpha** |
+| **CPU**     | **X64 64bit** | **X64 64bit** | **ARM64** |
-| ----------- | ------------- | --------- | --------- | ------------- | --------- | --------- | --------- |
+| ----------- | ------------- | ------------- | --------- |
-| **OS**      | **Linux**     | **Win64** | **Win32** | **Win32**     | **Linux** | **Linux** | **Linux** |
+| **OS**      | **Linux**     | **Win64**     | **Linux** |
-| **C/C++**   | ●             | ●         | ●         | ○             | ●         | ●         | ●         |
+| **C/C++**   | ●             | ●             | ●         |
-| **JDBC**    | ●             | ●         | ●         | ○             | ●         | ●         | ●         |
+| **JDBC**    | ●             | ●             | ●         |
-| **Python**  | ●             | ●         | ●         | ○             | ●         | ●         | --        |
+| **Python**  | ●             | ●             | ●         |
-| **Go**      | ●             | ●         | ●         | ○             | ●         | ○         | --        |
+| **Go**      | ●             | ●             | ●         |
-| **NodeJs**  | ●             | ●         | ○         | ○             | ●         | ○         | --        |
+| **NodeJs**  | ●             | ●             | ●         |
-| **C#**      | ●             | ●         | ○         | ○             | ○         | ○         | --        |
+| **C#**      | ●             | ●             | ○         |
-| **RESTful** | ●             | ●         | ●         | ●             | ●         | ●         | ●         |
+| **RESTful** | ●             | ●             | ●         |
 
 Note: ● means the official test is verified, ○ means the unofficial test is verified, -- means not verified.

docs/examples/csharp/QueryExample.cs

@@ -10,7 +10,7 @@ namespace TDengineExample
         {
             IntPtr conn = GetConnection();
             // run query
-            IntPtr res = TDengine.Query(conn, "SELECT * FROM test.meters LIMIT 2");
+            IntPtr res = TDengine.Query(conn, "SELECT * FROM meters LIMIT 2");
             if (TDengine.ErrorNo(res) != 0)
             {
                 Console.WriteLine("Failed to query since: " + TDengine.Error(res));

docs/examples/node/nativeexample/connect.js

@@ -1,20 +1,13 @@
-const { options, connect } = require("@tdengine/rest");
+//A cursor also needs to be initialized in order to interact with TDengine from Node.js.
+const taos = require("@tdengine/client");
+var conn = taos.connect({
+  host: "127.0.0.1",
+  user: "root",
+  password: "taosdata",
+  config: "/etc/taos",
+  port: 0,
+});
+var cursor = conn.cursor(); // Initializing a new cursor
 
-async function test() {
+//Close a connection
-  options.path = "/rest/sql";
+conn.close();
-  options.host = "localhost";
-  let conn = connect(options);
-  let cursor = conn.cursor();
-  try {
-    let res = await cursor.query("SELECT server_version()");
-    res.toString();
-  } catch (err) {
-    console.log(err);
-  }
-}
-test();
-
-// output:
-// server_version() |
-// ===================
-// 3.0.0.0          |

docs/examples/node/restexample/connect.js

@@ -1,7 +1,7 @@
 const { options, connect } = require("@tdengine/rest");
 
 async function test() {
-  options.path = "/rest/sqlt";
+  options.path = "/rest/sql";
   options.host = "localhost";
   let conn = connect(options);
   let cursor = conn.cursor();

docs/examples/python/tmq_example.py

@@ -0,0 +1,59 @@
+import taos
+from taos.tmq import *
+
+conn = taos.connect()
+
+# create database
+conn.execute("drop database if exists py_tmq")
+conn.execute("create database if not exists py_tmq vgroups 2")
+
+# create table and stables
+conn.select_db("py_tmq")
+conn.execute("create stable if not exists stb1 (ts timestamp, c1 int, c2 float, c3 binary(10)) tags(t1 int)")
+conn.execute("create table if not exists tb1 using stb1 tags(1)")
+conn.execute("create table if not exists tb2 using stb1 tags(2)")
+conn.execute("create table if not exists tb3 using stb1 tags(3)")
+
+# create topic
+conn.execute("drop topic if exists topic_ctb_column")
+conn.execute("create topic if not exists topic_ctb_column as select ts, c1, c2, c3 from stb1")
+
+# set consumer configure options
+conf = TaosTmqConf()
+conf.set("group.id", "tg2")
+conf.set("td.connect.user", "root")
+conf.set("td.connect.pass", "taosdata")
+conf.set("enable.auto.commit", "true")
+conf.set("msg.with.table.name", "true")
+
+def tmq_commit_cb_print(tmq, resp, offset, param=None):
+    print(f"commit: {resp}, tmq: {tmq}, offset: {offset}, param: {param}")
+    
+conf.set_auto_commit_cb(tmq_commit_cb_print, None)
+
+# build consumer
+tmq = conf.new_consumer()
+
+# build topic list
+topic_list = TaosTmqList()
+topic_list.append("topic_ctb_column")
+
+# subscribe consumer
+tmq.subscribe(topic_list)
+
+# check subscriptions
+sub_list = tmq.subscription()
+print("subscribed topics: ",sub_list)
+
+# start subscribe
+while 1:
+    res = tmq.poll(1000)
+    if res:
+        topic = res.get_topic_name()
+        vg = res.get_vgroup_id()
+        db = res.get_db_name()
+        print(f"topic: {topic}\nvgroup id: {vg}\ndb: {db}")
+        for row in res:
+            print(row)
+            tb = res.get_table_name()
+            print(f"from table: {tb}")

docs/zh/05-get-started/01-docker.md

@@ -3,7 +3,7 @@ sidebar_label: Docker
 title: 通过 Docker 快速体验 TDengine
 ---
 :::info
-如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装.
+如果您希望为 TDengine 贡献代码或对内部技术实现感兴趣，请参考[TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装.
 :::
 
 本节首先介绍如何通过 Docker 快速体验 TDengine，然后介绍如何在 Docker 环境下体验 TDengine 的写入和查询功能。
@@ -32,18 +32,7 @@ docker exec -it <container name> bash
 
 然后就可以执行相关的 Linux 命令操作和访问 TDengine
 
-:::info
+注: Docker 工具自身的下载和使用请参考 [Docker 官网文档](https://docs.docker.com/get-docker/)。
-
-Docker 工具自身的下载请参考 [Docker 官网文档](https://docs.docker.com/get-docker/)。
-
-安装完毕后可以在命令行终端查看 Docker 版本。如果版本号正常输出，则说明 Docker 环境已经安装成功。
-
-```bash
-$ docker -v
-Docker version 20.10.3, build 48d30b5
-```
-
-:::
 
 ## 运行 TDengine CLI
 

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

@@ -46,8 +46,8 @@ apt-get 方式只适用于 Debian 或 Ubuntu 系统
 </TabItem>
 <TabItem label="Deb 安装" value="debinst">
 
-1、从官网下载获得 deb 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.deb；
+1. 从 [发布历史页面](../../releases) 下载获得 deb 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.deb；
-2、进入到 TDengine-server-3.0.0.0-Linux-x64.deb 安装包所在目录，执行如下的安装命令：
+2. 进入到 TDengine-server-3.0.0.0-Linux-x64.deb 安装包所在目录，执行如下的安装命令：
 
 ```bash
 sudo dpkg -i TDengine-server-3.0.0.0-Linux-x64.deb
@@ -57,8 +57,8 @@ sudo dpkg -i TDengine-server-3.0.0.0-Linux-x64.deb
 
 <TabItem label="RPM 安装" value="rpminst">
 
-1、从官网下载获得 rpm 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.rpm；
+1. 从 [发布历史页面](../../releases) 下载获得 rpm 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.rpm；
-2、进入到 TDengine-server-3.0.0.0-Linux-x64.rpm 安装包所在目录，执行如下的安装命令：
+2. 进入到 TDengine-server-3.0.0.0-Linux-x64.rpm 安装包所在目录，执行如下的安装命令：
 
 ```bash
 sudo rpm -ivh TDengine-server-3.0.0.0-Linux-x64.rpm
@@ -68,8 +68,8 @@ sudo rpm -ivh TDengine-server-3.0.0.0-Linux-x64.rpm
 
 <TabItem label="tar.gz 安装" value="tarinst">
 
-1、从官网下载获得 tar.gz 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.tar.gz；
+1. 从 [发布历史页面](../../releases) 下载获得 tar.gz 安装包，例如 TDengine-server-3.0.0.0-Linux-x64.tar.gz；
-2、进入到 TDengine-server-3.0.0.0-Linux-x64.tar.gz 安装包所在目录，先解压文件后，进入子目录，执行其中的 install.sh 安装脚本：
+2. 进入到 TDengine-server-3.0.0.0-Linux-x64.tar.gz 安装包所在目录，先解压文件后，进入子目录，执行其中的 install.sh 安装脚本：
 
 ```bash
 tar -zxvf TDengine-server-3.0.0.0-Linux-x64.tar.gz
@@ -89,7 +89,9 @@ install.sh 安装脚本在执行过程中，会通过命令行交互界面询问
 </TabItem>
 
 <TabItem label="Windows 安装" value="windows">
-TODO
+
+1. 从 [发布历史页面](../../releases) 下载获得 exe 安装程序，例如 TDengine-server-3.0.0.0-Windows-x64.exe；
+2. 运行 TDengine-server-3.0.0.0-Windows-x64.exe 来安装 TDengine。
 
 </TabItem>
 </Tabs>
@@ -152,14 +154,14 @@ systemctl 命令汇总：
 
 <TabItem label="Windows 系统" value="windows">
 
-TODO
+安装后，在 C:\TDengine 目录下，运行 taosd.exe 来启动 TDengine 服务进程。
 
 </TabItem>
 </Tabs>
 
 ## TDengine 命令行 (CLI)
 
-为便于检查 TDengine 的状态，执行数据库 (Database) 的各种即席(Ad Hoc)查询，TDengine 提供一命令行应用程序(以下简称为 TDengine CLI) taos。要进入 TDengine 命令行，您只要在安装有 TDengine 的 Linux 终端执行 `taos` 即可。
+为便于检查 TDengine 的状态，执行数据库 (Database) 的各种即席(Ad Hoc)查询，TDengine 提供一命令行应用程序(以下简称为 TDengine CLI) taos。要进入 TDengine 命令行，您只要在安装有 TDengine 的 Linux 终端执行 `taos` 即可，也可以在安装有 TDengine 的 Windows 终端的 C:\TDengine 目录下，运行 taos.exe 来启动 TDengine 命令行。
 
 ```bash
 taos

docs/zh/07-develop/04-query-data/index.mdx

@@ -43,7 +43,7 @@ Query OK, 2 row(s) in set (0.001100s)
 
 为满足物联网场景的需求，TDengine 支持几个特殊的函数，比如 twa(时间加权平均)，spread (最大值与最小值的差)，last_row(最后一条记录)等，更多与物联网场景相关的函数将添加进来。
 
-具体的查询语法请看 [TAOS SQL 的数据查询](/taos-sql/select) 章节。
+具体的查询语法请看 [TAOS SQL 的数据查询](../../taos-sql/select) 章节。
 
 ## 多表聚合查询
 
@@ -74,7 +74,7 @@ taos> SELECT count(*), max(current) FROM meters where groupId = 2 and ts > now -
 Query OK, 1 row(s) in set (0.002136s)
 ```
 
-在 [TAOS SQL 的数据查询](/taos-sql/select) 一章，查询类操作都会注明是否支持超级表。
+在 [TAOS SQL 的数据查询](../../taos-sql/select) 一章，查询类操作都会注明是否支持超级表。
 
 ## 降采样查询、插值
 
@@ -121,7 +121,7 @@ Query OK, 5 row(s) in set (0.001521s)
 
 如果一个时间间隔里，没有采集的数据，TDengine 还提供插值计算的功能。
 
-语法规则细节请见 [TAOS SQL 的按时间窗口切分聚合](/taos-sql/interval) 章节。
+语法规则细节请见 [TAOS SQL 的按时间窗口切分聚合](../../taos-sql/distinguished) 章节。
 
 ## 示例代码
 

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

@@ -22,107 +22,84 @@ stream_options: {
 
 ## 示例一
 
-企业电表的数据经常都是成百上千亿条的，那么想要将这些分散、凌乱的数据清洗或转换都需要比较长的时间，很难做到高效性和实时性，以下例子中，通过流计算可以将过去 12 小时电表电压大于 220V 的数据清洗掉，然后以小时为窗口整合并计算出每个窗口中电流的最大值，并将结果输出到指定的数据表中。
+企业电表的数据经常都是成百上千亿条的，那么想要将这些分散、凌乱的数据清洗或转换都需要比较长的时间，很难做到高效性和实时性，以下例子中，通过流计算可以将电表电压大于 220V 的数据清洗掉，然后以 5 秒为窗口整合并计算出每个窗口中电流的最大值，最后将结果输出到指定的数据表中。
 
 ### 创建 DB 和原始数据表
 
 首先准备数据，完成建库、建一张超级表和多张子表操作
 
 ```sql
-drop database if exists stream_db;
+DROP DATABASE IF EXISTS power;
-create database stream_db;
+CREATE DATABASE power;
+USE power;
 
-create stable stream_db.meters (ts timestamp, current float, voltage int) TAGS (location varchar(64), groupId int);
+CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);
 
-create table stream_db.d1001 using stream_db.meters tags("beijing", 1);
+CREATE TABLE d1001 USING meters TAGS ("California.SanFrancisco", 2);
-create table stream_db.d1002 using stream_db.meters tags("guangzhou", 2);
+CREATE TABLE d1002 USING meters TAGS ("California.SanFrancisco", 3);
-create table stream_db.d1003 using stream_db.meters tags("shanghai", 3);
+CREATE TABLE d1003 USING meters TAGS ("California.LosAngeles", 2);
+CREATE TABLE d1004 USING meters TAGS ("California.LosAngeles", 3);
 ```
 
 ### 创建流
 
 ```sql
-create stream stream1 into stream_db.stream1_output_stb as select _wstart as start, _wend as end, max(current) as max_current from stream_db.meters where voltage <= 220 and ts > now - 12h interval (1h);
+create stream current_stream into current_stream_output_stb as select _wstart as start, _wend as end, max(current) as max_current from meters where voltage <= 220 interval (5s);
 ```
 
 ### 写入数据
 ```sql
-insert into stream_db.d1001 values(now-14h, 10.3, 210);
+insert into d1001 values("2018-10-03 14:38:05.000", 10.30000, 219, 0.31000);
-insert into stream_db.d1001 values(now-13h, 13.5, 216);
+insert into d1001 values("2018-10-03 14:38:15.000", 12.60000, 218, 0.33000);
-insert into stream_db.d1001 values(now-12h, 12.5, 219);
+insert into d1001 values("2018-10-03 14:38:16.800", 12.30000, 221, 0.31000);
-insert into stream_db.d1002 values(now-11h, 14.7, 221);
+insert into d1002 values("2018-10-03 14:38:16.650", 10.30000, 218, 0.25000);
-insert into stream_db.d1002 values(now-10h, 10.5, 218);
+insert into d1003 values("2018-10-03 14:38:05.500", 11.80000, 221, 0.28000);
-insert into stream_db.d1002 values(now-9h, 11.2, 220);
+insert into d1003 values("2018-10-03 14:38:16.600", 13.40000, 223, 0.29000);
-insert into stream_db.d1003 values(now-8h, 11.5, 217);
+insert into d1004 values("2018-10-03 14:38:05.000", 10.80000, 223, 0.29000);
-insert into stream_db.d1003 values(now-7h, 12.3, 227);
+insert into d1004 values("2018-10-03 14:38:06.500", 11.50000, 221, 0.35000);
-insert into stream_db.d1003 values(now-6h, 12.3, 215);
 ```
 
 ### 查询以观查结果
+
 ```sql
-taos> select * from stream_db.stream1_output_stb;
+taos> select start, end, max_current from current_stream_output_stb;
-          start          |           end           |     max_current      |       group_id        |
+          start          |           end           |     max_current      |
-===================================================================================================
+===========================================================================
- 2022-08-09 14:00:00.000 | 2022-08-09 15:00:00.000 |             10.50000 |                     0 |
+ 2018-10-03 14:38:05.000 | 2018-10-03 14:38:10.000 |             10.30000 |
- 2022-08-09 15:00:00.000 | 2022-08-09 16:00:00.000 |             11.20000 |                     0 |
+ 2018-10-03 14:38:15.000 | 2018-10-03 14:38:20.000 |             12.60000 |
- 2022-08-09 16:00:00.000 | 2022-08-09 17:00:00.000 |             11.50000 |                     0 |
+Query OK, 2 rows in database (0.018762s)
- 2022-08-09 18:00:00.000 | 2022-08-09 19:00:00.000 |             12.30000 |                     0 |
-Query OK, 4 rows in database (0.012033s)
 ```
 
 ## 示例二
-某运营商平台要采集机房所有服务器的系统资源指标，包含 cpu、内存、网络延迟等，采集后需要对数据进行四舍五入运算，将地域和服务器名以下划线拼接，然后将结果按时间排序并以服务器名分组输出到新的数据表中。
+
+依然以示例一中的数据为基础，我们已经采集到了每个智能电表的电流和电压数据，现在需要求出有功功率和无功功率，并将地域和电表名以符号 "." 拼接，然后以电表名称分组输出到新的数据表中。
 
 ### 创建 DB 和原始数据表
-首先准备数据，完成建库、建一张超级表和多张子表操作
 
-```sql
+参考示例一 [创建 DB 和原始数据表](#创建-db-和原始数据表)
-drop database if exists stream_db;
-create database stream_db;
-
-create stable stream_db.idc (ts timestamp, cpu float, mem float, latency float) TAGS (location varchar(64), groupId int);
-
-create table stream_db.server01 using stream_db.idc tags("beijing", 1);
-create table stream_db.server02 using stream_db.idc tags("shanghai", 2);
-create table stream_db.server03 using stream_db.idc tags("beijing", 2);
-create table stream_db.server04 using stream_db.idc tags("tianjin", 3);
-create table stream_db.server05 using stream_db.idc tags("shanghai", 1);
-```
 
 ### 创建流
 
 ```sql
-create stream stream2 into stream_db.stream2_output_stb as select ts, concat_ws("_", location, tbname) as server_location, round(cpu) as cpu, round(mem) as mem, round(latency) as latency from stream_db.idc partition by tbname order by ts;
+create stream power_stream into power_stream_output_stb as select ts, concat_ws(".", location, tbname) as meter_location, current*voltage*cos(phase) as active_power, current*voltage*sin(phase) as reactive_power from meters partition by tbname;
 ```
 
 ### 写入数据
-```sql
+
-insert into stream_db.server01 values(now-14h, 50.9, 654.8, 23.11);
+参考示例一 [写入数据](#写入数据)
-insert into stream_db.server01 values(now-13h, 13.5, 221.2, 11.22);
+
-insert into stream_db.server02 values(now-12h, 154.7, 218.3, 22.33);
-insert into stream_db.server02 values(now-11h, 120.5, 111.5, 5.55);
-insert into stream_db.server03 values(now-10h, 101.5, 125.6, 5.99);
-insert into stream_db.server03 values(now-9h, 12.3, 165.6, 6.02);
-insert into stream_db.server04 values(now-8h, 160.9, 120.7, 43.51);
-insert into stream_db.server04 values(now-7h, 240.9, 520.7, 54.55);
-insert into stream_db.server05 values(now-6h, 190.9, 320.7, 55.43);
-insert into stream_db.server05 values(now-5h, 110.9, 600.7, 35.54);
-```
 ### 查询以观查结果
 ```sql
-taos> select ts, server_location, cpu, mem, latency from stream_db.stream2_output_stb;
+taos> select ts, meter_location, active_power, reactive_power from power_stream_output_stb;
-           ts            |        server_location         |         cpu          |         mem          |       latency        |
+           ts            |         meter_location         |       active_power        |      reactive_power       |
-================================================================================================================================
+===================================================================================================================
- 2022-08-09 21:24:56.785 | beijing_server01               |             51.00000 |            655.00000 |             23.00000 |
+ 2018-10-03 14:38:05.000 | California.LosAngeles.d1004    |            2307.834596289 |             688.687331847 |
- 2022-08-09 22:24:56.795 | beijing_server01               |             14.00000 |            221.00000 |             11.00000 |
+ 2018-10-03 14:38:06.500 | California.LosAngeles.d1004    |            2387.415754896 |             871.474763418 |
- 2022-08-09 23:24:56.806 | shanghai_server02              |            155.00000 |            218.00000 |             22.00000 |
+ 2018-10-03 14:38:05.500 | California.LosAngeles.d1003    |            2506.240411679 |             720.680274962 |
- 2022-08-10 00:24:56.815 | shanghai_server02              |            121.00000 |            112.00000 |              6.00000 |
+ 2018-10-03 14:38:16.600 | California.LosAngeles.d1003    |            2863.424274422 |             854.482390839 |
- 2022-08-10 01:24:56.826 | beijing_server03               |            102.00000 |            126.00000 |              6.00000 |
+ 2018-10-03 14:38:05.000 | California.SanFrancisco.d1001  |            2148.178871730 |             688.120784090 |
- 2022-08-10 02:24:56.838 | beijing_server03               |             12.00000 |            166.00000 |              6.00000 |
+ 2018-10-03 14:38:15.000 | California.SanFrancisco.d1001  |            2598.589176205 |             890.081451418 |
- 2022-08-10 03:24:56.846 | tianjin_server04               |            161.00000 |            121.00000 |             44.00000 |
+ 2018-10-03 14:38:16.800 | California.SanFrancisco.d1001  |            2588.728381186 |             829.240910475 |
- 2022-08-10 04:24:56.853 | tianjin_server04               |            241.00000 |            521.00000 |             55.00000 |
+ 2018-10-03 14:38:16.650 | California.SanFrancisco.d1002  |            2175.595991997 |             555.520860397 |
- 2022-08-10 05:24:56.866 | shanghai_server05              |            191.00000 |            321.00000 |             55.00000 |
+Query OK, 8 rows in database (0.014753s)
- 2022-08-10 06:24:57.301 | shanghai_server05              |            111.00000 |            601.00000 |             36.00000 |
-Query OK, 10 rows in database (0.022950s)
 ```
-

docs/zh/07-develop/07-tmq.md

@@ -4,6 +4,17 @@ description: "数据订阅与推送服务。写入到 TDengine 中的时序数
 title: 数据订阅
 ---
 
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+import Java from "./_sub_java.mdx";
+import Python from "./_sub_python.mdx";
+import Go from "./_sub_go.mdx";
+import Rust from "./_sub_rust.mdx";
+import Node from "./_sub_node.mdx";
+import CSharp from "./_sub_cs.mdx";
+import CDemo from "./_sub_c.mdx";
+
+
 为了帮助应用实时获取写入 TDengine 的数据，或者以事件到达顺序处理数据，TDengine提供了类似消息队列产品的数据订阅、消费接口。这样在很多场景下，采用 TDengine 的时序数据处理系统不再需要集成消息队列产品，比如 kafka, 从而简化系统设计的复杂度，降低运营维护成本。
 
 与 kafka 一样，你需要定义 topic, 但 TDengine 的 topic 是基于一个已经存在的超级表、子表或普通表的查询条件，即一个 SELECT 语句。你可以使用 SQL 对标签、表名、列、表达式等条件进行过滤，以及对数据进行标量函数与 UDF 计算（不包括数据聚合）。与其他消息队列软件相比，这是 TDengine 数据订阅功能的最大的优势，它提供了更大的灵活性，数据的颗粒度可以由应用随时调整，而且数据的过滤与预处理交给 TDengine，而不是应用完成，有效的减少传输的数据量与应用的复杂度。
@@ -51,7 +62,7 @@ DLL_EXPORT void           tmq_conf_destroy(tmq_conf_t *conf);
 DLL_EXPORT void           tmq_conf_set_auto_commit_cb(tmq_conf_t *conf, tmq_commit_cb *cb, void *param);
 ```
 
-这些 API 的文档请见 [C/C++ Connector](/reference/connector/cpp)，下面介绍一下它们的具体用法（超级表和子表结构请参考“数据建模”一节），完整的示例代码可以在 [tmq.c](https://github.com/taosdata/TDengine/blob/3.0/examples/c/tmq.c) 看到。
+这些 API 的文档请见 [C/C++ Connector](/reference/connector/cpp)，下面介绍一下它们的具体用法（超级表和子表结构请参考“数据建模”一节），完整的示例代码请见下面C语言的示例代码。
 
 ## 写入数据
 
@@ -63,12 +74,8 @@ create database tmqdb;
 create table tmqdb.stb (ts timestamp, c1 int, c2 float, c3 varchar(16) tags(t1 int, t3 varchar(16));
 create table tmqdb.ctb0 using tmqdb.stb tags(0, "subtable0");
 create table tmqdb.ctb1 using tmqdb.stb tags(1, "subtable1");       
-create table tmqdb.ctb2 using tmqdb.stb tags(2, "subtable2");
-create table tmqdb.ctb3 using tmqdb.stb tags(3, "subtable3");       
 insert into tmqdb.ctb0 values(now, 0, 0, 'a0')(now+1s, 0, 0, 'a00');
 insert into tmqdb.ctb1 values(now, 1, 1, 'a1')(now+1s, 11, 11, 'a11');
-insert into tmqdb.ctb2 values(now, 2, 2, 'a1')(now+1s, 22, 22, 'a22');
-insert into tmqdb.ctb3 values(now, 3, 3, 'a1')(now+1s, 33, 33, 'a33');
 ```
 
 ## 创建topic：
@@ -130,7 +137,6 @@ TMQ支持多种订阅类型：
 
   tmq_t* tmq = tmq_consumer_new(conf, NULL, 0);
   tmq_conf_destroy(conf);
-  return tmq;
 ```
 
 上述配置中包括consumer group ID，如果多个 consumer 指定的 consumer group ID一样，则自动形成一个consumer group，共享消费进度。
@@ -143,66 +149,23 @@ TMQ支持多种订阅类型：
 ```sql
   tmq_list_t* topicList = tmq_list_new();
   tmq_list_append(topicList, "topicName");
-  return topicList;
 ```
 
 ## 启动订阅并开始消费
 
-```sql
+```
   /* 启动订阅 */
   tmq_subscribe(tmq, topicList);
   tmq_list_destroy(topicList);
   
   /* 循环poll消息 */
-  int32_t totalRows = 0;
-  int32_t msgCnt = 0;
-  int32_t timeOut = 5000;
   while (running) {
     TAOS_RES* tmqmsg = tmq_consumer_poll(tmq, timeOut);
-    if (tmqmsg) {
+    msg_process(tmqmsg);
-      msgCnt++;
-      totalRows += msg_process(tmqmsg);
-      taos_free_result(tmqmsg);
-    } else {
-      break;
   }  
-  }
-  
-  fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
 ```
 
-这里是一个 **while** 循环，每调用一次tmq_consumer_poll()，获取一个消息，该消息与普通查询返回的结果集完全相同，可以使用相同的解析API完成消息内容的解析：
+这里是一个 **while** 循环，每调用一次tmq_consumer_poll()，获取一个消息，该消息与普通查询返回的结果集完全相同，可以使用相同的解析API完成消息内容的解析。
-
-```sql
- static int32_t msg_process(TAOS_RES* msg) {
-  char buf[1024];
-  int32_t rows = 0;
-
-  const char* topicName = tmq_get_topic_name(msg);
-  const char* dbName    = tmq_get_db_name(msg);
-  int32_t     vgroupId  = tmq_get_vgroup_id(msg);
-
-  printf("topic: %s\n", topicName);
-  printf("db: %s\n", dbName);
-  printf("vgroup id: %d\n", vgroupId);
-
-  while (1) {
-    TAOS_ROW row = taos_fetch_row(msg);
-    if (row == NULL) break;
-
-    TAOS_FIELD* fields      = taos_fetch_fields(msg);
-    int32_t     numOfFields = taos_field_count(msg);
-    int32_t*    length      = taos_fetch_lengths(msg);
-    int32_t     precision   = taos_result_precision(msg);
-    const char* tbName      = tmq_get_table_name(msg);
-    rows++; 
-    taos_print_row(buf, row, fields, numOfFields);
-    printf("row content from %s: %s\n", (tbName != NULL ? tbName : "null table"), buf);
-  }
-
-  return rows;
-}
-```
 
 ## 结束消费
 
@@ -243,4 +206,44 @@ TMQ支持多种订阅类型：
   show subscriptions;
 ```
 
+## 示例代码
 
+本节展示各种语言的示例代码。
+
+<Tabs>
+<TabItem label="C" value="c">
+
+```c
+{{#include examples/c/tmq.c}}
+```
+</TabItem>
+
+<TabItem label="Java" value="java">
+    <Java />
+</TabItem>
+
+<TabItem label="Go" value="Go">
+   <Go/>
+</TabItem>
+
+<TabItem label="Rust" value="Rust">
+    <Rust />
+</TabItem>
+
+<TabItem label="Python" value="Python">
+
+```python
+{{#include docs/examples/python/tmq_example.py}}
+```
+
+</TabItem>
+
+<TabItem label="Node.JS" value="Node.JS">
+   <Node/>
+</TabItem>
+
+<TabItem label="C#" value="C#">
+   <CSharp/>
+</TabItem>
+
+</Tabs>

docs/zh/07-develop/index.md

@@ -7,7 +7,7 @@ title: 开发指南
 2. 根据自己的应用场景，确定数据模型。根据数据特征，决定建立一个还是多个库；分清静态标签、采集量，建立正确的超级表，建立子表。
 3. 决定插入数据的方式。TDengine支持使用标准的SQL写入，但同时也支持schemaless模式写入，这样不用手工建表，可以将数据直接写入。
 4. 根据业务要求，看需要撰写哪些SQL查询语句。
-5. 如果你要基于时序数据做实时的统计分析，包括各种监测看板，那么建议你采用TDengine的连续查询功能，而不用上线Spark, Flink等复杂的流式计算系统。
+5. 如果你要基于时序数据做轻量级的实时统计分析，包括各种监测看板，那么建议你采用 TDengine 3.0 的流式计算功能，而不用额外部署 Spark, Flink 等复杂的流式计算系统。
 6. 如果你的应用有模块需要消费插入的数据，希望有新的数据插入时，就能获取通知，那么建议你采用TDengine提供的数据订阅功能，而无需专门部署Kafka或其他消息队列软件。
 7. 在很多场景下(如车辆管理)，应用需要获取每个数据采集点的最新状态，那么建议你采用TDengine的cache功能，而不用单独部署Redis等缓存软件。
 8. 如果你发现TDengine的函数无法满足你的要求，那么你可以使用用户自定义函数来解决问题。

docs/zh/12-taos-sql/14-stream.md

@@ -26,10 +26,19 @@ subquery: SELECT [DISTINCT] select_list
     [WHERE condition]
     [PARTITION BY tag_list]
     [window_clause]
-    [group_by_clause]
 ```
 
-不支持 order_by，limit，slimit，fill 语句
+支持会话窗口、状态窗口与滑动窗口，其中，会话窗口与状态窗口搭配超级表时必须与partition by tbname一起使用
+
+```sql
+window_clause: {
+    SESSION(ts_col, tol_val)
+  | STATE_WINDOW(col)
+  | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)]
+}
+```
+
+其中，SESSION 是会话窗口，tol_val 是时间间隔的最大范围。在 tol_val 时间间隔范围内的数据都属于同一个窗口，如果连续的两条数据的时间超过 tol_val，则自动开启下一个窗口。
 
 例如，如下语句创建流式计算，同时自动创建名为 avg_vol 的超级表，此流计算以一分钟为时间窗口、30 秒为前向增量统计这些电表的平均电压，并将来自 meters 表的数据的计算结果写入 avg_vol 表，不同 partition 的数据会分别创建子表并写入不同子表。
 
@@ -88,23 +97,3 @@ T = 最新事件时间 - watermark
 2. 重新计算：从 TSDB 中重新查找对应窗口的所有数据并重新计算得到最新结果
 
 无论在哪种模式下，watermark 都应该被妥善设置，来得到正确结果（直接丢弃模式）或避免频繁触发重算带来的性能开销（重新计算模式）。
-
-## 流式计算与会话窗口（session window）
-
-```sql
-window_clause: {
-    SESSION(ts_col, tol_val)
-  | STATE_WINDOW(col)
-  | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [FILL(fill_mod_and_val)]
-}
-```
-
-其中，SESSION 是会话窗口，tol_val 是时间间隔的最大范围。在 tol_val 时间间隔范围内的数据都属于同一个窗口，如果连续的两条数据的时间超过 tol_val，则自动开启下一个窗口。
-
-## 流式计算的暂停与恢复
-
-```sql
-STOP STREAM stream_name;
-
-RESUME STREAM stream_name;
-```

docs/zh/12-taos-sql/25-grant.md

@@ -8,7 +8,7 @@ title: 权限管理
 ## 创建用户
 
 ```sql
-CREATE USER use_name PASS password;
+CREATE USER use_name PASS 'password';
 ```
 
 创建用户。

docs/zh/14-reference/03-connector/03-connector.mdx

@@ -8,18 +8,13 @@ TDengine 提供了丰富的应用程序开发接口，为了便于用户快速
 
 ## 支持的平台
 
-目前 TDengine 的原生接口连接器可支持的平台包括：X64/X86/ARM64/ARM32/MIPS/Alpha 等硬件平台，以及 Linux/Win64/Win32 等开发环境。对照矩阵如下：
+目前 TDengine 的原生接口连接器可支持的平台包括：X64/ARM64 等硬件平台，以及 Linux/Win64 等开发环境。对照矩阵如下：
 
 | **CPU**        | **OS**    | **Java** | **Python** | **Go** | **Node.js** | **C#** | **Rust** | C/C++ |
 | -------------- | --------- | -------- | ---------- | ------ | ----------- | ------ | -------- | ----- |
 | **X86 64bit**  | **Linux** | ●        | ●          | ●      | ●           | ●      | ●        | ●     |
 | **X86 64bit**  | **Win64** | ●        | ●          | ●      | ●           | ●      | ●        | ●     |
-| **X86 64bit**  | **Win32** | ●        | ●          | ●      | ●           | ○      | ○        | ●     |
-| **X86 32bit**  | **Win32** | ○        | ○          | ○      | ○           | ○      | ○        | ●     |
 | **ARM64**      | **Linux** | ●        | ●          | ●      | ●           | ○      | ○        | ●     |
-| **MIPS 龙芯**  | **Linux** | ○        | ○          | ○      | ○           | ○      | ○        | ○     |
-| **Alpha 申威** | **Linux** | ○        | ○          | --     | --          | --     | --       | ○     |
-| **X86 海光**   | **Linux** | ○        | ○          | ○      | --          | --     | --       | ○     |
 
 其中 ● 表示官方测试验证通过，○ 表示非官方测试验证通过，-- 表示未经验证。
 

docs/zh/14-reference/03-connector/java.mdx

@@ -358,7 +358,7 @@ JDBC 连接器可能报错的错误码包括 3 种：JDBC driver 本身的报错
 具体的错误码请参考：
 
 - [TDengine Java Connector](https://github.com/taosdata/taos-connector-jdbc/blob/main/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java)
-- [TDengine_ERROR_CODE](../error-code)
+<!-- - [TDengine_ERROR_CODE](../error-code) -->
 
 ### 通过参数绑定写入数据
 

docs/zh/14-reference/09-support-platform/index.md

@@ -5,11 +5,11 @@ description: "TDengine 服务端、客户端和连接器支持的平台列表"
 
 ## TDengine 服务端支持的平台列表
 
-|              | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **Other Linux** | **统信 UOS** | **银河/中标麒麟** | **凝思 V60/V80** | **华为 EulerOS** |
+|              | **Windows server 2016/2019** | **Windows 10/11** | **CentOS 7.9/8** | **Ubuntu 18/20** | **统信 UOS** | **银河/中标麒麟** | **凝思 V60/V80** |
-| ------------ | ----------------- | ---------------- | ---------------- | --------------- | ------------ | ----------------- | ---------------- | ---------------- |
+| ------------ | ---------------------------- | ----------------- | ---------------- | ---------------- | ------------ | ----------------- | ---------------- |
-| X64          | ●                 | ●                | ●                |                 | ●            | ●                 | ●                |                  |
+| X64          | ●                            | ●                 | ●                | ●                | ●            | ●                 | ●                |
-| 树莓派 ARM64 |                   |                  |                  | ●               |              |                   |                  |                  |
+| 树莓派 ARM64 |                              |                   | ●                |                  |              |                   |                  |
-| 华为云 ARM64 |                   |                  |                  |                 |              |                   |                  | ●                |
+| 华为云 ARM64 |                              |                   |                  | ●                |              |                   |                  |
 
 注： ● 表示经过官方测试验证， ○ 表示非官方测试验证。
 
@@ -19,15 +19,15 @@ description: "TDengine 服务端、客户端和连接器支持的平台列表"
 
 对照矩阵如下：
 
-| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **MIPS 龙芯** | **Alpha 申威** | **X64 海光** |
+| **CPU**     | **X64 64bit** | **X64 64bit** | **ARM64** |
-| ----------- | ------------- | --------- | --------- | ------------- | --------- | ------------- | -------------- | ------------ |
+| ----------- | ------------- | ------------- | --------- |
-| **OS**      | **Linux**     | **Win64** | **Win32** | **Win32**     | **Linux** | **Linux**     | **Linux**      | **Linux**    |
+| **OS**      | **Linux**     | **Win64**     | **Linux** |
-| **C/C++**   | ●             | ●         | ●         | ○             | ●         | ●             | ●              | ●            |
+| **C/C++**   | ●             | ●             | ●         |
-| **JDBC**    | ●             | ●         | ●         | ○             | ●         | ●             | ●              | ●            |
+| **JDBC**    | ●             | ●             | ●         |
-| **Python**  | ●             | ●         | ●         | ○             | ●         | ●             | --             | ●            |
+| **Python**  | ●             | ●             | ●         |
-| **Go**      | ●             | ●         | ●         | ○             | ●         | ○             | --             | --           |
+| **Go**      | ●             | ●             | ●         |
-| **NodeJs**  | ●             | ●         | ○         | ○             | ●         | ○             | --             | --           |
+| **NodeJs**  | ●             | ●             | ●         |
-| **C#**      | ●             | ●         | ○         | ○             | ○         | ○             | --             | --           |
+| **C#**      | ●             | ●             | ○         |
-| **RESTful** | ●             | ●         | ●         | ●             | ●         | ●             | ●              | ●            |
+| **RESTful** | ●             | ●             | ●         |
 
 注：● 表示官方测试验证通过，○ 表示非官方测试验证通过，-- 表示未经验证。

docs/zh/17-operation/01-pkg-install.md

@@ -86,7 +86,7 @@ TDengine is removed successfully!
 
 </TabItem>
 <TabItem label="Windows 卸载" value="windows">
-TODO
+在 C:\TDengine 目录下，通过运行 unins000.exe 卸载程序来卸载 TDengine。
 </TabItem>
 </Tabs>
 

docs/zh/21-tdinternal/01-arch.md

@@ -162,8 +162,6 @@ Vnode 会保持一个数据版本号（version），对内存数据进行持久
 
 一个 vnode 启动时，角色（leader、follower）是不定的，数据是处于未同步状态，它需要与虚拟节点组内其他节点建立 TCP 连接，并互相交换 status，按照标准的 raft 一致性算法完成选主。
 
-更多的关于数据复制的流程，请见[《TDengine 3.0 数据复制模块设计》](/tdinternal/replica/)。
-
 ### 同步复制
 
 对于数据一致性要求更高的场景，异步数据复制提供的最终一致性无法满足要求。因此 TDengine 提供同步复制的机制供用户选择。在创建数据库时，除指定副本数 replica 之外，用户还需要指定新的参数 strict。如果 strict 等于 1，它表示每次 leader 转发给副本时，需要等待半数以上副本达成一致后，才能通知应用，数据在 follower 已经写入成功。如果在一定的时间内，得不到半数以上副本的确认，leader vnode 将返回错误给应用。
@@ -241,15 +239,16 @@ dataDir /mnt/data6 2 0
 
 ## 数据查询
 
-TDengine 提供了多种多样针对表和超级表的查询处理功能，除了常规的聚合查询之外，还提供针对时序数据的窗口查询、统计聚合等功能。TDengine 的查询处理需要客户端、vnode、mnode 节点协同完成。
+TDengine 提供了多种多样针对表和超级表的查询处理功能，除了常规的聚合查询之外，还提供针对时序数据的窗口查询、统计聚合等功能。TDengine 的查询处理需要客户端、vnode、qnode、mnode 节点协同完成，一个复杂的超级表聚合查询可能需要多个 vnode 和 qnode 节点公共分担查询和计算任务。
 
-### 单表查询
+### 查询基本流程
 
-SQL 语句的解析和校验工作在客户端完成。解析 SQL 语句并生成抽象语法树（Abstract Syntax Tree，AST），然后对其进行校验和检查。以及向管理节点（mnode）请求查询中指定表的元数据信息（table metadata）。
+1. 客户端解析输入 SQL 语句并生成抽象语法树（Abstract Syntax Tree，AST），然后根据元数据信息对其进行校验和检查。在此期间，元数据管理模块（Catalog）会向管理节点（mnode）或 vnode 请求查询中指定库和表的元数据信息（table metadata）。
-
+2. 在通过校验检查后，客户端将生成分布式的查询计划并对查询计划进行优化处理。
-根据元数据信息中的 End Point 信息，将查询请求序列化后发送到该表所在的数据节点（dnode）。dnode 接收到查询请求后，识别出该查询请求指向的虚拟节点（vnode），将消息转发到 vnode 的查询执行队列。vnode 的查询执行线程建立基础的查询执行环境，并立即返回该查询请求，同时开始执行该查询。
+3. 客户端根据配置的查询策略进行任务调度处理，一个查询子任务会根据其数据亲缘关系或负载信息调度到某个 vnode 或 qnode 所属的数据节点（dnode）进行处理。
-
+4. dnode 接收到查询请求后，识别出该查询请求指向的虚拟节点（vnode）或查询节点（qnode），将消息转发到 vnode 或 qnode 的查询执行队列。
-客户端在获取查询结果的时候，dnode 的查询执行队列中的工作线程会等待 vnode 执行线程执行完成，才能将查询结果返回到请求的客户端。
+5. vnode 或 qnode 的查询执行线程建立基础的查询执行环境，并立即执行该查询，在得到部分可获取查询结果后通知客户端。
+6. 客户端将启动下级查询任务或直接获取查询结果。
 
 ### 按时间轴聚合、降采样、插值
 
@@ -279,12 +278,14 @@ TDengine 对每个数据采集点单独建表，但在实际应用中经常需
 
 <center> 图 5 多表聚合查询原理图  </center>
 
-1. 应用将一个查询条件发往系统；
+1. 客户端从 mnode 获取库和表的元数据信息；
-2. taosc 将超级表的名字发往 meta node（管理节点）；
+2. mnode 返回请求的元数据信息；
-3. 管理节点将超级表所拥有的 vnode 列表发回 taosc；
+3. 客户端向超级表所属的每个 vnode 发送查询请求；
-4. taosc 将计算的请求连同标签过滤条件发往这些 vnode 对应的多个数据节点；
+4. vnode 启动本地查询，在获得查询结果后返回查询响应；
-5. 每个 vnode 先在内存里查找出自己节点里符合标签过滤条件的表的集合，然后扫描存储的时序数据，完成相应的聚合计算，将结果返回给 taosc；
+5. 客户端向聚合节点 （在本例中为 qnode）发送查询请求；
-6. taosc 将多个数据节点返回的结果做最后的聚合，将其返回给应用。
+6. qnode 向每个 vnode 节点发送数据请求消息来拉取数据；
+7. vnode 返回本节点的查询计算结果；
+8. qnode 完成多节点数据聚合后将最终查询结果返回给客户端；
 
 由于 TDengine 在 vnode 内将标签数据与时序数据分离存储，通过在内存里过滤标签数据，先找到需要参与聚合操作的表的集合，将需要扫描的数据集大幅减少，大幅提升聚合计算速度。同时，由于数据分布在多个 vnode/dnode，聚合计算操作在多个 vnode 里并发进行，又进一步提升了聚合的速度。 对普通表的聚合函数以及绝大部分操作都适用于超级表，语法完全一样，细节请看 TAOS SQL。
 

include/common/tmsg.h

@@ -1681,6 +1681,7 @@ typedef struct {
 #define STREAM_TRIGGER_AT_ONCE        1
 #define STREAM_TRIGGER_WINDOW_CLOSE   2
 #define STREAM_TRIGGER_MAX_DELAY      3
+#define STREAM_DEFAULT_IGNORE_EXPIRED 0
 
 typedef struct {
   char    name[TSDB_STREAM_FNAME_LEN];

include/libs/nodes/cmdnodes.h

@@ -359,7 +359,7 @@ typedef struct SStreamOptions {
   int8_t    triggerType;
   SNode*    pDelay;
   SNode*    pWatermark;
-  bool      ignoreExpired;
+  int8_t    ignoreExpired;
 } SStreamOptions;
 
 typedef struct SCreateStreamStmt {

include/libs/nodes/plannodes.h

@@ -213,6 +213,8 @@ typedef struct SWindowLogicNode {
 typedef struct SFillLogicNode {
   SLogicNode  node;
   EFillMode   mode;
+  SNodeList*  pFillExprs;
+  SNodeList*  pNotFillExprs;
   SNode*      pWStartTs;
   SNode*      pValues;  // SNodeListNode
   STimeWindow timeRange;
@@ -440,9 +442,10 @@ typedef SIntervalPhysiNode SStreamSemiIntervalPhysiNode;
 typedef struct SFillPhysiNode {
   SPhysiNode  node;
   EFillMode   mode;
+  SNodeList*  pFillExprs;
+  SNodeList*  pNotFillExprs;
   SNode*      pWStartTs;  // SColumnNode
   SNode*      pValues;    // SNodeListNode
-  SNodeList*  pTargets;
   STimeWindow timeRange;
   EOrder      inputTsOrder;
 } SFillPhysiNode;

include/libs/nodes/querynodes.h

@@ -53,7 +53,13 @@ typedef struct SExprNode {
   bool      orderAlias;
 } SExprNode;
 
-typedef enum EColumnType { COLUMN_TYPE_COLUMN = 1, COLUMN_TYPE_TAG, COLUMN_TYPE_TBNAME } EColumnType;
+typedef enum EColumnType {
+  COLUMN_TYPE_COLUMN = 1,
+  COLUMN_TYPE_TAG,
+  COLUMN_TYPE_TBNAME,
+  COLUMN_TYPE_WINDOW_PC,
+  COLUMN_TYPE_GROUP_KEY
+} EColumnType;
 
 typedef struct SColumnNode {
   SExprNode   node;  // QUERY_NODE_COLUMN
@@ -293,6 +299,7 @@ typedef enum ESqlClause {
   SQL_CLAUSE_WHERE,
   SQL_CLAUSE_PARTITION_BY,
   SQL_CLAUSE_WINDOW,
+  SQL_CLAUSE_FILL,
   SQL_CLAUSE_GROUP_BY,
   SQL_CLAUSE_HAVING,
   SQL_CLAUSE_DISTINCT,

include/util/tdef.h

@@ -359,7 +359,7 @@ typedef enum ELogicConditionType {
 #define TSDB_DEFAULT_DB_SCHEMALESS      TSDB_DB_SCHEMALESS_OFF
 
 #define TSDB_DB_MIN_WAL_RETENTION_PERIOD     -1
-#define TSDB_DEFAULT_DB_WAL_RETENTION_PERIOD (24 * 60 * 60 * 2)
+#define TSDB_DEFAULT_DB_WAL_RETENTION_PERIOD (24 * 60 * 60 * 4)
 #define TSDB_DB_MIN_WAL_RETENTION_SIZE       -1
 #define TSDB_DEFAULT_DB_WAL_RETENTION_SIZE   -1
 #define TSDB_DB_MIN_WAL_ROLL_PERIOD          0

include/util/tsched.h

@@ -17,6 +17,7 @@
 #define _TD_UTIL_SCHED_H_
 
 #include "os.h"
+#include "tdef.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,6 +31,24 @@ typedef struct SSchedMsg {
   void *thandle;
 } SSchedMsg;
 
+
+typedef struct {
+  char          label[TSDB_LABEL_LEN];
+  tsem_t        emptySem;
+  tsem_t        fullSem;
+  TdThreadMutex queueMutex;
+  int32_t       fullSlot;
+  int32_t       emptySlot;
+  int32_t       queueSize;
+  int32_t       numOfThreads;
+  TdThread     *qthread;
+  SSchedMsg    *queue;
+  int8_t        stop;
+  void         *pTmrCtrl;
+  void         *pTimer;
+} SSchedQueue;
+
+
 /**
  * Create a thread-safe ring-buffer based task queue and return the instance. A thread
  * pool will be created to consume the messages in the queue.
@@ -38,7 +57,7 @@ typedef struct SSchedMsg {
  * @param label the label of the queue
  * @return the created queue scheduler
  */
-void *taosInitScheduler(int32_t capacity, int32_t numOfThreads, const char *label);
+void *taosInitScheduler(int32_t capacity, int32_t numOfThreads, const char *label, SSchedQueue* pSched);
 
 /**
  * Create a thread-safe ring-buffer based task queue and return the instance.

source/client/test/CMakeLists.txt

@@ -8,7 +8,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 ADD_EXECUTABLE(clientTest clientTests.cpp)
 TARGET_LINK_LIBRARIES(
         clientTest
-        PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom executor
+        os util common transport parser catalog scheduler gtest taos_static qcom executor function
 )
 
 ADD_EXECUTABLE(tmqTest tmqTest.cpp)

source/dnode/mnode/impl/inc/mndInt.h

@@ -87,10 +87,11 @@ typedef struct {
 typedef struct {
   tsem_t   syncSem;
   int64_t  sync;
-  bool     standby;
   SReplica replica;
   int32_t  errCode;
   int32_t  transId;
+  SRWLatch lock;
+  int8_t   standby;
   int8_t   leaderTransferFinish;
 } SSyncMgmt;
 

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

@@ -742,7 +742,9 @@ static int32_t mndProcessAlterMnodeReq(SRpcMsg *pReq) {
     return code;
   } else {
     pMgmt->errCode = 0;
+    taosWLockLatch(&pMgmt->lock);
     pMgmt->transId = -1;
+    taosWUnLockLatch(&pMgmt->lock);
     tsem_wait(&pMgmt->syncSem);
     mInfo("alter mnode sync result:0x%x %s", pMgmt->errCode, tstrerror(pMgmt->errCode));
     terrno = pMgmt->errCode;

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

@@ -238,7 +238,7 @@ static int32_t mndProcessRetrieveSysTableReq(SRpcMsg *pReq) {
   } else {
     memcpy(pReq->info.conn.user, TSDB_DEFAULT_USER, strlen(TSDB_DEFAULT_USER) + 1);
   }
-  if (mndCheckShowPrivilege(pMnode, pReq->info.conn.user, pShow->type, retrieveReq.db) != 0) {
+  if (retrieveReq.db[0] && mndCheckShowPrivilege(pMnode, pReq->info.conn.user, pShow->type, retrieveReq.db) != 0) {
     return -1;
   }
 

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

@@ -60,18 +60,24 @@ void mndSyncCommitMsg(struct SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbM
     sdbSetApplyInfo(pMnode->pSdb, cbMeta.index, cbMeta.term, cbMeta.lastConfigIndex);
   }
 
+  taosWLockLatch(&pMgmt->lock);
   if (transId <= 0) {
+    taosWUnLockLatch(&pMgmt->lock);
     mError("trans:%d, invalid commit msg", transId);
   } else if (transId == pMgmt->transId) {
     if (pMgmt->errCode != 0) {
-      mError("trans:%d, failed to propose since %s", transId, tstrerror(pMgmt->errCode));
+      mError("trans:%d, failed to propose since %s, post sem", transId, tstrerror(pMgmt->errCode));
+    } else {
+      mInfo("trans:%d, is proposed and post sem", transId, tstrerror(pMgmt->errCode));
     }
     pMgmt->transId = 0;
+    taosWUnLockLatch(&pMgmt->lock);
     tsem_post(&pMgmt->syncSem);
   } else {
+    taosWUnLockLatch(&pMgmt->lock);
     STrans *pTrans = mndAcquireTrans(pMnode, transId);
     if (pTrans != NULL) {
-      mDebug("trans:%d, execute in mnode which not leader", transId);
+      mInfo("trans:%d, execute in mnode which not leader", transId);
       mndTransExecute(pMnode, pTrans);
       mndReleaseTrans(pMnode, pTrans);
       // sdbWriteFile(pMnode->pSdb, SDB_WRITE_DELTA);
@@ -115,13 +121,18 @@ void mndReConfig(struct SSyncFSM *pFsm, const SRpcMsg *pMsg, SReConfigCbMeta cbM
   mInfo("trans:-1, sync reconfig is proposed, saved:%d code:0x%x, index:%" PRId64 " term:%" PRId64, pMgmt->transId,
         cbMeta.code, cbMeta.index, cbMeta.term);
 
+  taosWLockLatch(&pMgmt->lock);
   if (pMgmt->transId == -1) {
     if (pMgmt->errCode != 0) {
-      mError("trans:-1, failed to propose sync reconfig since %s", tstrerror(pMgmt->errCode));
+      mError("trans:-1, failed to propose sync reconfig since %s, post sem", tstrerror(pMgmt->errCode));
+    } else {
+      mInfo("trans:-1, sync reconfig is proposed, saved:%d code:0x%x, index:%" PRId64 " term:%" PRId64 " post sem",
+            pMgmt->transId, cbMeta.code, cbMeta.index, cbMeta.term);
     }
     pMgmt->transId = 0;
     tsem_post(&pMgmt->syncSem);
   }
+  taosWUnLockLatch(&pMgmt->lock);
 }
 
 int32_t mndSnapshotStartRead(struct SSyncFSM *pFsm, void *pParam, void **ppReader) {
@@ -168,14 +179,19 @@ void mndLeaderTransfer(struct SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cb
 
 static void mndBecomeFollower(struct SSyncFSM *pFsm) {
   SMnode *pMnode = pFsm->data;
-  mDebug("vgId:1, become follower");
+  mDebug("vgId:1, become follower and post sem");
 
-  // clear old leader resource
+  taosWLockLatch(&pMnode->syncMgmt.lock);
+  if (pMnode->syncMgmt.transId != 0) {
+    pMnode->syncMgmt.transId = 0;
+    tsem_post(&pMnode->syncMgmt.syncSem);
+  }
+  taosWUnLockLatch(&pMnode->syncMgmt.lock);
 }
 
 static void mndBecomeLeader(struct SSyncFSM *pFsm) {
-  SMnode *pMnode = pFsm->data;
   mDebug("vgId:1, become leader");
+  SMnode *pMnode = pFsm->data;
 }
 
 SSyncFSM *mndSyncMakeFsm(SMnode *pMnode) {
@@ -202,6 +218,8 @@ SSyncFSM *mndSyncMakeFsm(SMnode *pMnode) {
 
 int32_t mndInitSync(SMnode *pMnode) {
   SSyncMgmt *pMgmt = &pMnode->syncMgmt;
+  taosInitRWLatch(&pMgmt->lock);
+  pMgmt->transId = 0;
 
   SSyncInfo syncInfo = {.vgId = 1, .FpSendMsg = mndSyncSendMsg, .FpEqMsg = mndSyncEqMsg};
   snprintf(syncInfo.path, sizeof(syncInfo.path), "%s%ssync", pMnode->path, TD_DIRSEP);
@@ -230,8 +248,12 @@ int32_t mndInitSync(SMnode *pMnode) {
 
   // decrease election timer
   setPingTimerMS(pMgmt->sync, 5000);
+  setElectTimerMS(pMgmt->sync, 3000);
+  setHeartbeatTimerMS(pMgmt->sync, 500);
+  /*
     setElectTimerMS(pMgmt->sync, 600);
     setHeartbeatTimerMS(pMgmt->sync, 300);
+  */
 
   mDebug("mnode-sync is opened, id:%" PRId64, pMgmt->sync);
   return 0;
@@ -254,11 +276,21 @@ int32_t mndSyncPropose(SMnode *pMnode, SSdbRaw *pRaw, int32_t transId) {
   memcpy(req.pCont, pRaw, req.contLen);
 
   pMgmt->errCode = 0;
+  taosWLockLatch(&pMgmt->lock);
+  if (pMgmt->transId != 0) {
+    mError("trans:%d, can't be proposed since trans:%s alrady waiting for confirm", transId, pMgmt->transId);
+    taosWUnLockLatch(&pMgmt->lock);
+    terrno = TSDB_CODE_APP_NOT_READY;
+    return -1;
+  } else {
     pMgmt->transId = transId;
-  mTrace("trans:%d, will be proposed", pMgmt->transId);
+    mDebug("trans:%d, will be proposed", pMgmt->transId);
+    taosWUnLockLatch(&pMgmt->lock);
+  }
 
   const bool isWeak = false;
   int32_t    code = syncPropose(pMgmt->sync, &req, isWeak);
+
   if (code == 0) {
     tsem_wait(&pMgmt->syncSem);
   } else if (code == -1 && terrno == TSDB_CODE_SYN_NOT_LEADER) {
@@ -286,10 +318,12 @@ void mndSyncStart(SMnode *pMnode) {
 }
 
 void mndSyncStop(SMnode *pMnode) {
+  taosWLockLatch(&pMnode->syncMgmt.lock);
   if (pMnode->syncMgmt.transId != 0) {
     pMnode->syncMgmt.transId = 0;
     tsem_post(&pMnode->syncMgmt.syncSem);
   }
+  taosWUnLockLatch(&pMnode->syncMgmt.lock);
 }
 
 bool mndIsMaster(SMnode *pMnode) {

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

@@ -308,7 +308,8 @@ struct SVnode {
   SSink*        pSink;
   tsem_t        canCommit;
   int64_t       sync;
-  int32_t       blockCount;
+  TdThreadMutex lock;
+  bool          blocked;
   bool          restored;
   tsem_t        syncSem;
   SQHandle*     pQuery;

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

@@ -85,7 +85,8 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
   pVnode->state.commitTerm = info.state.commitTerm;
   pVnode->pTfs = pTfs;
   pVnode->msgCb = msgCb;
-  pVnode->blockCount = 0;
+  taosThreadMutexInit(&pVnode->lock, NULL);
+  pVnode->blocked = false;
 
   tsem_init(&pVnode->syncSem, 0, 0);
   tsem_init(&(pVnode->canCommit), 0, 1);
@@ -199,6 +200,7 @@ void vnodeClose(SVnode *pVnode) {
     tsem_destroy(&pVnode->syncSem);
     taosThreadCondDestroy(&pVnode->poolNotEmpty);
     taosThreadMutexDestroy(&pVnode->mutex);
+    taosThreadMutexDestroy(&pVnode->lock);
     taosMemoryFree(pVnode);
   }
 }

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

@@ -28,20 +28,28 @@ static inline bool vnodeIsMsgWeak(tmsg_t type) { return false; }
 static inline void vnodeWaitBlockMsg(SVnode *pVnode, const SRpcMsg *pMsg) {
   if (vnodeIsMsgBlock(pMsg->msgType)) {
     const STraceId *trace = &pMsg->info.traceId;
+    taosThreadMutexLock(&pVnode->lock);
+    if (!pVnode->blocked) {
       vGTrace("vgId:%d, msg:%p wait block, type:%s", pVnode->config.vgId, pMsg, TMSG_INFO(pMsg->msgType));
-    pVnode->blockCount = 1;
+      pVnode->blocked = true;
+      taosThreadMutexUnlock(&pVnode->lock);
       tsem_wait(&pVnode->syncSem);
+    } else {
+      taosThreadMutexUnlock(&pVnode->lock);
+    }
   }
 }
 
 static inline void vnodePostBlockMsg(SVnode *pVnode, const SRpcMsg *pMsg) {
   if (vnodeIsMsgBlock(pMsg->msgType)) {
     const STraceId *trace = &pMsg->info.traceId;
-    if (pVnode->blockCount) {
+    taosThreadMutexLock(&pVnode->lock);
+    if (pVnode->blocked) {
       vGTrace("vgId:%d, msg:%p post block, type:%s", pVnode->config.vgId, pMsg, TMSG_INFO(pMsg->msgType));
-      pVnode->blockCount = 0;
+      pVnode->blocked = false;
       tsem_post(&pVnode->syncSem);
     }
+    taosThreadMutexUnlock(&pVnode->lock);
   }
 }
 
@@ -677,11 +685,25 @@ static void vnodeBecomeFollower(struct SSyncFSM *pFsm) {
   vDebug("vgId:%d, become follower", pVnode->config.vgId);
 
   // clear old leader resource
+  taosThreadMutexLock(&pVnode->lock);
+  if (pVnode->blocked) {
+    pVnode->blocked = false;
+    vDebug("vgId:%d, become follower and post block", pVnode->config.vgId);
+    tsem_post(&pVnode->syncSem);
+  }
+  taosThreadMutexUnlock(&pVnode->lock);
 }
 
 static void vnodeBecomeLeader(struct SSyncFSM *pFsm) {
   SVnode *pVnode = pFsm->data;
   vDebug("vgId:%d, become leader", pVnode->config.vgId);
+
+  // taosThreadMutexLock(&pVnode->lock);
+  // if (pVnode->blocked) {
+  //   pVnode->blocked = false;
+  //   tsem_post(&pVnode->syncSem);
+  // }
+  // taosThreadMutexUnlock(&pVnode->lock);
 }
 
 static SSyncFSM *vnodeSyncMakeFsm(SVnode *pVnode) {

source/libs/catalog/src/ctgAsync.c

@@ -1105,6 +1105,7 @@ int32_t ctgHandleGetTbMetasRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBu
   SName* pName = ctgGetFetchName(ctx->pNames, pFetch);
   int32_t flag = pFetch->flag;
   int32_t* vgId = &pFetch->vgId;
+  bool taskDone = false;
 
   CTG_ERR_JRET(ctgProcessRspMsg(pMsgCtx->out, reqType, pMsg->pData, pMsg->len, rspCode, pMsgCtx->target));
 
@@ -1250,6 +1251,7 @@ int32_t ctgHandleGetTbMetasRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBu
   pOut->tbMeta = NULL;
   if (0 == atomic_sub_fetch_32(&ctx->fetchNum, 1)) {
     TSWAP(pTask->res, ctx->pResList);
+    taskDone = true;
   }
 
 _return:
@@ -1264,10 +1266,11 @@ _return:
     pRes->pRes = NULL;
     if (0 == atomic_sub_fetch_32(&ctx->fetchNum, 1)) {
       TSWAP(pTask->res, ctx->pResList);
+      taskDone = true;
     }
   }
 
-  if (pTask->res) {
+  if (pTask->res && taskDone) {
     ctgHandleTaskEnd(pTask, code);
   }
   
@@ -1354,6 +1357,7 @@ int32_t ctgHandleGetTbHashsRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBu
   SCatalog* pCtg = pTask->pJob->pCtg; 
   SCtgMsgCtx* pMsgCtx = CTG_GET_TASK_MSGCTX(pTask, tReq->msgIdx);
   SCtgFetch* pFetch = taosArrayGet(ctx->pFetchs, tReq->msgIdx);
+  bool taskDone = false;
 
   CTG_ERR_JRET(ctgProcessRspMsg(pMsgCtx->out, reqType, pMsg->pData, pMsg->len, rspCode, pMsgCtx->target));
 
@@ -1377,6 +1381,7 @@ int32_t ctgHandleGetTbHashsRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBu
 
   if (0 == atomic_sub_fetch_32(&ctx->fetchNum, 1)) {
     TSWAP(pTask->res, ctx->pResList);
+    taskDone = true;
   }
 
 _return:
@@ -1392,10 +1397,11 @@ _return:
     
     if (0 == atomic_sub_fetch_32(&ctx->fetchNum, 1)) {
       TSWAP(pTask->res, ctx->pResList);
+      taskDone = true;
     }
   }
 
-  if (pTask->res) {
+  if (pTask->res && taskDone) {
     ctgHandleTaskEnd(pTask, code);
   }
 

source/libs/catalog/src/ctgCache.c

@@ -581,6 +581,20 @@ _return:
 }
 
 int32_t ctgChkAuthFromCache(SCatalog* pCtg, char* user, char* dbFName, AUTH_TYPE type, bool *inCache, bool *pass) {
+  char *p = strchr(dbFName, '.');
+  if (p) {
+    ++p;
+  } else {
+    p = dbFName;
+  }
+  
+  if (IS_SYS_DBNAME(p)) {
+    *inCache = true;
+    *pass = true;
+    ctgDebug("sysdb %s, pass", dbFName);
+    return TSDB_CODE_SUCCESS;
+  }
+
   SCtgUserAuth *pUser = (SCtgUserAuth *)taosHashGet(pCtg->userCache, user, strlen(user));
   if (NULL == pUser) {
     ctgDebug("user not in cache, user:%s", user);

source/libs/executor/inc/executorimpl.h

@@ -619,15 +619,20 @@ typedef struct SIndefOperatorInfo {
 typedef struct SFillOperatorInfo {
   struct SFillInfo* pFillInfo;
   SSDataBlock*      pRes;
+  SSDataBlock*      pFinalRes;
   int64_t           totalInputRows;
   void**            p;
   SSDataBlock*      existNewGroupBlock;
-  bool              multigroupResult;
   STimeWindow       win;
   SNode*            pCondition;
   SArray*           pColMatchColInfo;
   int32_t           primaryTsCol;
+  int32_t           primarySrcSlotId;
   uint64_t          curGroupId;       // current handled group id
+  SExprInfo*        pExprInfo;
+  int32_t           numOfExpr;
+  SExprInfo*        pNotFillExprInfo;
+  int32_t           numOfNotFillExpr;
 } SFillOperatorInfo;
 
 typedef struct SGroupbyOperatorInfo {

source/libs/executor/inc/tfill.h

@@ -28,8 +28,7 @@ struct SSDataBlock;
 
 typedef struct SFillColInfo {
   SExprInfo *pExpr;
-  int16_t    flag;            // column flag: TAG COLUMN|NORMAL COLUMN
+  bool       notFillCol;      // denote if this column needs fill operation
-  int16_t    tagIndex;        // index of current tag in SFillTagColInfo array list
   SVariant   fillVal;
 } SFillColInfo;
 
@@ -46,25 +45,27 @@ typedef struct {
   char*   tagVal;
 } SFillTagColInfo;
 
+typedef struct {
+  int64_t key;
+  SArray* pRowVal;
+} SRowVal;
+
 typedef struct SFillInfo {
   TSKEY     start;                // start timestamp
   TSKEY     end;                  // endKey for fill
   TSKEY     currentKey;           // current active timestamp, the value may be changed during the fill procedure.
   int32_t   tsSlotId;             // primary time stamp slot id
+  int32_t   srcTsSlotId;          // timestamp column id in the source data block.
   int32_t   order;                // order [TSDB_ORDER_ASC|TSDB_ORDER_DESC]
   int32_t   type;                 // fill type
   int32_t   numOfRows;            // number of rows in the input data block
   int32_t   index;                // active row index
   int32_t   numOfTotal;           // number of filled rows in one round
   int32_t   numOfCurrent;         // number of filled rows in current results
-
-  int32_t   numOfTags;            // number of tags
   int32_t   numOfCols;            // number of columns, including the tags columns
-  int32_t   rowSize;              // size of each row
   SInterval interval;
-
+  SRowVal   prev;
-  SArray   *prev;
+  SRowVal   next;
-  SArray   *next;
   SSDataBlock *pSrcBlock;
   int32_t   alloc;                // data buffer size in rows
 
@@ -79,10 +80,10 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, int64_t ekey, int32_t
 void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey);
 void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp);
 void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput);
-struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const struct SNodeListNode* val);
+struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfFillExpr, SExprInfo* pNotFillExpr, int32_t numOfNotFillCols, const struct SNodeListNode* val);
 bool taosFillHasMoreResults(struct SFillInfo* pFillInfo);
 
-SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols,
+SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t numOfNotFillCols, int32_t capacity,
                               SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol, int32_t slotId,
                               int32_t order, const char* id);
 

source/libs/executor/src/executorimpl.c

@@ -716,7 +716,7 @@ int32_t projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBloc
         taosArrayDestroy(pBlockList);
       }
     } else {
-      ASSERT(0);
+      return TSDB_CODE_OPS_NOT_SUPPORT;
     }
   }
 
@@ -1433,7 +1433,8 @@ static void setExecutionContext(SOperatorInfo* pOperator, int32_t numOfOutput, u
   pAggInfo->groupId = groupId;
 }
 
-static void doUpdateNumOfRows(SqlFunctionCtx* pCtx, SResultRow* pRow, int32_t numOfExprs, const int32_t* rowCellOffset) {
+static void doUpdateNumOfRows(SqlFunctionCtx* pCtx, SResultRow* pRow, int32_t numOfExprs,
+                              const int32_t* rowCellOffset) {
   bool returnNotNull = false;
   for (int32_t j = 0; j < numOfExprs; ++j) {
     struct SResultRowEntryInfo* pResInfo = getResultEntryInfo(pRow, j, rowCellOffset);
@@ -1613,7 +1614,7 @@ void doBuildResultDatablock(SOperatorInfo* pOperator, SOptrBasicInfo* pbInfo, SG
   if (!pbInfo->mergeResultBlock) {
     doCopyToSDataBlock(pTaskInfo, pBlock, &pOperator->exprSupp, pBuf, pGroupResInfo);
   } else {
-    while(hasRemainResults(pGroupResInfo)) {
+    while (hasRemainResults(pGroupResInfo)) {
       doCopyToSDataBlock(pTaskInfo, pBlock, &pOperator->exprSupp, pBuf, pGroupResInfo);
       if (pBlock->info.rows >= pOperator->resultInfo.threshold) {
         break;
@@ -2065,7 +2066,7 @@ int32_t extractDataBlockFromFetchRsp(SSDataBlock* pRes, char* pData, int32_t num
                                      char** pNextStart) {
   if (pColList == NULL) {  // data from other sources
     blockDataCleanup(pRes);
-    *pNextStart = (char*) blockDecode(pRes, pData);
+    *pNextStart = (char*)blockDecode(pRes, pData);
   } else {  // extract data according to pColList
     ASSERT(numOfOutput == taosArrayGetSize(pColList));
     char* pStart = pData;
@@ -2163,7 +2164,7 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
       SRetrieveTableRsp* pRetrieveRsp = pDataInfo->pRsp;
       int32_t            index = 0;
       char*              pStart = pRetrieveRsp->data;
-      while(index++ < pRetrieveRsp->numOfBlocks) {
+      while (index++ < pRetrieveRsp->numOfBlocks) {
         SSDataBlock* pb = createOneDataBlock(pExchangeInfo->pDummyBlock, false);
         code = extractDataBlockFromFetchRsp(pb, pStart, pRetrieveRsp->numOfCols, NULL, &pStart);
         if (code != 0) {
@@ -2177,8 +2178,10 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
       updateLoadRemoteInfo(pLoadInfo, pRetrieveRsp->numOfRows, pRetrieveRsp->compLen, startTs, pOperator);
 
       if (pRsp->completed == 1) {
-        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64 " execId:%d"
+        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64
-               " index:%d completed, blocks:%d, numOfRows:%d, rowsOfSource:%" PRIu64 ", totalRows:%" PRIu64 ", total:%.2f Kb,"
+               " execId:%d"
+               " index:%d completed, blocks:%d, numOfRows:%d, rowsOfSource:%" PRIu64 ", totalRows:%" PRIu64
+               ", total:%.2f Kb,"
                " completed:%d try next %d/%" PRIzu,
                GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pSource->execId, i, pRsp->numOfBlocks,
                pRsp->numOfRows, pDataInfo->totalRows, pLoadInfo->totalRows, pLoadInfo->totalSize / 1024.0,
@@ -2186,9 +2189,10 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
         completed += 1;
         pDataInfo->status = EX_SOURCE_DATA_EXHAUSTED;
       } else {
-        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64 " execId:%d blocks:%d, numOfRows:%d, totalRows:%" PRIu64
+        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64
-               ", total:%.2f Kb", GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pSource->execId,
+               " execId:%d blocks:%d, numOfRows:%d, totalRows:%" PRIu64 ", total:%.2f Kb",
-               pRsp->numOfBlocks, pRsp->numOfRows, pLoadInfo->totalRows, pLoadInfo->totalSize/1024.0);
+               GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pSource->execId, pRsp->numOfBlocks,
+               pRsp->numOfRows, pLoadInfo->totalRows, pLoadInfo->totalSize / 1024.0);
       }
 
       taosMemoryFreeClear(pDataInfo->pRsp);
@@ -3213,36 +3217,71 @@ int32_t handleLimitOffset(SOperatorInfo* pOperator, SLimitInfo* pLimitInfo, SSDa
   }
 }
 
-static void doHandleRemainBlockForNewGroupImpl(SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
+static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag);
+static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo *pOperator, SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
                                                SExecTaskInfo* pTaskInfo) {
   pInfo->totalInputRows = pInfo->existNewGroupBlock->info.rows;
+  SSDataBlock* pResBlock = pInfo->pFinalRes;
+
+  int32_t order = TSDB_ORDER_ASC;
+  int32_t scanFlag = MAIN_SCAN;
+  getTableScanInfo(pOperator, &order, &scanFlag);
 
   int64_t ekey =
       Q_STATUS_EQUAL(pTaskInfo->status, TASK_COMPLETED) ? pInfo->win.ekey : pInfo->existNewGroupBlock->info.window.ekey;
   taosResetFillInfo(pInfo->pFillInfo, getFillInfoStart(pInfo->pFillInfo));
 
-  taosFillSetStartInfo(pInfo->pFillInfo, pInfo->existNewGroupBlock->info.rows, ekey);
+  doApplyScalarCalculation(pOperator, pInfo->existNewGroupBlock, order, scanFlag);
-  taosFillSetInputDataBlock(pInfo->pFillInfo, pInfo->existNewGroupBlock);
 
-  int32_t numOfResultRows = pResultInfo->capacity - pInfo->pRes->info.rows;
+  taosFillSetStartInfo(pInfo->pFillInfo, pInfo->pRes->info.rows, ekey);
-  taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pRes, numOfResultRows);
+  taosFillSetInputDataBlock(pInfo->pFillInfo, pInfo->pRes);
+
+  int32_t numOfResultRows = pResultInfo->capacity - pResBlock->info.rows;
+  taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
 
   pInfo->curGroupId = pInfo->existNewGroupBlock->info.groupId;
   pInfo->existNewGroupBlock = NULL;
 }
 
-static void doHandleRemainBlockFromNewGroup(SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
+static void doHandleRemainBlockFromNewGroup(SOperatorInfo* pOperator, SFillOperatorInfo* pInfo, SResultInfo* pResultInfo,
                                             SExecTaskInfo* pTaskInfo) {
   if (taosFillHasMoreResults(pInfo->pFillInfo)) {
-    int32_t numOfResultRows = pResultInfo->capacity - pInfo->pRes->info.rows;
+    int32_t numOfResultRows = pResultInfo->capacity - pInfo->pFinalRes->info.rows;
-    taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pRes, numOfResultRows);
+    taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pFinalRes, numOfResultRows);
     pInfo->pRes->info.groupId = pInfo->curGroupId;
     return;
   }
 
   // handle the cached new group data block
   if (pInfo->existNewGroupBlock) {
-    doHandleRemainBlockForNewGroupImpl(pInfo, pResultInfo, pTaskInfo);
+    doHandleRemainBlockForNewGroupImpl(pOperator, pInfo, pResultInfo, pTaskInfo);
+  }
+}
+
+static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag) {
+  SFillOperatorInfo* pInfo = pOperator->info;
+  SExprSupp* pSup = &pOperator->exprSupp;
+  SSDataBlock* pResBlock = pInfo->pFinalRes;
+
+  setInputDataBlock(pOperator, pSup->pCtx, pBlock, order, scanFlag, false);
+  projectApplyFunctions(pSup->pExprInfo, pInfo->pRes, pBlock, pSup->pCtx, pSup->numOfExprs, NULL);
+  pInfo->pRes->info.groupId = pBlock->info.groupId;
+
+  SColumnInfoData* pDst = taosArrayGet(pInfo->pRes->pDataBlock, pInfo->primaryTsCol);
+  SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, pInfo->primarySrcSlotId);
+  colDataAssign(pDst, pSrc, pInfo->pRes->info.rows, &pResBlock->info);
+
+  for(int32_t i = 0; i < pInfo->numOfNotFillExpr; ++i) {
+    SFillColInfo* pCol = &pInfo->pFillInfo->pFillCol[i + pInfo->numOfExpr];
+    ASSERT(pCol->notFillCol);
+
+    SExprInfo* pExpr = pCol->pExpr;
+    int32_t srcSlotId = pExpr->base.pParam[0].pCol->slotId;
+    int32_t dstSlotId = pExpr->base.resSchema.slotId;
+
+    SColumnInfoData* pDst1 = taosArrayGet(pInfo->pRes->pDataBlock, dstSlotId);
+    SColumnInfoData* pSrc1 = taosArrayGet(pBlock->pDataBlock, srcSlotId);
+    colDataAssign(pDst1, pSrc1, pInfo->pRes->info.rows, &pResBlock->info);
   }
 }
 
@@ -3251,11 +3290,16 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
   SExecTaskInfo*     pTaskInfo = pOperator->pTaskInfo;
 
   SResultInfo* pResultInfo = &pOperator->resultInfo;
-  SSDataBlock* pResBlock = pInfo->pRes;
+  SSDataBlock* pResBlock = pInfo->pFinalRes;
 
   blockDataCleanup(pResBlock);
+  blockDataCleanup(pInfo->pRes);
 
-  doHandleRemainBlockFromNewGroup(pInfo, pResultInfo, pTaskInfo);
+  int32_t order = TSDB_ORDER_ASC;
+  int32_t scanFlag = MAIN_SCAN;
+  getTableScanInfo(pOperator, &order, &scanFlag);
+
+  doHandleRemainBlockFromNewGroup(pOperator, pInfo, pResultInfo, pTaskInfo);
   if (pResBlock->info.rows > 0) {
     pResBlock->info.groupId = pInfo->curGroupId;
     return pResBlock;
@@ -3266,21 +3310,21 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
     SSDataBlock* pBlock = pDownstream->fpSet.getNextFn(pDownstream);
     if (pBlock == NULL) {
       if (pInfo->totalInputRows == 0) {
-        pOperator->status = OP_EXEC_DONE;
+        doSetOperatorCompleted(pOperator);
         return NULL;
       }
 
       taosFillSetStartInfo(pInfo->pFillInfo, 0, pInfo->win.ekey);
     } else {
       blockDataUpdateTsWindow(pBlock, pInfo->primaryTsCol);
+      doApplyScalarCalculation(pOperator, pBlock, order, scanFlag);
 
-      if (pInfo->curGroupId == 0 || pInfo->curGroupId == pBlock->info.groupId) {
+      if (pInfo->curGroupId == 0 || pInfo->curGroupId == pInfo->pRes->info.groupId) {
-        pInfo->curGroupId = pBlock->info.groupId;  // the first data block
+        pInfo->curGroupId = pInfo->pRes->info.groupId;  // the first data block
+        pInfo->totalInputRows += pInfo->pRes->info.rows;
 
-        pInfo->totalInputRows += pBlock->info.rows;
+        taosFillSetStartInfo(pInfo->pFillInfo, pInfo->pRes->info.rows, pBlock->info.window.ekey);
-
+        taosFillSetInputDataBlock(pInfo->pFillInfo, pInfo->pRes);
-        taosFillSetStartInfo(pInfo->pFillInfo, pBlock->info.rows, pBlock->info.window.ekey);
-        taosFillSetInputDataBlock(pInfo->pFillInfo, pBlock);
       } else if (pInfo->curGroupId != pBlock->info.groupId) {  // the new group data block
         pInfo->existNewGroupBlock = pBlock;
 
@@ -3290,8 +3334,6 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
       }
     }
 
-    blockDataEnsureCapacity(pResBlock, pOperator->resultInfo.capacity);
-
     int32_t numOfResultRows = pOperator->resultInfo.capacity - pResBlock->info.rows;
     taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
 
@@ -3304,14 +3346,18 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
         return pResBlock;
       }
 
-      doHandleRemainBlockFromNewGroup(pInfo, pResultInfo, pTaskInfo);
+      doHandleRemainBlockFromNewGroup(pOperator, pInfo, pResultInfo, pTaskInfo);
       if (pResBlock->info.rows >= pOperator->resultInfo.threshold || pBlock == NULL) {
         pResBlock->info.groupId = pInfo->curGroupId;
         return pResBlock;
       }
     } else if (pInfo->existNewGroupBlock) {  // try next group
       assert(pBlock != NULL);
-      doHandleRemainBlockForNewGroupImpl(pInfo, pResultInfo, pTaskInfo);
+
+      blockDataCleanup(pResBlock);
+      blockDataCleanup(pInfo->pRes);
+
+      doHandleRemainBlockForNewGroupImpl(pOperator, pInfo, pResultInfo, pTaskInfo);
       if (pResBlock->info.rows > pResultInfo->threshold) {
         pResBlock->info.groupId = pInfo->curGroupId;
         return pResBlock;
@@ -3564,7 +3610,6 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo*
   return pOperator;
 _error:
   destroyAggOperatorInfo(pInfo, numOfCols);
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY;
   return NULL;
@@ -3604,6 +3649,13 @@ void destroyFillOperatorInfo(void* param, int32_t numOfOutput) {
   SFillOperatorInfo* pInfo = (SFillOperatorInfo*)param;
   pInfo->pFillInfo = taosDestroyFillInfo(pInfo->pFillInfo);
   pInfo->pRes = blockDataDestroy(pInfo->pRes);
+  pInfo->pFinalRes = blockDataDestroy(pInfo->pFinalRes);
+
+  if (pInfo->pNotFillExprInfo != NULL) {
+    destroyExprInfo(pInfo->pNotFillExprInfo, pInfo->numOfNotFillExpr);
+    taosMemoryFree(pInfo->pNotFillExprInfo);
+  }
+
   taosMemoryFreeClear(pInfo->p);
   taosArrayDestroy(pInfo->pColMatchColInfo);
   taosMemoryFreeClear(param);
@@ -3636,16 +3688,16 @@ void doDestroyExchangeOperatorInfo(void* param) {
   taosMemoryFreeClear(param);
 }
 
-static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t numOfCols, SNodeListNode* pValNode,
+static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t numOfCols, SExprInfo* pNotFillExpr,
-                            STimeWindow win, int32_t capacity, const char* id, SInterval* pInterval, int32_t fillType,
+                            int32_t numOfNotFillCols, SNodeListNode* pValNode, STimeWindow win, int32_t capacity,
-                            int32_t order) {
+                            const char* id, SInterval* pInterval, int32_t fillType, int32_t order) {
-  SFillColInfo* pColInfo = createFillColInfo(pExpr, numOfCols, pValNode);
+  SFillColInfo* pColInfo = createFillColInfo(pExpr, numOfCols, pNotFillExpr, numOfNotFillCols, pValNode);
 
   STimeWindow w = getAlignQueryTimeWindow(pInterval, pInterval->precision, win.skey);
   w = getFirstQualifiedTimeWindow(win.skey, &w, pInterval, TSDB_ORDER_ASC);
 
   pInfo->pFillInfo =
-      taosCreateFillInfo(w.skey, 0, capacity, numOfCols, pInterval, fillType, pColInfo, pInfo->primaryTsCol, order, id);
+      taosCreateFillInfo(w.skey, numOfCols, numOfNotFillCols, capacity, pInterval, fillType, pColInfo, pInfo->primaryTsCol, order, id);
 
   pInfo->win = win;
   pInfo->p = taosMemoryCalloc(numOfCols, POINTER_BYTES);
@@ -3667,9 +3719,10 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
     goto _error;
   }
 
-  int32_t      num = 0;
   SSDataBlock* pResBlock = createResDataBlock(pPhyFillNode->node.pOutputDataBlockDesc);
-  SExprInfo*   pExprInfo = createExprInfo(pPhyFillNode->pTargets, NULL, &num);
+  SExprInfo*   pExprInfo = createExprInfo(pPhyFillNode->pFillExprs, NULL, &pInfo->numOfExpr);
+  pInfo->pNotFillExprInfo = createExprInfo(pPhyFillNode->pNotFillExprs, NULL, &pInfo->numOfNotFillExpr);
+
   SInterval*   pInterval =
       QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL == downstream->operatorType
             ? &((SMergeAlignedIntervalAggOperatorInfo*)downstream->info)->intervalAggOperatorInfo->interval
@@ -3680,19 +3733,27 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
 
   SResultInfo* pResultInfo = &pOperator->resultInfo;
   initResultSizeInfo(&pOperator->resultInfo, 4096);
-  pInfo->primaryTsCol = ((SColumnNode*)pPhyFillNode->pWStartTs)->slotId;
+  blockDataEnsureCapacity(pResBlock, pOperator->resultInfo.capacity);
+  initExprSupp(&pOperator->exprSupp, pExprInfo, pInfo->numOfExpr);
+
+  pInfo->primaryTsCol = ((STargetNode*)pPhyFillNode->pWStartTs)->slotId;
+  pInfo->primarySrcSlotId = ((SColumnNode*)((STargetNode*)pPhyFillNode->pWStartTs)->pExpr)->slotId;
 
   int32_t numOfOutputCols = 0;
-  SArray* pColMatchColInfo = extractColMatchInfo(pPhyFillNode->pTargets, pPhyFillNode->node.pOutputDataBlockDesc,
+  SArray* pColMatchColInfo = extractColMatchInfo(pPhyFillNode->pFillExprs, pPhyFillNode->node.pOutputDataBlockDesc,
                                                  &numOfOutputCols, COL_MATCH_FROM_SLOT_ID);
 
-  int32_t code = initFillInfo(pInfo, pExprInfo, num, (SNodeListNode*)pPhyFillNode->pValues, pPhyFillNode->timeRange,
+  int32_t code =
-                              pResultInfo->capacity, pTaskInfo->id.str, pInterval, type, order);
+      initFillInfo(pInfo, pExprInfo, pInfo->numOfExpr, pInfo->pNotFillExprInfo, pInfo->numOfNotFillExpr, (SNodeListNode*)pPhyFillNode->pValues,
+                   pPhyFillNode->timeRange, pResultInfo->capacity, pTaskInfo->id.str, pInterval, type, order);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
   }
 
   pInfo->pRes = pResBlock;
+  pInfo->pFinalRes = createOneDataBlock(pResBlock, false);
+  blockDataEnsureCapacity(pInfo->pFinalRes, pOperator->resultInfo.capacity);
+
   pInfo->pCondition = pPhyFillNode->node.pConditions;
   pInfo->pColMatchColInfo = pColMatchColInfo;
   pOperator->name = "FillOperator";
@@ -3700,7 +3761,7 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
   pOperator->status = OP_NOT_OPENED;
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_FILL;
   pOperator->exprSupp.pExprInfo = pExprInfo;
-  pOperator->exprSupp.numOfExprs = num;
+  pOperator->exprSupp.numOfExprs = pInfo->numOfExpr;
   pOperator->info = pInfo;
   pOperator->pTaskInfo = pTaskInfo;
 
@@ -4182,7 +4243,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
 
     int32_t tsSlotId = ((SColumnNode*)pIntervalPhyNode->window.pTspk)->slotId;
     pOptr = createMergeAlignedIntervalOperatorInfo(ops[0], pExprInfo, num, pResBlock, &interval, tsSlotId,
-                                                   pPhyNode->pConditions, pIntervalPhyNode->window.mergeDataBlock, pTaskInfo);
+                                                   pPhyNode->pConditions, pIntervalPhyNode->window.mergeDataBlock,
+                                                   pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_MERGE_INTERVAL == type) {
     SMergeIntervalPhysiNode* pIntervalPhyNode = (SMergeIntervalPhysiNode*)pPhyNode;
 
@@ -4197,7 +4259,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
                           .precision = ((SColumnNode*)pIntervalPhyNode->window.pTspk)->node.resType.precision};
 
     int32_t tsSlotId = ((SColumnNode*)pIntervalPhyNode->window.pTspk)->slotId;
-    pOptr = createMergeIntervalOperatorInfo(ops[0], pExprInfo, num, pResBlock, &interval, tsSlotId, pIntervalPhyNode->window.mergeDataBlock, pTaskInfo);
+    pOptr = createMergeIntervalOperatorInfo(ops[0], pExprInfo, num, pResBlock, &interval, tsSlotId,
+                                            pIntervalPhyNode->window.mergeDataBlock, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_INTERVAL == type) {
     int32_t children = 0;
     pOptr = createStreamFinalIntervalOperatorInfo(ops[0], pPhyNode, pTaskInfo, children);
@@ -4251,8 +4314,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     ASSERT(0);
   }
   taosMemoryFree(ops);
-
+  if (pOptr) pOptr->resultDataBlockId = pPhyNode->pOutputDataBlockDesc->dataBlockId;
-  pOptr->resultDataBlockId = pPhyNode->pOutputDataBlockDesc->dataBlockId;
   return pOptr;
 }
 

source/libs/executor/src/projectoperator.c

@@ -174,7 +174,8 @@ static int32_t doIngroupLimitOffset(SLimitInfo* pLimitInfo, uint64_t groupId, SS
   if (pLimitInfo->limit.limit >= 0 && pLimitInfo->numOfOutputRows + pBlock->info.rows >= pLimitInfo->limit.limit) {
     int32_t keepRows = (int32_t)(pLimitInfo->limit.limit - pLimitInfo->numOfOutputRows);
     blockDataKeepFirstNRows(pBlock, keepRows);
-    if (pLimitInfo->slimit.limit > 0 && pLimitInfo->slimit.limit <= pLimitInfo->numOfOutputGroups) {
+    //TODO: optimize it later when partition by + limit
+    if ((pLimitInfo->slimit.limit == -1 && pLimitInfo->currentGroupId == 0)  || pLimitInfo->slimit.limit > 0 && pLimitInfo->slimit.limit <= pLimitInfo->numOfOutputGroups) {
       doSetOperatorCompleted(pOperator);
     }
   }
@@ -240,7 +241,8 @@ SSDataBlock* doProjectOperation(SOperatorInfo* pOperator) {
       }
 
       // for stream interval
-      if (pBlock->info.type == STREAM_RETRIEVE) {
+      if (pBlock->info.type == STREAM_RETRIEVE || pBlock->info.type == STREAM_DELETE_RESULT ||
+          pBlock->info.type == STREAM_DELETE_DATA) {
         // printDataBlock1(pBlock, "project1");
         return pBlock;
       }

source/libs/executor/src/tfill.c

@@ -33,39 +33,29 @@
 #define DO_INTERPOLATION(_v1, _v2, _k1, _k2, _k) \
   ((_v1) + ((_v2) - (_v1)) * (((double)(_k)) - ((double)(_k1))) / (((double)(_k2)) - ((double)(_k1))))
 
-static void setTagsValue(SFillInfo* pFillInfo, void** data, int32_t genRows) {
-  for (int32_t j = 0; j < pFillInfo->numOfCols; ++j) {
-    SFillColInfo* pCol = &pFillInfo->pFillCol[j];
-    if (TSDB_COL_IS_NORMAL_COL(pCol->flag) || TSDB_COL_IS_UD_COL(pCol->flag)) {
-      continue;
-    }
-
-    SResSchema* pSchema = &pCol->pExpr->base.resSchema;
-    char*       val1 = elePtrAt(data[j], pSchema->bytes, genRows);
-
-    assert(pCol->tagIndex >= 0 && pCol->tagIndex < pFillInfo->numOfTags);
-    SFillTagColInfo* pTag = &pFillInfo->pTags[pCol->tagIndex];
-    assignVal(val1, pTag->tagVal, pSchema->bytes, pSchema->type);
-  }
-}
-
-static void setNullRow(SSDataBlock* pBlock, int64_t ts, int32_t rowIndex) {
-  // the first are always the timestamp column, so start from the second column.
-  for (int32_t i = 0; i < taosArrayGetSize(pBlock->pDataBlock); ++i) {
-    SColumnInfoData* p = taosArrayGet(pBlock->pDataBlock, i);
-    if (p->info.type == TSDB_DATA_TYPE_TIMESTAMP) {  // handle timestamp
-      colDataAppend(p, rowIndex, (const char*)&ts, false);
-    } else {
-      colDataAppendNULL(p, rowIndex);
-    }
-  }
-}
-
 #define GET_DEST_SLOT_ID(_p) ((_p)->pExpr->base.resSchema.slotId)
-#define GET_SRC_SLOT_ID(_p)  ((_p)->pExpr->base.pParam[0].pCol->slotId)
 
 static void doSetVal(SColumnInfoData* pDstColInfoData, int32_t rowIndex, const SGroupKeys* pKey);
 
+static void setNullRow(SSDataBlock* pBlock, SFillInfo* pFillInfo, int32_t rowIndex) {
+  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+    SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+    int32_t dstSlotId = GET_DEST_SLOT_ID(pCol);
+    SColumnInfoData* pDstColInfo = taosArrayGet(pBlock->pDataBlock, dstSlotId);
+    if (pCol->notFillCol) {
+      if (pDstColInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+        colDataAppend(pDstColInfo, rowIndex, (const char*)&pFillInfo->currentKey, false);
+      } else {
+        SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
+        SGroupKeys* pKey = taosArrayGet(p, i);
+        doSetVal(pDstColInfo, rowIndex, pKey);
+      }
+    } else {
+      colDataAppendNULL(pDstColInfo, rowIndex);
+    }
+  }
+}
+
 static void doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32_t rowIndex, int64_t currentKey) {
   if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {
     float v = 0;
@@ -96,13 +86,10 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
 
   // set the other values
   if (pFillInfo->type == TSDB_FILL_PREV) {
-    SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev : pFillInfo->next;
+    SArray* p = FILL_IS_ASC_FILL(pFillInfo)? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
 
     for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
       SFillColInfo* pCol = &pFillInfo->pFillCol[i];
-      if (TSDB_COL_IS_TAG(pCol->flag)) {
-        continue;
-      }
 
       SColumnInfoData* pDstColInfoData = taosArrayGet(pBlock->pDataBlock, GET_DEST_SLOT_ID(pCol));
 
@@ -114,14 +101,10 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
       }
     }
   } else if (pFillInfo->type == TSDB_FILL_NEXT) {
-    SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next : pFillInfo->prev;
+    SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next.pRowVal : pFillInfo->prev.pRowVal;
     // todo  refactor: start from 0 not 1
     for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
       SFillColInfo* pCol = &pFillInfo->pFillCol[i];
-      if (TSDB_COL_IS_TAG(pCol->flag)) {
-        continue;
-      }
-
       SColumnInfoData* pDstColInfoData = taosArrayGet(pBlock->pDataBlock, GET_DEST_SLOT_ID(pCol));
 
       if (pDstColInfoData->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
@@ -134,33 +117,34 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
   } else if (pFillInfo->type == TSDB_FILL_LINEAR) {
     // TODO : linear interpolation supports NULL value
     if (outOfBound) {
-      setNullRow(pBlock, pFillInfo->currentKey, index);
+      setNullRow(pBlock, pFillInfo, index);
     } else {
       for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
         SFillColInfo* pCol = &pFillInfo->pFillCol[i];
-        if (TSDB_COL_IS_TAG(pCol->flag)) {
-          continue;
-        }
 
         int32_t          dstSlotId = GET_DEST_SLOT_ID(pCol);
         SColumnInfoData* pDstCol = taosArrayGet(pBlock->pDataBlock, dstSlotId);
-
         int16_t          type = pDstCol->info.type;
+
+        if (pCol->notFillCol) {
           if (type == TSDB_DATA_TYPE_TIMESTAMP) {
             colDataAppend(pDstCol, index, (const char*)&pFillInfo->currentKey, false);
-          continue;
+          } else {
+            SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
+            SGroupKeys* pKey = taosArrayGet(p, i);
+            doSetVal(pDstCol, index, pKey);
           }
-
+        } else {
-        SGroupKeys* pKey = taosArrayGet(pFillInfo->prev, i);
+          SGroupKeys* pKey = taosArrayGet(pFillInfo->prev.pRowVal, i);
           if (IS_VAR_DATA_TYPE(type) || type == TSDB_DATA_TYPE_BOOL || pKey->isNull) {
             colDataAppendNULL(pDstCol, index);
             continue;
           }
 
-        SGroupKeys* pKey1 = taosArrayGet(pFillInfo->prev, pFillInfo->tsSlotId);
+          SGroupKeys* pKey1 = taosArrayGet(pFillInfo->prev.pRowVal, pFillInfo->tsSlotId);
 
           int64_t prevTs = *(int64_t*)pKey1->pData;
-        int32_t srcSlotId = GET_SRC_SLOT_ID(pCol);
+          int32_t srcSlotId = GET_DEST_SLOT_ID(pCol);
 
           SColumnInfoData* pSrcCol = taosArrayGet(pSrcBlock->pDataBlock, srcSlotId);
           char*            data = colDataGetData(pSrcCol, pFillInfo->index);
@@ -175,20 +159,30 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
           colDataAppend(pDstCol, index, (const char*)&out, false);
         }
       }
+    }
   } else if (pFillInfo->type == TSDB_FILL_NULL) {  // fill with NULL
-    setNullRow(pBlock, pFillInfo->currentKey, index);
+    setNullRow(pBlock, pFillInfo, index);
   } else {  // fill with user specified value for each column
     for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
       SFillColInfo* pCol = &pFillInfo->pFillCol[i];
-      if (TSDB_COL_IS_TAG(pCol->flag)) {
-        continue;
-      }
 
+      int32_t slotId = GET_DEST_SLOT_ID(pCol);
+      SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, slotId);
+
+      if (pCol->notFillCol) {
+        if (pDst->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+          colDataAppend(pDst, index, (const char*)&pFillInfo->currentKey, false);
+        } else {
+          SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
+          SGroupKeys* pKey = taosArrayGet(p, i);
+          doSetVal(pDst, index, pKey);
+        }
+      } else {
         SVariant* pVar = &pFillInfo->pFillCol[i].fillVal;
-      SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
         doSetUserSpecifiedValue(pDst, pVar, index, pFillInfo->currentKey);
       }
     }
+  }
 
   //  setTagsValue(pFillInfo, data, index);
   SInterval* pInterval = &pFillInfo->interval;
@@ -207,7 +201,7 @@ void doSetVal(SColumnInfoData* pDstCol, int32_t rowIndex, const SGroupKeys* pKey
 }
 
 static void initBeforeAfterDataBuf(SFillInfo* pFillInfo) {
-  if (taosArrayGetSize(pFillInfo->next) > 0) {
+  if (taosArrayGetSize(pFillInfo->next.pRowVal) > 0) {
     return;
   }
 
@@ -221,10 +215,10 @@ static void initBeforeAfterDataBuf(SFillInfo* pFillInfo) {
     key.bytes = pSchema->bytes;
     key.type = pSchema->type;
 
-    taosArrayPush(pFillInfo->next, &key);
+    taosArrayPush(pFillInfo->next.pRowVal, &key);
 
     key.pData = taosMemoryMalloc(pSchema->bytes);
-    taosArrayPush(pFillInfo->prev, &key);
+    taosArrayPush(pFillInfo->prev.pRowVal, &key);
   }
 }
 
@@ -232,20 +226,31 @@ static void saveColData(SArray* rowBuf, int32_t columnIndex, const char* src, bo
 
 static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, int32_t rowIndex, SArray* pRow) {
   for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
-    int32_t srcSlotId = GET_SRC_SLOT_ID(&pFillInfo->pFillCol[i]);
+    int32_t type = pFillInfo->pFillCol[i].pExpr->pExpr->nodeType;
+    if (type == QUERY_NODE_COLUMN) {
+      int32_t srcSlotId = GET_DEST_SLOT_ID(&pFillInfo->pFillCol[i]);
 
       SColumnInfoData* pSrcCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, srcSlotId);
 
       bool  isNull = colDataIsNull_s(pSrcCol, rowIndex);
       char* p = colDataGetData(pSrcCol, rowIndex);
       saveColData(pRow, i, p, isNull);
+    } else if (type == QUERY_NODE_OPERATOR) {
+      SColumnInfoData* pSrcCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, i);
+
+      bool             isNull = colDataIsNull_s(pSrcCol, rowIndex);
+      char*            p = colDataGetData(pSrcCol, rowIndex);
+      saveColData(pRow, i, p, isNull);
+    } else {
+      ASSERT(0);
+    }
   }
 }
 
 static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t outputRows) {
   pFillInfo->numOfCurrent = 0;
 
-  SColumnInfoData* pTsCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->tsSlotId);
+  SColumnInfoData* pTsCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
 
   int32_t step = GET_FORWARD_DIRECTION_FACTOR(pFillInfo->order);
   bool    ascFill = FILL_IS_ASC_FILL(pFillInfo);
@@ -259,7 +264,7 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
 
     // set the next value for interpolation
     if ((pFillInfo->currentKey < ts && ascFill) || (pFillInfo->currentKey > ts && !ascFill)) {
-      copyCurrentRowIntoBuf(pFillInfo, pFillInfo->index, pFillInfo->next);
+      copyCurrentRowIntoBuf(pFillInfo, pFillInfo->index, pFillInfo->next.pRowVal);
     }
 
     if (((pFillInfo->currentKey < ts && ascFill) || (pFillInfo->currentKey > ts && !ascFill)) &&
@@ -281,43 +286,38 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
 
       if (pFillInfo->type == TSDB_FILL_NEXT && (pFillInfo->index + 1) < pFillInfo->numOfRows) {
         int32_t nextRowIndex = pFillInfo->index + 1;
-        copyCurrentRowIntoBuf(pFillInfo, nextRowIndex, pFillInfo->next);
+        copyCurrentRowIntoBuf(pFillInfo, nextRowIndex, pFillInfo->next.pRowVal);
       }
 
-      // assign rows to dst buffer
+      // copy rows to dst buffer
       for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
         SFillColInfo* pCol = &pFillInfo->pFillCol[i];
-        if (TSDB_COL_IS_TAG(pCol->flag) /* || IS_VAR_DATA_TYPE(pCol->schema.type)*/) {
-          continue;
-        }
 
-        int32_t srcSlotId = GET_SRC_SLOT_ID(pCol);
         int32_t dstSlotId = GET_DEST_SLOT_ID(pCol);
 
         SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, dstSlotId);
-        SColumnInfoData* pSrc = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, srcSlotId);
+        SColumnInfoData* pSrc = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, dstSlotId);
 
         char* src = colDataGetData(pSrc, pFillInfo->index);
-        if (/*i == 0 || (*/ !colDataIsNull_s(pSrc, pFillInfo->index)) {
+        if (!colDataIsNull_s(pSrc, pFillInfo->index)) {
-          bool isNull = colDataIsNull_s(pSrc, pFillInfo->index);
+          colDataAppend(pDst, index, src, false);
-          colDataAppend(pDst, index, src, isNull);
+          saveColData(pFillInfo->prev.pRowVal, i, src, false);
-          saveColData(pFillInfo->prev, i, src, isNull);
+        } else {  // the value is null
-        } else {
           if (pDst->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
             colDataAppend(pDst, index, (const char*)&pFillInfo->currentKey, false);
           } else {  // i > 0 and data is null , do interpolation
             if (pFillInfo->type == TSDB_FILL_PREV) {
-              SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev : pFillInfo->next;
+              SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
               SGroupKeys* pKey = taosArrayGet(p, i);
               doSetVal(pDst, index, pKey);
             } else if (pFillInfo->type == TSDB_FILL_LINEAR) {
               bool isNull = colDataIsNull_s(pSrc, pFillInfo->index);
               colDataAppend(pDst, index, src, isNull);
-              saveColData(pFillInfo->prev, i, src, isNull);  // todo:
+              saveColData(pFillInfo->prev.pRowVal, i, src, isNull);  // todo:
             } else if (pFillInfo->type == TSDB_FILL_NULL) {
               colDataAppendNULL(pDst, index);
             } else if (pFillInfo->type == TSDB_FILL_NEXT) {
-              SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next : pFillInfo->prev;
+              SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next.pRowVal : pFillInfo->prev.pRowVal;
               SGroupKeys* pKey = taosArrayGet(p, i);
               doSetVal(pDst, index, pKey);
             } else {
@@ -340,10 +340,6 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
     }
 
     if (pFillInfo->index >= pFillInfo->numOfRows || pFillInfo->numOfCurrent >= outputRows) {
-      /* the raw data block is exhausted, next value does not exists */
-      //      if (pFillInfo->index >= pFillInfo->numOfRows) {
-      //        taosMemoryFreeClear(*next);
-      //      }
       pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
       return pFillInfo->numOfCurrent;
     }
@@ -356,8 +352,12 @@ static void saveColData(SArray* rowBuf, int32_t columnIndex, const char* src, bo
   SGroupKeys* pKey = taosArrayGet(rowBuf, columnIndex);
   if (isNull) {
     pKey->isNull = true;
+  } else {
+    if (IS_VAR_DATA_TYPE(pKey->type)) {
+      memcpy(pKey->pData, src, varDataTLen(src));
     } else {
       memcpy(pKey->pData, src, pKey->bytes);
+    }
     pKey->isNull = false;
   }
 }
@@ -378,53 +378,6 @@ static int64_t appendFilledResult(SFillInfo* pFillInfo, SSDataBlock* pBlock, int
   return resultCapacity;
 }
 
-// there are no duplicated tags in the SFillTagColInfo list
-static int32_t setTagColumnInfo(SFillInfo* pFillInfo, int32_t numOfCols, int32_t capacity) {
-  int32_t rowsize = 0;
-  int32_t numOfTags = 0;
-
-  int32_t k = 0;
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    SFillColInfo* pColInfo = &pFillInfo->pFillCol[i];
-    SResSchema*   pSchema = &pColInfo->pExpr->base.resSchema;
-
-    if (TSDB_COL_IS_TAG(pColInfo->flag) || pSchema->type == TSDB_DATA_TYPE_BINARY) {
-      numOfTags += 1;
-
-      bool    exists = false;
-      int32_t index = -1;
-      for (int32_t j = 0; j < k; ++j) {
-        if (pFillInfo->pTags[j].col.colId == pSchema->slotId) {
-          exists = true;
-          index = j;
-          break;
-        }
-      }
-
-      if (!exists) {
-        SSchema* pSchema1 = &pFillInfo->pTags[k].col;
-        pSchema1->colId = pSchema->slotId;
-        pSchema1->type = pSchema->type;
-        pSchema1->bytes = pSchema->bytes;
-
-        pFillInfo->pTags[k].tagVal = taosMemoryCalloc(1, pSchema->bytes);
-        pColInfo->tagIndex = k;
-
-        k += 1;
-      } else {
-        pColInfo->tagIndex = index;
-      }
-    }
-
-    rowsize += pSchema->bytes;
-  }
-
-  pFillInfo->numOfTags = numOfTags;
-
-  assert(k <= pFillInfo->numOfTags);
-  return rowsize;
-}
-
 static int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
   if (pFillInfo->numOfRows == 0 || (pFillInfo->numOfRows > 0 && pFillInfo->index >= pFillInfo->numOfRows)) {
     return 0;
@@ -433,7 +386,7 @@ static int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
   return pFillInfo->numOfRows - pFillInfo->index;
 }
 
-struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols,
+struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t numOfNotFillCols, int32_t capacity,
                                      SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol,
                                      int32_t primaryTsSlotId, int32_t order, const char* id) {
   if (fillType == TSDB_FILL_NONE) {
@@ -447,7 +400,17 @@ struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfTags, int32_t capa
   }
 
   pFillInfo->order = order;
-  pFillInfo->tsSlotId = primaryTsSlotId;
+  pFillInfo->srcTsSlotId = primaryTsSlotId;
+
+  for(int32_t i = 0; i < numOfNotFillCols; ++i) {
+    SFillColInfo* p = &pCol[i + numOfFillCols];
+    int32_t srcSlotId = GET_DEST_SLOT_ID(p);
+    if (srcSlotId == primaryTsSlotId) {
+      pFillInfo->tsSlotId = i + numOfFillCols;
+      break;
+    }
+  }
+
   taosResetFillInfo(pFillInfo, skey);
 
   switch (fillType) {
@@ -476,26 +439,15 @@ struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfTags, int32_t capa
 
   pFillInfo->type = fillType;
   pFillInfo->pFillCol = pCol;
-  pFillInfo->numOfTags = numOfTags;
+  pFillInfo->numOfCols = numOfFillCols + numOfNotFillCols;
-  pFillInfo->numOfCols = numOfCols;
   pFillInfo->alloc = capacity;
   pFillInfo->id = id;
   pFillInfo->interval = *pInterval;
 
-  //  if (numOfTags > 0) {
+  pFillInfo->next.pRowVal = taosArrayInit(pFillInfo->numOfCols, sizeof(SGroupKeys));
-  pFillInfo->pTags = taosMemoryCalloc(numOfCols, sizeof(SFillTagColInfo));
+  pFillInfo->prev.pRowVal = taosArrayInit(pFillInfo->numOfCols, sizeof(SGroupKeys));
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    pFillInfo->pTags[i].col.colId = -2;  // TODO
-  }
-  //  }
-
-  pFillInfo->next = taosArrayInit(numOfCols, sizeof(SGroupKeys));
-  pFillInfo->prev = taosArrayInit(numOfCols, sizeof(SGroupKeys));
 
   initBeforeAfterDataBuf(pFillInfo);
-
-  pFillInfo->rowSize = setTagColumnInfo(pFillInfo, pFillInfo->numOfCols, pFillInfo->alloc);
-  assert(pFillInfo->rowSize > 0);
   return pFillInfo;
 }
 
@@ -513,20 +465,20 @@ void* taosDestroyFillInfo(SFillInfo* pFillInfo) {
   if (pFillInfo == NULL) {
     return NULL;
   }
-  for (int32_t i = 0; i < taosArrayGetSize(pFillInfo->prev); ++i) {
+  for (int32_t i = 0; i < taosArrayGetSize(pFillInfo->prev.pRowVal); ++i) {
-    SGroupKeys* pKey = taosArrayGet(pFillInfo->prev, i);
+    SGroupKeys* pKey = taosArrayGet(pFillInfo->prev.pRowVal, i);
     taosMemoryFree(pKey->pData);
   }
-  taosArrayDestroy(pFillInfo->prev);
+  taosArrayDestroy(pFillInfo->prev.pRowVal);
-  for (int32_t i = 0; i < taosArrayGetSize(pFillInfo->next); ++i) {
+  for (int32_t i = 0; i < taosArrayGetSize(pFillInfo->next.pRowVal); ++i) {
-    SGroupKeys* pKey = taosArrayGet(pFillInfo->next, i);
+    SGroupKeys* pKey = taosArrayGet(pFillInfo->next.pRowVal, i);
     taosMemoryFree(pKey->pData);
   }
-  taosArrayDestroy(pFillInfo->next);
+  taosArrayDestroy(pFillInfo->next.pRowVal);
 
-  for (int32_t i = 0; i < pFillInfo->numOfTags; ++i) {
+//  for (int32_t i = 0; i < pFillInfo->numOfTags; ++i) {
-    taosMemoryFreeClear(pFillInfo->pTags[i].tagVal);
+//    taosMemoryFreeClear(pFillInfo->pTags[i].tagVal);
-  }
+//  }
 
   taosMemoryFreeClear(pFillInfo->pTags);
   taosMemoryFreeClear(pFillInfo->pFillCol);
@@ -576,7 +528,7 @@ bool taosFillHasMoreResults(SFillInfo* pFillInfo) {
 }
 
 int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t maxNumOfRows) {
-  SColumnInfoData* pCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, 0);
+  SColumnInfoData* pCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
 
   int64_t* tsList = (int64_t*)pCol->pData;
   int32_t  numOfRows = taosNumOfRemainRows(pFillInfo);
@@ -642,17 +594,18 @@ int64_t taosFillResultDataBlock(SFillInfo* pFillInfo, SSDataBlock* p, int32_t ca
 
 int64_t getFillInfoStart(struct SFillInfo* pFillInfo) { return pFillInfo->start; }
 
-SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const struct SNodeListNode* pValNode) {
+SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfFillExpr, SExprInfo* pNotFillExpr,
-  SFillColInfo* pFillCol = taosMemoryCalloc(numOfOutput, sizeof(SFillColInfo));
+                                int32_t numOfNotFillExpr, const struct SNodeListNode* pValNode) {
+  SFillColInfo* pFillCol = taosMemoryCalloc(numOfFillExpr + numOfNotFillExpr, sizeof(SFillColInfo));
   if (pFillCol == NULL) {
     return NULL;
   }
 
   size_t len = (pValNode != NULL) ? LIST_LENGTH(pValNode->pNodeList) : 0;
-  for (int32_t i = 0; i < numOfOutput; ++i) {
+  for (int32_t i = 0; i < numOfFillExpr; ++i) {
     SExprInfo* pExprInfo = &pExpr[i];
     pFillCol[i].pExpr = pExprInfo;
-    pFillCol[i].tagIndex = -2;
+    pFillCol[i].notFillCol = false;
 
     // todo refactor
     if (len > 0) {
@@ -662,10 +615,12 @@ SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const str
       SValueNode* pv = (SValueNode*)nodesListGetNode(pValNode->pNodeList, index);
       nodesValueNodeToVariant(pv, &pFillCol[i].fillVal);
     }
-
-    if (pExprInfo->base.numOfParams > 0) {
-      pFillCol[i].flag = pExprInfo->base.pParam[0].pCol->flag;  // always be the normal column for table query
   }
+
+  for(int32_t i = 0; i < numOfNotFillExpr; ++i) {
+    SExprInfo* pExprInfo = &pNotFillExpr[i];
+    pFillCol[i + numOfFillExpr].pExpr = pExprInfo;
+    pFillCol[i + numOfFillExpr].notFillCol = true;
   }
 
   return pFillCol;

source/libs/executor/src/timewindowoperator.c

@@ -97,7 +97,8 @@ static void doKeepTuple(SWindowRowsSup* pRowSup, int64_t ts, uint64_t groupId) {
   pRowSup->groupId = groupId;
 }
 
-static void doKeepNewWindowStartInfo(SWindowRowsSup* pRowSup, const int64_t* tsList, int32_t rowIndex, uint64_t groupId) {
+static void doKeepNewWindowStartInfo(SWindowRowsSup* pRowSup, const int64_t* tsList, int32_t rowIndex,
+                                     uint64_t groupId) {
   pRowSup->startRowIndex = rowIndex;
   pRowSup->numOfRows = 0;
   pRowSup->win.skey = tsList[rowIndex];
@@ -869,7 +870,8 @@ static int32_t saveWinResult(int64_t ts, int32_t pageId, int32_t offset, uint64_
 }
 
 static int32_t saveWinResultRow(SResultRow* result, uint64_t groupId, SHashObj* pUpdatedMap) {
-  return saveWinResult(result->win.skey, result->pageId, result->offset, groupId, pUpdatedMap);;
+  return saveWinResult(result->win.skey, result->pageId, result->offset, groupId, pUpdatedMap);
+  ;
 }
 
 static int32_t saveResultRow(SResultRow* result, uint64_t groupId, SArray* pUpdated) {
@@ -1877,7 +1879,6 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo*
 
 _error:
   destroyIntervalOperatorInfo(pInfo, numOfCols);
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -1934,7 +1935,6 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SExpr
 
 _error:
   destroyIntervalOperatorInfo(pInfo, numOfCols);
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -1968,7 +1968,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
       doKeepNewWindowStartInfo(pRowSup, tsList, j, gid);
       doKeepTuple(pRowSup, tsList[j], gid);
     } else if ((tsList[j] - pRowSup->prevTs >= 0) && tsList[j] - pRowSup->prevTs <= gap ||
-            (pRowSup->prevTs - tsList[j] >= 0 ) && (pRowSup->prevTs - tsList[j] <= gap)) {
+               (pRowSup->prevTs - tsList[j] >= 0) && (pRowSup->prevTs - tsList[j] <= gap)) {
       // The gap is less than the threshold, so it belongs to current session window that has been opened already.
       doKeepTuple(pRowSup, tsList[j], gid);
       if (j == 0 && pRowSup->startRowIndex != 0) {
@@ -2153,11 +2153,9 @@ static void doKeepLinearInfo(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlo
   }
 
   pSliceInfo->fillLastPoint = isLastRow ? true : false;
-
 }
 
-static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup,
+static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock) {
-                                   SSDataBlock* pResBlock) {
   int32_t rows = pResBlock->info.rows;
 
   // todo set the correct primary timestamp column
@@ -2168,7 +2166,7 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
     int32_t    srcSlot = pExprInfo->base.pParam[0].pCol->slotId;
     int32_t    dstSlot = pExprInfo->base.resSchema.slotId;
 
-    //SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, srcSlot);
+    // SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, srcSlot);
     SColumnInfoData* pDst = taosArrayGet(pResBlock->pDataBlock, dstSlot);
 
     switch (pSliceInfo->fillType) {
@@ -2184,15 +2182,15 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
         if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {
           float v = 0;
           GET_TYPED_DATA(v, float, pVar->nType, &pVar->i);
-          colDataAppend(pDst, rows, (char *)&v, false);
+          colDataAppend(pDst, rows, (char*)&v, false);
         } else if (pDst->info.type == TSDB_DATA_TYPE_DOUBLE) {
           double v = 0;
           GET_TYPED_DATA(v, double, pVar->nType, &pVar->i);
-          colDataAppend(pDst, rows, (char *)&v, false);
+          colDataAppend(pDst, rows, (char*)&v, false);
         } else if (IS_SIGNED_NUMERIC_TYPE(pDst->info.type)) {
           int64_t v = 0;
           GET_TYPED_DATA(v, int64_t, pVar->nType, &pVar->i);
-          colDataAppend(pDst, rows, (char *)&v, false);
+          colDataAppend(pDst, rows, (char*)&v, false);
         }
         pResBlock->info.rows += 1;
         break;
@@ -2215,7 +2213,7 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           colDataAppendNULL(pDst, rows);
         } else {
           taosGetLinearInterpolationVal(&current, pLinearInfo->type, &start, &end, pLinearInfo->type);
-          colDataAppend(pDst, rows, (char *)current.val, false);
+          colDataAppend(pDst, rows, (char*)current.val, false);
         }
 
         taosMemoryFree(current.val);
@@ -2449,8 +2447,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
             if (nextTs > pSliceInfo->current) {
               while (pSliceInfo->current < nextTs && pSliceInfo->current <= pSliceInfo->win.ekey) {
                 genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock);
-                pSliceInfo->current =
+                pSliceInfo->current = taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit,
-                    taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
+                                                  pInterval->precision);
                 if (pResBlock->info.rows >= pResBlock->info.capacity) {
                   break;
                 }
@@ -2461,8 +2459,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
                 break;
               }
             }
-          } else {// it is the last row of current block
+          } else {  // it is the last row of current block
-            //store ts value as start, and calculate interp value when processing next block
+            // store ts value as start, and calculate interp value when processing next block
             doKeepLinearInfo(pSliceInfo, pBlock, i, true);
           }
         } else {  // non-linear interpolation
@@ -2483,7 +2481,7 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
 
         if (pSliceInfo->fillType == TSDB_FILL_LINEAR) {
           // no need to increate pSliceInfo->current here
-          //pSliceInfo->current =
+          // pSliceInfo->current =
           //    taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
           if (i < pBlock->info.rows - 1) {
             doKeepLinearInfo(pSliceInfo, pBlock, i, false);
@@ -2491,8 +2489,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
             if (nextTs > pSliceInfo->current) {
               while (pSliceInfo->current < nextTs && pSliceInfo->current <= pSliceInfo->win.ekey) {
                 genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock);
-                pSliceInfo->current =
+                pSliceInfo->current = taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit,
-                    taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
+                                                  pInterval->precision);
                 if (pResBlock->info.rows >= pResBlock->info.capacity) {
                   break;
                 }
@@ -2512,8 +2510,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
             if (nextTs > pSliceInfo->current) {
               while (pSliceInfo->current < nextTs && pSliceInfo->current <= pSliceInfo->win.ekey) {
                 genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock);
-                pSliceInfo->current =
+                pSliceInfo->current = taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit,
-                    taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
+                                                  pInterval->precision);
                 if (pResBlock->info.rows >= pResBlock->info.capacity) {
                   break;
                 }
@@ -2560,7 +2558,6 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
           pResBlock->info.rows += 1;
           doKeepPrevRows(pSliceInfo, pBlock, i);
 
-
           if (pSliceInfo->fillType == TSDB_FILL_LINEAR) {
             pSliceInfo->current =
                 taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
@@ -2570,8 +2567,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
               if (nextTs > pSliceInfo->current) {
                 while (pSliceInfo->current < nextTs && pSliceInfo->current <= pSliceInfo->win.ekey) {
                   genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock);
-                  pSliceInfo->current =
+                  pSliceInfo->current = taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit,
-                      taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
+                                                    pInterval->precision);
                   if (pResBlock->info.rows >= pResBlock->info.capacity) {
                     break;
                   }
@@ -2599,12 +2596,12 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
         }
       }
     }
-
   }
 
   // check if need to interpolate after last datablock
   // except for fill(next), fill(linear)
-  while (pSliceInfo->current <= pSliceInfo->win.ekey && pSliceInfo->fillType != TSDB_FILL_NEXT && pSliceInfo->fillType != TSDB_FILL_LINEAR) {
+  while (pSliceInfo->current <= pSliceInfo->win.ekey && pSliceInfo->fillType != TSDB_FILL_NEXT &&
+         pSliceInfo->fillType != TSDB_FILL_LINEAR) {
     genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock);
     pSliceInfo->current =
         taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
@@ -2681,10 +2678,8 @@ SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode
   pInfo->fillType = convertFillType(pInterpPhyNode->fillMode);
   initResultSizeInfo(&pOperator->resultInfo, 4096);
 
-  pInfo->pPrevRow = NULL;
+  pInfo->pFillColInfo = createFillColInfo(pExprInfo, numOfExprs, NULL, 0, (SNodeListNode*)pInterpPhyNode->pFillValues);
-  pInfo->pNextRow = NULL;
   pInfo->pLinearInfo = NULL;
-  pInfo->pFillColInfo = createFillColInfo(pExprInfo, numOfExprs, (SNodeListNode*)pInterpPhyNode->pFillValues);
   pInfo->pRes = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
   pInfo->win = pInterpPhyNode->timeRange;
   pInfo->interval.interval = pInterpPhyNode->interval;
@@ -2828,7 +2823,6 @@ _error:
     destroySWindowOperatorInfo(pInfo, numOfCols);
   }
 
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -3466,7 +3460,6 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
 
 _error:
   destroyStreamFinalIntervalOperatorInfo(pInfo, numOfCols);
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -3651,7 +3644,6 @@ _error:
     destroyStreamSessionAggOperatorInfo(pInfo, numOfCols);
   }
 
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -3769,8 +3761,8 @@ SResultWindowInfo* getSessionTimeWindow(SStreamAggSupporter* pAggSup, TSKEY star
   return insertNewSessionWindow(pWinInfos, startTs, index + 1);
 }
 
-int32_t updateSessionWindowInfo(SResultWindowInfo* pWinInfo, TSKEY* pStartTs, TSKEY* pEndTs, uint64_t groupId,int32_t rows,
+int32_t updateSessionWindowInfo(SResultWindowInfo* pWinInfo, TSKEY* pStartTs, TSKEY* pEndTs, uint64_t groupId,
-                                int32_t start, int64_t gap, SHashObj* pStDeleted) {
+                                int32_t rows, int32_t start, int64_t gap, SHashObj* pStDeleted) {
   for (int32_t i = start; i < rows; ++i) {
     if (!isInWindow(pWinInfo, pStartTs[i], gap) && (!pEndTs || !isInWindow(pWinInfo, pEndTs[i], gap))) {
       return i - start;
@@ -3947,8 +3939,8 @@ static void doStreamSessionAggImpl(SOperatorInfo* pOperator, SSDataBlock* pSData
     }
     int32_t            winIndex = 0;
     SResultWindowInfo* pCurWin = getSessionTimeWindow(pAggSup, startTsCols[i], endTsCols[i], groupId, gap, &winIndex);
-    winRows =
+    winRows = updateSessionWindowInfo(pCurWin, startTsCols, endTsCols, groupId, pSDataBlock->info.rows, i, pInfo->gap,
-        updateSessionWindowInfo(pCurWin, startTsCols, endTsCols, groupId, pSDataBlock->info.rows, i, pInfo->gap, pStDeleted);
+                                      pStDeleted);
     code = doOneWindowAgg(pInfo, pSDataBlock, pCurWin, &pResult, i, winRows, numOfOutput, pOperator);
     if (code != TSDB_CODE_SUCCESS || pResult == NULL) {
       longjmp(pTaskInfo->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
@@ -4483,7 +4475,6 @@ _error:
     destroyStreamSessionAggOperatorInfo(pInfo, pOperator->exprSupp.numOfExprs);
   }
 
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -4920,7 +4911,6 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys
 
 _error:
   destroyStreamStateOperatorInfo(pInfo, numOfCols);
-  taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -5030,7 +5020,6 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
                    tsCols, pBlock->info.rows, numOfOutput, iaInfo->inputOrder);
 }
 
-
 static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
@@ -5105,7 +5094,7 @@ static SSDataBlock* mergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
   blockDataCleanup(pRes);
 
   if (iaInfo->binfo.mergeResultBlock) {
-    while(1) {
+    while (1) {
       if (pOperator->status == OP_EXEC_DONE) {
         break;
       }
@@ -5195,7 +5184,6 @@ SOperatorInfo* createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream,
 
 _error:
   destroyMergeAlignedIntervalOperatorInfo(miaInfo, numOfCols);
-  taosMemoryFreeClear(miaInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;
@@ -5500,7 +5488,6 @@ SOperatorInfo* createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SExprI
 
 _error:
   destroyMergeIntervalOperatorInfo(miaInfo, numOfCols);
-  taosMemoryFreeClear(miaInfo);
   taosMemoryFreeClear(pOperator);
   pTaskInfo->code = code;
   return NULL;

source/libs/function/src/builtins.c

@@ -2176,7 +2176,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "top",
     .type = FUNCTION_TYPE_TOP,
-    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_FORBID_FILL_FUNC,
     .translateFunc = translateTopBot,
     .getEnvFunc   = getTopBotFuncEnv,
     .initFunc     = topBotFunctionSetup,
@@ -2191,7 +2191,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "bottom",
     .type = FUNCTION_TYPE_BOTTOM,
-    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_FORBID_FILL_FUNC,
     .translateFunc = translateTopBot,
     .getEnvFunc   = getTopBotFuncEnv,
     .initFunc     = topBotFunctionSetup,
@@ -2590,7 +2590,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "sample",
     .type = FUNCTION_TYPE_SAMPLE,
-    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_AGG_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_MULTI_ROWS_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_FORBID_FILL_FUNC,
     .translateFunc = translateSample,
     .getEnvFunc   = getSampleFuncEnv,
     .initFunc     = sampleFunctionSetup,

source/libs/index/src/index.c

@@ -62,12 +62,13 @@ static void indexDestroy(void* sIdx);
 
 void indexInit() {
   // refactor later
-  indexQhandle = taosInitScheduler(INDEX_QUEUE_SIZE, INDEX_NUM_OF_THREADS, "index");
+  indexQhandle = taosInitScheduler(INDEX_QUEUE_SIZE, INDEX_NUM_OF_THREADS, "index", NULL);
   indexRefMgt = taosOpenRef(1000, indexDestroy);
 }
 void indexCleanup() {
   // refacto later
   taosCleanUpScheduler(indexQhandle);
+  taosMemoryFreeClear(indexQhandle);
   taosCloseRef(indexRefMgt);
 }
 

source/libs/nodes/src/nodesCloneFuncs.c

@@ -451,6 +451,8 @@ static int32_t logicWindowCopy(const SWindowLogicNode* pSrc, SWindowLogicNode* p
 static int32_t logicFillCopy(const SFillLogicNode* pSrc, SFillLogicNode* pDst) {
   COPY_BASE_OBJECT_FIELD(node, logicNodeCopy);
   COPY_SCALAR_FIELD(mode);
+  CLONE_NODE_LIST_FIELD(pFillExprs);
+  CLONE_NODE_LIST_FIELD(pNotFillExprs);
   CLONE_NODE_FIELD(pWStartTs);
   CLONE_NODE_FIELD(pValues);
   COPY_OBJECT_FIELD(timeRange, sizeof(STimeWindow));

source/libs/nodes/src/nodesCodeFuncs.c

@@ -2086,9 +2086,10 @@ static int32_t jsonToPhysiIntervalNode(const SJson* pJson, void* pObj) {
 }
 
 static const char* jkFillPhysiPlanMode = "Mode";
+static const char* jkFillPhysiPlanFillExprs = "FillExprs";
+static const char* jkFillPhysiPlanNotFillExprs = "NotFillExprs";
 static const char* jkFillPhysiPlanWStartTs = "WStartTs";
 static const char* jkFillPhysiPlanValues = "Values";
-static const char* jkFillPhysiPlanTargets = "Targets";
 static const char* jkFillPhysiPlanStartTime = "StartTime";
 static const char* jkFillPhysiPlanEndTime = "EndTime";
 static const char* jkFillPhysiPlanInputTsOrder = "inputTsOrder";
@@ -2100,15 +2101,18 @@ static int32_t physiFillNodeToJson(const void* pObj, SJson* pJson) {
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonAddIntegerToObject(pJson, jkFillPhysiPlanMode, pNode->mode);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = nodeListToJson(pJson, jkFillPhysiPlanFillExprs, pNode->pFillExprs);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = nodeListToJson(pJson, jkFillPhysiPlanNotFillExprs, pNode->pNotFillExprs);
+  }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonAddObject(pJson, jkFillPhysiPlanWStartTs, nodeToJson, pNode->pWStartTs);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonAddObject(pJson, jkFillPhysiPlanValues, nodeToJson, pNode->pValues);
   }
-  if (TSDB_CODE_SUCCESS == code) {
-    code = nodeListToJson(pJson, jkFillPhysiPlanTargets, pNode->pTargets);
-  }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonAddIntegerToObject(pJson, jkFillPhysiPlanStartTime, pNode->timeRange.skey);
   }
@@ -2128,7 +2132,12 @@ static int32_t jsonToPhysiFillNode(const SJson* pJson, void* pObj) {
   int32_t code = jsonToPhysicPlanNode(pJson, pObj);
   if (TSDB_CODE_SUCCESS == code) {
     tjsonGetNumberValue(pJson, jkFillPhysiPlanMode, pNode->mode, code);
-    ;
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeList(pJson, jkFillPhysiPlanFillExprs, &pNode->pFillExprs);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeList(pJson, jkFillPhysiPlanNotFillExprs, &pNode->pNotFillExprs);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = jsonToNodeObject(pJson, jkFillPhysiPlanWStartTs, &pNode->pWStartTs);
@@ -2136,9 +2145,6 @@ static int32_t jsonToPhysiFillNode(const SJson* pJson, void* pObj) {
   if (TSDB_CODE_SUCCESS == code) {
     code = jsonToNodeObject(pJson, jkFillPhysiPlanValues, &pNode->pValues);
   }
-  if (TSDB_CODE_SUCCESS == code) {
-    code = jsonToNodeList(pJson, jkFillPhysiPlanTargets, &pNode->pTargets);
-  }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonGetBigIntValue(pJson, jkFillPhysiPlanStartTime, &pNode->timeRange.skey);
   }

source/libs/nodes/src/nodesTraverseFuncs.c

@@ -346,6 +346,7 @@ void nodesWalkSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeWalker wa
       if (NULL != pSelect->pWindow && QUERY_NODE_INTERVAL_WINDOW == nodeType(pSelect->pWindow)) {
         nodesWalkExpr(((SIntervalWindowNode*)pSelect->pWindow)->pFill, walker, pContext);
       }
+    case SQL_CLAUSE_FILL:
       nodesWalkExprs(pSelect->pGroupByList, walker, pContext);
     case SQL_CLAUSE_GROUP_BY:
       nodesWalkExpr(pSelect->pHaving, walker, pContext);
@@ -379,6 +380,7 @@ void nodesRewriteSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeRewrit
       if (NULL != pSelect->pWindow && QUERY_NODE_INTERVAL_WINDOW == nodeType(pSelect->pWindow)) {
         nodesRewriteExpr(&(((SIntervalWindowNode*)pSelect->pWindow)->pFill), rewriter, pContext);
       }
+    case SQL_CLAUSE_FILL:
       nodesRewriteExprs(pSelect->pGroupByList, rewriter, pContext);
     case SQL_CLAUSE_GROUP_BY:
       nodesRewriteExpr(&(pSelect->pHaving), rewriter, pContext);

source/libs/nodes/src/nodesUtilFuncs.c

@@ -931,9 +931,10 @@ void nodesDestroyNode(SNode* pNode) {
     case QUERY_NODE_PHYSICAL_PLAN_FILL: {
       SFillPhysiNode* pPhyNode = (SFillPhysiNode*)pNode;
       destroyPhysiNode((SPhysiNode*)pPhyNode);
+      nodesDestroyList(pPhyNode->pFillExprs);
+      nodesDestroyList(pPhyNode->pNotFillExprs);
       nodesDestroyNode(pPhyNode->pWStartTs);
       nodesDestroyNode(pPhyNode->pValues);
-      nodesDestroyList(pPhyNode->pTargets);
       break;
     }
     case QUERY_NODE_PHYSICAL_PLAN_MERGE_SESSION:

source/libs/parser/inc/sql.y

@@ -506,7 +506,7 @@ stream_options(A) ::= stream_options(B) TRIGGER AT_ONCE.
 stream_options(A) ::= stream_options(B) TRIGGER WINDOW_CLOSE.                     { ((SStreamOptions*)B)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; A = B; }
 stream_options(A) ::= stream_options(B) TRIGGER MAX_DELAY duration_literal(C).    { ((SStreamOptions*)B)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)B)->pDelay = releaseRawExprNode(pCxt, C); A = B; }
 stream_options(A) ::= stream_options(B) WATERMARK duration_literal(C).            { ((SStreamOptions*)B)->pWatermark = releaseRawExprNode(pCxt, C); A = B; }
-stream_options(A) ::= stream_options(B) IGNORE EXPIRED.                           { ((SStreamOptions*)B)->ignoreExpired = true; A = B; }
+stream_options(A) ::= stream_options(B) IGNORE EXPIRED NK_INTEGER(C).             { ((SStreamOptions*)B)->ignoreExpired = taosStr2Int8(C.z, NULL, 10); A = B; }
 
 /************************************************ kill connection/query ***********************************************/
 cmd ::= KILL CONNECTION NK_INTEGER(A).                                            { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &A); }

source/libs/parser/src/parAstCreater.c

@@ -1628,6 +1628,7 @@ SNode* createStreamOptions(SAstCreateContext* pCxt) {
   SStreamOptions* pOptions = (SStreamOptions*)nodesMakeNode(QUERY_NODE_STREAM_OPTIONS);
   CHECK_OUT_OF_MEM(pOptions);
   pOptions->triggerType = STREAM_TRIGGER_AT_ONCE;
+  pOptions->ignoreExpired = STREAM_DEFAULT_IGNORE_EXPIRED;
   return (SNode*)pOptions;
 }
 

source/libs/parser/src/parTranslater.c

@@ -2037,7 +2037,17 @@ static int32_t setVnodeSysTableVgroupList(STranslateContext* pCxt, SName* pName,
     code = getDBVgInfoImpl(pCxt, pName, &vgroupList);
   }
 
-  if (TSDB_CODE_SUCCESS == code && 0 == strcmp(pRealTable->table.tableName, TSDB_INS_TABLE_TABLES)) {
+  if (TSDB_CODE_SUCCESS == code &&
+      0 == strcmp(pRealTable->table.dbName, TSDB_INFORMATION_SCHEMA_DB) &&
+      0 == strcmp(pRealTable->table.tableName, TSDB_INS_TABLE_TAGS) &&
+      isSelectStmt(pCxt->pCurrStmt) &&
+      0 == taosArrayGetSize(vgroupList)) {
+    ((SSelectStmt*)pCxt->pCurrStmt)->isEmptyResult = true;
+  }
+
+  if (TSDB_CODE_SUCCESS == code &&
+      0 == strcmp(pRealTable->table.dbName, TSDB_INFORMATION_SCHEMA_DB) &&
+      0 == strcmp(pRealTable->table.tableName, TSDB_INS_TABLE_TABLES)) {
     code = addMnodeToVgroupList(&pCxt->pParseCxt->mgmtEpSet, &vgroupList);
   }
 

source/libs/parser/src/sql.c

@@ -139,17 +139,17 @@ typedef union {
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
 #define YYFALLBACK 1
-#define YYNSTATE             666
+#define YYNSTATE             667
 #define YYNRULE              491
 #define YYNTOKEN             305
-#define YY_MAX_SHIFT         665
+#define YY_MAX_SHIFT         666
-#define YY_MIN_SHIFTREDUCE   972
+#define YY_MIN_SHIFTREDUCE   973
-#define YY_MAX_SHIFTREDUCE   1462
+#define YY_MAX_SHIFTREDUCE   1463
-#define YY_ERROR_ACTION      1463
+#define YY_ERROR_ACTION      1464
-#define YY_ACCEPT_ACTION     1464
+#define YY_ACCEPT_ACTION     1465
-#define YY_NO_ACTION         1465
+#define YY_NO_ACTION         1466
-#define YY_MIN_REDUCE        1466
+#define YY_MIN_REDUCE        1467
-#define YY_MAX_REDUCE        1956
+#define YY_MAX_REDUCE        1957
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -218,261 +218,261 @@ typedef union {
 *********** Begin parsing tables **********************************************/
 #define YY_ACTTAB_COUNT (2548)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   525,   30,  261,  525,  548,  433,  525,  434, 1501,   11,
+ /*     0 */   526,   30,  261,  526,  549,  433,  526,  434, 1502,   11,
- /*    10 */    10,  117,   39,   37,   55, 1652, 1653,  117,  471,  378,
+ /*    10 */    10,  117,   39,   37,   55, 1653, 1654,  117,  471,  378,
- /*    20 */   339, 1467, 1263, 1005,  476, 1022, 1289, 1021, 1606, 1790,
+ /*    20 */   339, 1468, 1264, 1006,  476, 1023, 1290, 1022, 1607, 1791,
- /*    30 */  1597, 1606,  127, 1339, 1606, 1261,  441,  551,  434, 1501,
+ /*    30 */  1598, 1607,  127, 1340, 1607, 1262,  441,  552,  434, 1502,
- /*    40 */   469, 1774,  107, 1778, 1289,  106,  105,  104,  103,  102,
+ /*    40 */   469, 1775,  107, 1779, 1290,  106,  105,  104,  103,  102,
- /*    50 */   101,  100,   99,   98, 1774, 1023, 1334, 1808,  150,   64,
+ /*    50 */   101,  100,   99,   98, 1775, 1024, 1335, 1809,  150,   64,
- /*    60 */  1934,   14, 1566, 1009, 1010,  552, 1770, 1776, 1269,  450,
+ /*    60 */  1935,   14, 1567, 1010, 1011,  553, 1771, 1777, 1270,  450,
- /*    70 */  1760,  125,  576,  165,   39,   37, 1402, 1931,  570, 1770,
+ /*    70 */  1761,  125,  577,  165,   39,   37, 1403, 1932,  571, 1771,
- /*    80 */  1776,  328,  339, 1528, 1263,  550,  161, 1876, 1877,    1,
+ /*    80 */  1777,  328,  339, 1529, 1264,  551,  161, 1877, 1878,    1,
- /*    90 */  1881,  570, 1658,  479,  478, 1339, 1822, 1261, 1375,  327,
+ /*    90 */  1882,  571, 1659,  479,  478, 1340, 1823, 1262, 1376,  327,
- /*   100 */    95, 1791,  579, 1793, 1794,  575,  496,  570, 1656,  344,
+ /*   100 */    95, 1792,  580, 1794, 1795,  576,  496,  571, 1657,  344,
- /*   110 */  1868,  662, 1651, 1653,  330, 1864,  160,  513, 1334,  494,
+ /*   110 */  1869,  663, 1652, 1654,  330, 1865,  160,  513, 1335,  494,
- /*   120 */  1934,  492, 1288,   14,  325, 1341, 1342, 1704,  164,  542,
+ /*   120 */  1935,  492, 1289,   14,  325, 1342, 1343, 1705,  164,  543,
- /*   130 */  1269, 1160, 1161, 1933,   33,   32, 1894, 1931,   40,   38,
+ /*   130 */  1270, 1161, 1162, 1934,   33,   32, 1895, 1932,   40,   38,
- /*   140 */    36,   35,   34,  148,   63, 1478,  639,  638,  637,  636,
+ /*   140 */    36,   35,   34,  148,   63, 1479,  640,  639,  638,  637,
- /*   150 */   349,    2,  635,  634,  128,  629,  628,  627,  626,  625,
+ /*   150 */   349,    2,  636,  635,  128,  630,  629,  628,  627,  626,
- /*   160 */   624,  623,  139,  619,  618,  617,  348,  347,  614,  613,
+ /*   160 */   625,  624,  139,  620,  619,  618,  348,  347,  615,  614,
- /*   170 */  1264,  107, 1262,  662,  106,  105,  104,  103,  102,  101,
+ /*   170 */  1265,  107, 1263,  663,  106,  105,  104,  103,  102,  101,
- /*   180 */   100,   99,   98, 1808,   36,   35,   34, 1341, 1342,  224,
+ /*   180 */   100,   99,   98, 1809,   36,   35,   34, 1342, 1343,  224,
- /*   190 */   225,  541,  384, 1267, 1268,  612, 1316, 1317, 1319, 1320,
+ /*   190 */   225,  542,  384, 1268, 1269,  613, 1317, 1318, 1320, 1321,
- /*   200 */  1321, 1322, 1323, 1324,  572,  568, 1332, 1333, 1335, 1336,
+ /*   200 */  1322, 1323, 1324, 1325,  573,  569, 1333, 1334, 1336, 1337,
- /*   210 */  1337, 1338, 1340, 1343, 1466, 1287, 1433,   33,   32,  482,
+ /*   210 */  1338, 1339, 1341, 1344, 1467, 1288, 1434,   33,   32,  482,
- /*   220 */   481,   40,   38,   36,   35,   34,  123,  168,  540,  303,
+ /*   220 */   481,   40,   38,   36,   35,   34,  123,  168,  541,  303,
- /*   230 */  1464,  223, 1264,   84, 1262, 1263,  477,  480,  116,  115,
+ /*   230 */  1465,  223, 1265,   84, 1263, 1264,  477,  480,  116,  115,
- /*   240 */   114,  113,  112,  111,  110,  109,  108,  305, 1261, 1022,
+ /*   240 */   114,  113,  112,  111,  110,  109,  108,  305, 1262, 1023,
- /*   250 */   515, 1021,   22,  174, 1599, 1267, 1268, 1489, 1316, 1317,
+ /*   250 */   516, 1022,   22,  174, 1600, 1268, 1269, 1490, 1317, 1318,
- /*   260 */  1319, 1320, 1321, 1322, 1323, 1324,  572,  568, 1332, 1333,
+ /*   260 */  1320, 1321, 1322, 1323, 1324, 1325,  573,  569, 1333, 1334,
- /*   270 */  1335, 1336, 1337, 1338, 1340, 1343,   39,   37, 1488, 1023,
+ /*   270 */  1336, 1337, 1338, 1339, 1341, 1344,   39,   37, 1489, 1024,
- /*   280 */   537, 1269,  168,  525,  339,   71, 1263, 1487,   70,  354,
+ /*   280 */   538, 1270,  168,  526,  339,   71, 1264, 1488,   70,  354,
- /*   290 */  1243, 1244, 1707, 1790,  170,  211,  512, 1339, 1760, 1261,
+ /*   290 */  1244, 1245, 1708, 1791,  170,  211,  512, 1340, 1761, 1262,
- /*   300 */  1118,  601,  600,  599, 1122,  598, 1124, 1125,  597, 1127,
+ /*   300 */  1119,  602,  601,  600, 1123,  599, 1125, 1126,  598, 1128,
- /*   310 */   594, 1606, 1133,  591, 1135, 1136,  588,  585, 1934, 1760,
+ /*   310 */   595, 1607, 1134,  592, 1136, 1137,  589,  586, 1935, 1761,
- /*   320 */  1334, 1808, 1583, 1269,  662,   14, 1658, 1934, 1760,  552,
+ /*   320 */  1335, 1809, 1584, 1270,  663,   14, 1659, 1935, 1761,  553,
- /*   330 */  1934,  166, 1269,  343, 1760, 1931,  576, 1934,   39,   37,
+ /*   330 */  1935,  166, 1270,  343, 1761, 1932,  577, 1935,   39,   37,
- /*   340 */  1932,  487, 1656,  165, 1931,  551,  339, 1931, 1263,  548,
+ /*   340 */  1933,  487, 1657,  165, 1932,  552,  339, 1932, 1264,  549,
- /*   350 */   165,   76,  305,    2, 1931,  515,  497,  543,  538, 1339,
+ /*   350 */   165,   76,  305,    2, 1932,  516,  497,  544,  539, 1340,
- /*   360 */  1822, 1261, 1697,  159,   95, 1791,  579, 1793, 1794,  575,
+ /*   360 */  1823, 1262, 1698,  159,   95, 1792,  580, 1794, 1795,  576,
- /*   370 */   210,  570,   63,  173, 1868,  662, 1645,  127,  330, 1864,
+ /*   370 */   210,  571,   63,  173, 1869,  663, 1646,  127,  330, 1865,
- /*   380 */   160,  551, 1334, 1264,  490, 1262,  419,  604,  484, 1341,
+ /*   380 */   160,  552, 1335, 1265,  490, 1263,  419,  605,  484, 1342,
- /*   390 */  1342,   33,   32,  209, 1269,   40,   38,   36,   35,   34,
+ /*   390 */  1343,   33,   32,  209, 1270,   40,   38,   36,   35,   34,
- /*   400 */  1895,  633,  631,   39,   37, 1344, 1267, 1268, 1486,   91,
+ /*   400 */  1896,  634,  632,   39,   37, 1345, 1268, 1269, 1487,   91,
- /*   410 */   621,  339, 1790, 1263,   42,    8,  125,   40,   38,   36,
+ /*   410 */   622,  339, 1791, 1264,   42,    8,  125,   40,   38,   36,
- /*   420 */    35,   34,  124,  610, 1339,   58, 1261, 1595,   57,   49,
+ /*   420 */    35,   34,  124,  611, 1340,   58, 1262, 1596,   57,   49,
- /*   430 */  1598,  162, 1876, 1877, 1264, 1881, 1262,  662,  178,  177,
+ /*   430 */  1599,  162, 1877, 1878, 1265, 1882, 1263,  663,  178,  177,
- /*   440 */  1808,  352,  137,  136,  607,  606,  605, 1334,  574, 1760,
+ /*   440 */  1809,  352,  137,  136,  608,  607,  606, 1335,  575, 1761,
- /*   450 */    43, 1341, 1342, 1760,  316,  576, 1485, 1267, 1268, 1269,
+ /*   450 */    43, 1342, 1343, 1761,  316,  577, 1486, 1268, 1269, 1270,
- /*   460 */  1316, 1317, 1319, 1320, 1321, 1322, 1323, 1324,  572,  568,
+ /*   460 */  1317, 1318, 1320, 1321, 1322, 1323, 1324, 1325,  573,  569,
- /*   470 */  1332, 1333, 1335, 1336, 1337, 1338, 1340, 1343,   63, 1822,
+ /*   470 */  1333, 1334, 1336, 1337, 1338, 1339, 1341, 1344,   63, 1823,
- /*   480 */     9,   74, 1934,  294, 1791,  579, 1793, 1794,  575,  573,
+ /*   480 */     9,   74, 1935,  294, 1792,  580, 1794, 1795,  576,  574,
- /*   490 */   570,  567, 1840, 1288,  122,  165, 1264, 1760, 1262, 1931,
+ /*   490 */   571,  568, 1841, 1289,  122,  165, 1265, 1761, 1263, 1932,
- /*   500 */    33,   32,  662, 1601,   40,   38,   36,   35,   34,  317,
+ /*   500 */    33,   32,  663, 1602,   40,   38,   36,   35,   34,  317,
- /*   510 */   168,  315,  314, 1484,  473,  351, 1341, 1342,  475, 1267,
+ /*   510 */   168,  315,  314, 1485,  473,  351, 1342, 1343,  475, 1268,
- /*   520 */  1268, 1290, 1316, 1317, 1319, 1320, 1321, 1322, 1323, 1324,
+ /*   520 */  1269, 1291, 1317, 1318, 1320, 1321, 1322, 1323, 1324, 1325,
- /*   530 */   572,  568, 1332, 1333, 1335, 1336, 1337, 1338, 1340, 1343,
+ /*   530 */   573,  569, 1333, 1334, 1336, 1337, 1338, 1339, 1341, 1344,
- /*   540 */   474, 1009, 1010,   33,   32, 1459, 1363,   40,   38,   36,
+ /*   540 */   474, 1010, 1011,   33,   32, 1460, 1364,   40,   38,   36,
- /*   550 */    35,   34,  168,  168, 1760,  525, 1934, 1591,  377,  146,
+ /*   550 */    35,   34,  168,  168, 1761,  526, 1935, 1592,  377,  146,
- /*   560 */   376, 1264,   63, 1262,   26, 1531,  382,  168, 1609,  165,
+ /*   560 */   376, 1265,   63, 1263,   26, 1532,  382,  168, 1610,  165,
- /*   570 */    33,   32,  217, 1931,   40,   38,   36,   35,   34,  218,
+ /*   570 */    33,   32,  217, 1932,   40,   38,   36,   35,   34,  218,
- /*   580 */  1483, 1790, 1413, 1606, 1267, 1268, 1593, 1316, 1317, 1319,
+ /*   580 */  1484, 1791, 1414, 1607, 1268, 1269, 1594, 1317, 1318, 1320,
- /*   590 */  1320, 1321, 1322, 1323, 1324,  572,  568, 1332, 1333, 1335,
+ /*   590 */  1321, 1322, 1323, 1324, 1325,  573,  569, 1333, 1334, 1336,
- /*   600 */  1336, 1337, 1338, 1340, 1343,   39,   37,   77,   27, 1808,
+ /*   600 */  1337, 1338, 1339, 1341, 1344,   39,   37,   77,   27, 1809,
- /*   610 */   498, 1883,   63,  339,   78, 1263,  168,  577, 1368, 1482,
+ /*   610 */   498, 1884,   63,  339,   78, 1264,  168,  578, 1369, 1483,
- /*   620 */   505, 1760, 1760,  373,  576, 1301, 1339,   28, 1261,  482,
+ /*   620 */   505, 1761, 1761,  373,  577, 1302, 1340,   28, 1262,  482,
- /*   630 */   481, 1481, 1458,   33,   32, 1880,  123,   40,   38,   36,
+ /*   630 */   481, 1482, 1459,   33,   32, 1881,  123,   40,   38,   36,
- /*   640 */    35,   34,  375,  371,  438, 1589,  477,  480, 1822, 1334,
+ /*   640 */    35,   34,  375,  371,  438, 1590,  477,  480, 1823, 1335,
- /*   650 */  1286, 1934,   96, 1791,  579, 1793, 1794,  575,  253,  570,
+ /*   650 */  1287, 1935,   96, 1792,  580, 1794, 1795,  576,  253,  571,
- /*   660 */  1760, 1269, 1868,  513,  165, 1480, 1867, 1864, 1931, 1080,
+ /*   660 */  1761, 1270, 1869,  513,  165, 1481, 1868, 1865, 1932, 1081,
- /*   670 */    33,   32, 1760, 1705,   40,   38,   36,   35,   34,  665,
+ /*   670 */    33,   32, 1761, 1706,   40,   38,   36,   35,   34,  666,
- /*   680 */    33,   32,    9,  525,   40,   38,   36,   35,   34, 1477,
+ /*   680 */    33,   32,    9,  526,   40,   38,   36,   35,   34, 1478,
- /*   690 */  1476,   33,   32,  268,  383,   40,   38,   36,   35,   34,
+ /*   690 */  1477,   33,   32,  268,  383,   40,   38,   36,   35,   34,
- /*   700 */   168, 1703, 1082,  300,  662,  432, 1760,  157,  436, 1697,
+ /*   700 */   168, 1704, 1083,  300,  663,  432, 1761,  157,  436, 1698,
- /*   710 */   214, 1606,  655,  651,  647,  643,  266, 1581, 1341, 1342,
+ /*   710 */   214, 1607,  656,  652,  648,  644,  266, 1582, 1342, 1343,
- /*   720 */   176,   33,   32,  307,  571,   40,   38,   36,   35,   34,
+ /*   720 */   176,   33,   32,  307,  572,   40,   38,   36,   35,   34,
- /*   730 */  1760, 1760,   39,   37,  525,  603,  525,  302, 1475, 1286,
+ /*   730 */  1761, 1761,   39,   37,  526,  604,  526,  302, 1476, 1287,
- /*   740 */   339,  548, 1263,  525,  307,  389,  412,  404,   92,  424,
+ /*   740 */   339,  549, 1264,  526,  307,  389,  412,  404,   92,  424,
- /*   750 */   168,  231, 1301, 1339,  405, 1261,  440, 1584,   74,  436,
+ /*   750 */   168,  231, 1302, 1340,  405, 1262,  440, 1585,   74,  436,
- /*   760 */  1361, 1406, 1606, 1264, 1606, 1262,  397, 1288,  425,  127,
+ /*   760 */  1362, 1407, 1607, 1265, 1607, 1263,  397, 1289,  425,  127,
- /*   770 */   399, 1606, 1474, 1702, 1778,  300, 1334, 1888, 1395, 1760,
+ /*   770 */   399, 1607, 1475, 1703, 1779,  300, 1335, 1889, 1396, 1761,
- /*   780 */  1602, 1361,   44,    4,  522, 1774, 1267, 1268, 1269, 1316,
+ /*   780 */  1603, 1362,   44,    4,  523, 1775, 1268, 1269, 1270, 1317,
- /*   790 */  1317, 1319, 1320, 1321, 1322, 1323, 1324,  572,  568, 1332,
+ /*   790 */  1318, 1320, 1321, 1322, 1323, 1324, 1325,  573,  569, 1333,
- /*   800 */  1333, 1335, 1336, 1337, 1338, 1340, 1343,  390,  125,    2,
+ /*   800 */  1334, 1336, 1337, 1338, 1339, 1341, 1344,  390,  125,    2,
- /*   810 */  1770, 1776,  334, 1760, 1362,    7,  220,  450,  610,  386,
+ /*   810 */  1771, 1777,  334, 1761, 1363,    7,  220,  450,  611,  386,
- /*   820 */    90,  525,  570,  163, 1876, 1877, 1658, 1881, 1423,  145,
+ /*   820 */    90,  526,  571,  163, 1877, 1878, 1659, 1882, 1424,  145,
- /*   830 */    87,  662,  448,  312, 1235, 1362,  213,  137,  136,  607,
+ /*   830 */    87,  663,  448,  312, 1236, 1363,  213,  137,  136,  608,
- /*   840 */   606,  605, 1656, 1479, 1883, 1341, 1342,  423, 1473, 1606,
+ /*   840 */   607,  606, 1657, 1480, 1884, 1342, 1343,  423, 1474, 1607,
  /*   850 */   418,  417,  416,  415,  414,  411,  410,  409,  408,  407,
- /*   860 */   403,  402,  401,  400,  394,  393,  392,  391, 1879,  388,
+ /*   860 */   403,  402,  401,  400,  394,  393,  392,  391, 1880,  388,
- /*   870 */   387,  534, 1421, 1422, 1424, 1425,   29,  337, 1356, 1357,
+ /*   870 */   387,  535, 1422, 1423, 1425, 1426,   29,  337, 1357, 1358,
- /*   880 */  1358, 1359, 1360, 1364, 1365, 1366, 1367, 1349,   61, 1760,
+ /*   880 */  1359, 1360, 1361, 1365, 1366, 1367, 1368, 1350,   61, 1761,
- /*   890 */  1264,  608, 1262, 1288, 1649, 1934, 1399,   29,  337, 1356,
+ /*   890 */  1265,  609, 1263, 1289, 1650, 1935, 1400,   29,  337, 1357,
- /*   900 */  1357, 1358, 1359, 1360, 1364, 1365, 1366, 1367,  166, 1582,
+ /*   900 */  1358, 1359, 1360, 1361, 1365, 1366, 1367, 1368,  166, 1583,
- /*   910 */  1790, 1472, 1931, 1267, 1268, 1471, 1316, 1317, 1319, 1320,
+ /*   910 */  1791, 1473, 1932, 1268, 1269, 1472, 1317, 1318, 1320, 1321,
- /*   920 */  1321, 1322, 1323, 1324,  572,  568, 1332, 1333, 1335, 1336,
+ /*   920 */  1322, 1323, 1324, 1325,  573,  569, 1333, 1334, 1336, 1337,
- /*   930 */  1337, 1338, 1340, 1343,  622,  147, 1578, 1790, 1808,  525,
+ /*   930 */  1338, 1339, 1341, 1344,  623,  147, 1579, 1791, 1809,  526,
- /*   940 */   279,  610,  609,  256, 1318, 1649,  577, 1883, 1470, 1469,
+ /*   940 */   279,  611,  610,  256, 1319, 1650,  578, 1884, 1471, 1470,
- /*   950 */   449, 1760, 1760,  576,  277,   60, 1760,  475,   59, 1291,
+ /*   950 */   449, 1761, 1761,  577,  277,   60, 1761,  475,   59, 1292,
- /*   960 */   137,  136,  607,  606,  605, 1808,  553, 1606, 1288,  612,
+ /*   960 */   137,  136,  608,  607,  606, 1809,  554, 1607, 1289,  613,
- /*   970 */  1567, 1878,  135,  577,  181,  429,  427, 1822, 1760,  474,
+ /*   970 */  1568, 1879,  135,  578,  181,  429,  427, 1823, 1761,  474,
- /*   980 */   576,   94, 1791,  579, 1793, 1794,  575,  535,  570, 1760,
+ /*   980 */   577,   94, 1792,  580, 1794, 1795,  576,  536,  571, 1761,
- /*   990 */  1760, 1868, 1779,  553,  468,  306, 1864,  273,   53,  509,
+ /*   990 */  1761, 1869, 1780,  554,  468,  306, 1865,  273,   53,  509,
- /*  1000 */  1636, 1658, 1395, 1774, 1822,  525,   63, 1934,   94, 1791,
+ /*  1000 */  1637, 1659, 1396, 1775, 1823,  526,   63, 1935,   94, 1792,
- /*  1010 */   579, 1793, 1794,  575,  525,  570, 1603, 1657, 1868,   54,
+ /*  1010 */   580, 1794, 1795,  576,  526,  571, 1604, 1658, 1869,   54,
- /*  1020 */   167, 1747,  306, 1864, 1931, 1735, 1518,  202, 1770, 1776,
+ /*  1020 */   167, 1748,  306, 1865, 1932, 1736, 1519,  202, 1771, 1777,
- /*  1030 */   200,  336,  335, 1606, 1934, 1461, 1462,  557,  525,  525,
+ /*  1030 */   200,  336,  335, 1607, 1935, 1462, 1463,  558,  526,  526,
- /*  1040 */   570, 1277, 1606, 1272,   93,  525,  525,  165,  483,  506,
+ /*  1040 */   571, 1278, 1607, 1273,   93,  526,  526,  165,  483,  506,
- /*  1050 */   510, 1931, 1339,  560, 1270,  326,  228,  521,  525,  204,
+ /*  1050 */   510, 1932, 1340,  561, 1271,  326,  228,  522,  526,  204,
- /*  1060 */   525, 1790,  203,  146,  499,  525, 1606, 1606,  361,  523,
+ /*  1060 */   526, 1791,  203,  146,  499,  526, 1607, 1607,  361,  524,
- /*  1070 */  1318,  524, 1608, 1606, 1606, 1334,  262,   41,  222,   68,
+ /*  1070 */  1319,  525, 1609, 1607, 1607, 1335,  262,   41,  222,   68,
- /*  1080 */    67,  381,  342,  525,  172, 1271, 1606, 1269, 1606, 1808,
+ /*  1080 */    67,  381,  342,  526,  172, 1272, 1607, 1270, 1607, 1809,
- /*  1090 */   146,  131,  245, 1606,  346,  206,  233,  577,  205, 1608,
+ /*  1090 */   146,  131,  245, 1607,  346,  206,  233,  578,  205, 1609,
- /*  1100 */   301,  566, 1760,  369,  576,  367,  363,  359,  356,  353,
+ /*  1100 */   301,  567, 1761,  369,  577,  367,  363,  359,  356,  353,
- /*  1110 */   345, 1606, 1781,  208,  134,  135,  207, 1809,  146, 1513,
+ /*  1110 */   345, 1607, 1782,  208,  134,  135,  207, 1810,  146, 1514,
- /*  1120 */  1398, 1511,   51, 1790, 1212,  226,  237, 1608, 1822,  555,
+ /*  1120 */  1399, 1512,   51, 1791, 1213,  226,  237, 1609, 1823,  556,
- /*  1130 */   565,   51,   95, 1791,  579, 1793, 1794,  575,  518,  570,
+ /*  1130 */   566,   51,   95, 1792,  580, 1794, 1795,  576,  519,  571,
- /*  1140 */    41,  485, 1868,  488,  168, 1318,  330, 1864, 1947,   11,
+ /*  1140 */    41,  485, 1869,  488,  168, 1319,  330, 1865, 1948,   11,
- /*  1150 */    10, 1808,  615,   41,  616, 1783,  350, 1902,  583,  577,
+ /*  1150 */    10, 1809,  616,   41,  617, 1784,  350, 1903,  584,  578,
- /*  1160 */   134,  230, 1111, 1502, 1760, 1646,  576,  135,  119, 1420,
+ /*  1160 */   134,  230, 1112, 1503, 1761, 1647,  577,  135,  119, 1421,
- /*  1170 */   134, 1898,  549,  240, 1068, 1790, 1066,  255, 1369,  250,
+ /*  1170 */   134, 1899,  550,  240, 1069, 1791, 1067,  255, 1370,  250,
- /*  1180 */  1275,  258,  260,    3,    5,  355,  313, 1325, 1049, 1278,
+ /*  1180 */  1276,  258,  260,    3,    5,  355,  313, 1326, 1050, 1279,
- /*  1190 */  1822, 1273,  360, 1228,   95, 1791,  579, 1793, 1794,  575,
+ /*  1190 */  1823, 1274,  360, 1229,   95, 1792,  580, 1794, 1795,  576,
- /*  1200 */   272,  570,  269, 1808, 1868, 1139, 1507, 1143,  330, 1864,
+ /*  1200 */   272,  571,  269, 1809, 1869, 1140, 1508, 1144,  330, 1865,
- /*  1210 */  1947,  577, 1281, 1283, 1150, 1148, 1760,  138,  576, 1925,
+ /*  1210 */  1948,  578, 1282, 1284, 1151, 1149, 1761,  138,  577, 1926,
- /*  1220 */   175, 1050, 1274, 1286,  568, 1332, 1333, 1335, 1336, 1337,
+ /*  1220 */   175, 1051, 1275, 1287,  569, 1333, 1334, 1336, 1337, 1338,
- /*  1230 */  1338, 1790,  385, 1353,  406, 1699,  413,  421,  420, 1292,
+ /*  1230 */  1339, 1791,  385, 1354,  406, 1700,  413,  421,  420, 1293,
- /*  1240 */   558, 1790, 1822,  422,  426,  431,   95, 1791,  579, 1793,
+ /*  1240 */   559, 1791, 1823,  422,  426,  431,   95, 1792,  580, 1794,
- /*  1250 */  1794,  575,  428,  570,  657,  439, 1868,  430,  561, 1808,
+ /*  1250 */  1795,  576,  428,  571,  658,  439, 1869,  430,  562, 1809,
- /*  1260 */   330, 1864, 1947, 1294,  442,  443,  184,  577, 1293, 1808,
+ /*  1260 */   330, 1865, 1948, 1295,  442,  443,  184,  578, 1294, 1809,
- /*  1270 */   186, 1887, 1760, 1295,  576,  444,  445,  577,  189,  447,
+ /*  1270 */   186, 1888, 1761, 1296,  577,  444,  445,  578,  189,  447,
- /*  1280 */   191,   72, 1760,   73,  576,  451,  470,  553,  195,  472,
+ /*  1280 */   191,   72, 1761,   73,  577,  451,  470,  554,  195,  472,
- /*  1290 */  1790,  304, 1596,  199,  118, 1592, 1740,  553, 1822,  501,
+ /*  1290 */  1791,  304, 1597,  199,  118, 1593, 1741,  554, 1823,  501,
- /*  1300 */   201,  140,  286, 1791,  579, 1793, 1794,  575, 1822,  570,
+ /*  1300 */   201,  140,  286, 1792,  580, 1794, 1795,  576, 1823,  571,
- /*  1310 */   141, 1594,  286, 1791,  579, 1793, 1794,  575, 1808,  570,
+ /*  1310 */   141, 1595,  286, 1792,  580, 1794, 1795,  576, 1809,  571,
- /*  1320 */  1590,  142,  143,  212,  270,  500,  577,  215, 1934,  507,
+ /*  1320 */  1591,  142,  143,  212,  270,  500,  578,  215, 1935,  507,
- /*  1330 */   504, 1760,  511,  576,  322,  219,  533,  514, 1934,  132,
+ /*  1330 */   504, 1761,  511,  577,  322,  219,  534,  514, 1935,  132,
- /*  1340 */  1739,  167, 1709,  519,  516, 1931,  133,  324,   81,  520,
+ /*  1340 */  1740,  167, 1710,  520,  517, 1932,  133,  324,   81,  521,
- /*  1350 */  1790,  165, 1291,  529,  271, 1931,   83, 1822, 1607,  235,
+ /*  1350 */  1791,  165, 1292,  530,  271, 1932,   83, 1823, 1608,  235,
- /*  1360 */  1790,   96, 1791,  579, 1793, 1794,  575, 1899,  570,  536,
+ /*  1360 */  1791,   96, 1792,  580, 1794, 1795,  576, 1900,  571,  537,
- /*  1370 */   239, 1868,  531, 1909,    6,  564, 1864,  532, 1808,  545,
+ /*  1370 */   239, 1869,  532, 1910,    6,  565, 1865,  533, 1809,  546,
- /*  1380 */   329, 1908,  539,  530,  528,  244,  577, 1890, 1808,  527,
+ /*  1380 */   329, 1909,  540,  531,  529,  244,  578, 1891, 1809,  528,
- /*  1390 */  1395, 1760, 1290,  576,  154,  126,  577,  249,  562,  559,
+ /*  1390 */  1396, 1761, 1291,  577,  154,  126,  578,  249,  563,  560,
- /*  1400 */   246, 1760,   48,  576, 1884,  247,  331,  248,   85, 1790,
+ /*  1400 */   246, 1761,   48,  577, 1885,  247,  331,  248,   85, 1791,
- /*  1410 */   581, 1650, 1579,  265,  274,  658,  659, 1822, 1930,  661,
+ /*  1410 */   582, 1651, 1580,  265,  274,  659,  660, 1823, 1931,  662,
- /*  1420 */    52,  149, 1791,  579, 1793, 1794,  575, 1822,  570, 1950,
+ /*  1420 */    52,  149, 1792,  580, 1794, 1795,  576, 1823,  571, 1951,
- /*  1430 */   153,   96, 1791,  579, 1793, 1794,  575, 1808,  570,  556,
+ /*  1430 */   153,   96, 1792,  580, 1794, 1795,  576, 1809,  571,  557,
- /*  1440 */  1754, 1868,  323,  287,  297,  577, 1865, 1849,  296,  254,
+ /*  1440 */  1755, 1869,  323,  287,  297,  578, 1866, 1850,  296,  254,
- /*  1450 */  1760,  276,  576,  563, 1753,  278,  257,  259,   65, 1752,
+ /*  1450 */  1761,  276,  577,  564, 1754,  278,  257,  259,   65, 1753,
- /*  1460 */  1790, 1751,   66, 1748,  357,  554, 1948,  358, 1255, 1256,
+ /*  1460 */  1791, 1752,   66, 1749,  357,  555, 1949,  358, 1256, 1257,
- /*  1470 */   171,  362, 1746,  364,  365,  366, 1822, 1745, 1744,  368,
+ /*  1470 */   171,  362, 1747,  364,  365,  366, 1823, 1746, 1745,  368,
- /*  1480 */   295, 1791,  579, 1793, 1794,  575,  370,  570, 1808, 1743,
+ /*  1480 */   295, 1792,  580, 1794, 1795,  576,  370,  571, 1809, 1744,
- /*  1490 */   372, 1742,  374,  526, 1231, 1230,  577, 1720, 1719,  379,
+ /*  1490 */   372, 1743,  374,  527, 1232, 1231,  578, 1721, 1720,  379,
- /*  1500 */   380, 1760, 1200,  576, 1718, 1717, 1692,  129, 1691, 1690,
+ /*  1500 */   380, 1761, 1201,  577, 1719, 1718, 1693,  129, 1692, 1691,
- /*  1510 */  1689,   69, 1790, 1688, 1687, 1686, 1685, 1684,  395,  396,
+ /*  1510 */  1690,   69, 1791, 1689, 1688, 1687, 1686, 1685,  395,  396,
- /*  1520 */  1683,  398, 1790,  130, 1668, 1667, 1666, 1822, 1682, 1681,
+ /*  1520 */  1684,  398, 1791,  130, 1669, 1668, 1667, 1823, 1683, 1682,
- /*  1530 */  1680,  295, 1791,  579, 1793, 1794,  575, 1679,  570, 1790,
+ /*  1530 */  1681,  295, 1792,  580, 1794, 1795,  576, 1680,  571, 1791,
- /*  1540 */  1808, 1678, 1677, 1676, 1675, 1674, 1673, 1672,  577, 1671,
+ /*  1540 */  1809, 1679, 1678, 1677, 1676, 1675, 1674, 1673,  578, 1672,
- /*  1550 */  1808, 1670, 1669, 1760, 1665,  576, 1664, 1663,  577, 1662,
+ /*  1550 */  1809, 1671, 1670, 1761, 1666,  577, 1665, 1664,  578, 1663,
- /*  1560 */  1202, 1661, 1660, 1760, 1659,  576, 1533, 1808,  179, 1532,
+ /*  1560 */  1203, 1662, 1661, 1761, 1660,  577, 1534, 1809,  179, 1533,
- /*  1570 */  1530, 1498,  120,  182,  180,  574, 1497,  158,  435, 1822,
+ /*  1570 */  1531, 1499,  120,  182,  180,  575, 1498,  158,  435, 1823,
- /*  1580 */  1760, 1012,  576,  290, 1791,  579, 1793, 1794,  575, 1822,
+ /*  1580 */  1761, 1013,  577,  290, 1792,  580, 1794, 1795,  576, 1823,
- /*  1590 */   570,  190, 1011,  149, 1791,  579, 1793, 1794,  575, 1790,
+ /*  1590 */   571,  190, 1012,  149, 1792,  580, 1794, 1795,  576, 1791,
- /*  1600 */   570,  437, 1733,  183,  121, 1727, 1822, 1716, 1715, 1701,
+ /*  1600 */   571,  437, 1734,  183,  121, 1728, 1823, 1717, 1716, 1702,
- /*  1610 */   294, 1791,  579, 1793, 1794,  575, 1790,  570,  188, 1841,
+ /*  1610 */   294, 1792,  580, 1794, 1795,  576, 1791,  571,  188, 1842,
- /*  1620 */  1585,  544, 1042, 1529, 1527,  452,  454, 1808, 1525,  453,
+ /*  1620 */  1586,  545, 1043, 1530, 1528,  452,  454, 1809, 1526,  453,
- /*  1630 */   456,  457,  338,  458, 1523,  577,  460,  462, 1949,  461,
+ /*  1630 */   456,  457,  338,  458, 1524,  578,  460,  462, 1950,  461,
- /*  1640 */  1760, 1521,  576,  465, 1808,  464, 1510, 1509, 1494,  340,
+ /*  1640 */  1761, 1522,  577,  465, 1809,  464, 1511, 1510, 1495,  340,
- /*  1650 */   466, 1587,  577, 1154, 1153, 1586,   50, 1760,  630,  576,
+ /*  1650 */   466, 1588,  578, 1155, 1154, 1587,   50, 1761,  631,  577,
- /*  1660 */  1079, 1076,  632, 1519,  198, 1075, 1822, 1074, 1514, 1512,
+ /*  1660 */  1080, 1077,  633, 1520,  198, 1076, 1823, 1075, 1515, 1513,
- /*  1670 */   295, 1791,  579, 1793, 1794,  575,  318,  570,  319,  320,
+ /*  1670 */   295, 1792,  580, 1794, 1795,  576,  318,  571,  319,  320,
- /*  1680 */   486, 1493, 1492, 1822, 1790,  489,  197,  295, 1791,  579,
+ /*  1680 */   486, 1494, 1493, 1823, 1791,  489,  197,  295, 1792,  580,
- /*  1690 */  1793, 1794,  575,  491,  570, 1491,  493,  495,   97, 1732,
+ /*  1690 */  1794, 1795,  576,  491,  571, 1492,  493,  495,   97, 1733,
- /*  1700 */   152, 1237, 1790, 1726,  216,  467,  463,  459,  455,  196,
+ /*  1700 */   152, 1238, 1791, 1727,  216,  467,  463,  459,  455,  196,
- /*  1710 */    56,  502, 1808,  144, 1714, 1712, 1713, 1711, 1710,  221,
+ /*  1710 */    56,  502, 1809,  144, 1715, 1713, 1714, 1712, 1711,  221,
- /*  1720 */   577, 1247,   15, 1708,  227, 1760,   79,  576, 1700,  503,
+ /*  1720 */   578, 1248,   15, 1709,  227, 1761,   79,  577, 1701,  503,
- /*  1730 */  1808,  321,  508,   80,  232,  517,  229,   87,  577,   41,
+ /*  1730 */  1809,  321,  508,   80,  232,  518,   41,   87,  578,  229,
- /*  1740 */    47,   75,   16, 1760,  194,  576,  243,  242,   82,   25,
+ /*  1740 */    47,   75,   16, 1761,  194,  577,  243,  242,   82,   25,
- /*  1750 */    17, 1822, 1435,   23,  234,  280, 1791,  579, 1793, 1794,
+ /*  1750 */    17, 1823, 1436,   23,  234,  280, 1792,  580, 1794, 1795,
- /*  1760 */   575, 1790,  570,  236, 1417,  238, 1781, 1419,  151, 1822,
+ /*  1760 */   576, 1791,  571,  236, 1418,  515,  238, 1782,  151, 1823,
- /*  1770 */  1412,  252,  241,  281, 1791,  579, 1793, 1794,  575,   24,
+ /*  1770 */  1420,  252,  241,  281, 1792,  580, 1794, 1795,  576,   24,
- /*  1780 */   570,   86,   46, 1392, 1780,   18,  155, 1447, 1391, 1808,
+ /*  1780 */   571, 1413, 1393,   46, 1781,   86,   18,  155, 1392, 1809,
- /*  1790 */  1446, 1452, 1441,  332, 1451, 1450,  333,  577,   10, 1279,
+ /*  1790 */  1448, 1453, 1442, 1447,  332, 1452, 1451,  578,  333,   10,
- /*  1800 */    45, 1825, 1760, 1329,  576, 1354,  193,  187,   13,  192,
+ /*  1800 */    45, 1280, 1761, 1330,  577, 1355,  193,  187,   13,  192,
- /*  1810 */  1790,   19, 1327,  446, 1326,  156,  569,  169,   31,   12,
+ /*  1810 */  1791,   19, 1328,  446, 1327,  156, 1826,  169,  570,   31,
- /*  1820 */    20, 1309,  578,   21,  582, 1140,  341, 1137, 1822,  185,
+ /*  1820 */    12,   20, 1310,   21,  583, 1141,  341, 1138, 1823,  185,
- /*  1830 */   586, 1790,  282, 1791,  579, 1793, 1794,  575, 1808,  570,
+ /*  1830 */   587, 1791,  282, 1792,  580, 1794, 1795,  576, 1809,  571,
- /*  1840 */   584,  580,  587,  589, 1134,  590,  577, 1128,  592,  595,
+ /*  1840 */   585,  588,  581, 1135,  579,  590,  578, 1129,  593,  596,
- /*  1850 */  1117, 1760,  593,  576, 1126,  596, 1132, 1131, 1130, 1808,
+ /*  1850 */  1118, 1761, 1127,  577,  591,  594,  597, 1133, 1132, 1809,
- /*  1860 */  1129,   88,   89,  602,  263, 1149, 1145,  577,   62, 1040,
+ /*  1860 */  1131, 1130,   88,   89,  263,  603, 1150,  578, 1146,   62,
- /*  1870 */   611, 1071, 1760, 1070,  576, 1069, 1067, 1822, 1065, 1086,
+ /*  1870 */  1041, 1072, 1761,  612,  577, 1071, 1070, 1823, 1068, 1066,
- /*  1880 */  1064,  289, 1791,  579, 1793, 1794,  575, 1063,  570, 1790,
+ /*  1880 */  1065,  289, 1792,  580, 1794, 1795,  576, 1064,  571, 1791,
- /*  1890 */   620,  264, 1061, 1060, 1059, 1058, 1057, 1056, 1822, 1790,
+ /*  1890 */  1087,  621,  264, 1062, 1061, 1060, 1059, 1058, 1823, 1791,
- /*  1900 */  1055, 1083,  291, 1791,  579, 1793, 1794,  575, 1081,  570,
+ /*  1900 */  1057, 1056,  291, 1792,  580, 1794, 1795,  576, 1047,  571,
- /*  1910 */  1052, 1051, 1048, 1047, 1046, 1045, 1526, 1808,  640, 1524,
+ /*  1910 */  1084, 1082, 1053, 1052, 1049, 1048, 1046, 1809, 1527,  641,
- /*  1920 */   642,  644, 1522,  646,  648,  577,  641, 1808, 1520,  645,
+ /*  1920 */  1525,  642,  643,  645,  647,  578, 1523, 1809,  649,  646,
- /*  1930 */  1760,  652,  576,  650,  649,  577,  654, 1508,  653,  656,
+ /*  1930 */  1761,  651,  577, 1521,  650,  578,  653,  655,  654, 1509,
- /*  1940 */  1760, 1002,  576, 1490,  664,  267,  660, 1465, 1265,  275,
+ /*  1940 */  1761,  657,  577, 1491, 1003,  267,  661, 1466, 1466, 1266,
- /*  1950 */   663, 1790, 1465, 1465, 1465, 1465, 1822, 1465, 1465, 1465,
+ /*  1950 */   275, 1791,  664, 1466,  665, 1466, 1823, 1466, 1466, 1466,
- /*  1960 */   283, 1791,  579, 1793, 1794,  575, 1822,  570, 1790, 1465,
+ /*  1960 */   283, 1792,  580, 1794, 1795,  576, 1823,  571, 1791, 1466,
- /*  1970 */   292, 1791,  579, 1793, 1794,  575, 1465,  570, 1465, 1808,
+ /*  1970 */   292, 1792,  580, 1794, 1795,  576, 1466,  571, 1466, 1809,
- /*  1980 */  1465, 1465, 1465, 1465, 1465, 1465, 1465,  577, 1465, 1465,
+ /*  1980 */  1466, 1466, 1466, 1466, 1466, 1466, 1466,  578, 1466, 1466,
- /*  1990 */  1465, 1465, 1760, 1465,  576, 1465, 1808, 1465, 1465, 1465,
+ /*  1990 */  1466, 1466, 1761, 1466,  577, 1466, 1809, 1466, 1466, 1466,
- /*  2000 */  1465, 1465, 1465, 1465,  577, 1465, 1465, 1465, 1465, 1760,
+ /*  2000 */  1466, 1466, 1466, 1466,  578, 1466, 1466, 1466, 1466, 1761,
- /*  2010 */  1465,  576, 1465, 1465, 1465, 1465, 1465, 1790, 1822, 1465,
+ /*  2010 */  1466,  577, 1466, 1466, 1466, 1466, 1466, 1791, 1823, 1466,
- /*  2020 */  1465, 1465,  284, 1791,  579, 1793, 1794,  575, 1465,  570,
+ /*  2020 */  1466, 1466,  284, 1792,  580, 1794, 1795,  576, 1466,  571,
- /*  2030 */  1465, 1465, 1465, 1465, 1790, 1822, 1465, 1465, 1465,  293,
+ /*  2030 */  1466, 1466, 1466, 1466, 1791, 1823, 1466, 1466, 1466,  293,
- /*  2040 */  1791,  579, 1793, 1794,  575, 1808,  570, 1465, 1465, 1465,
+ /*  2040 */  1792,  580, 1794, 1795,  576, 1809,  571, 1466, 1466, 1466,
- /*  2050 */  1465, 1465, 1465,  577, 1465, 1465, 1465, 1465, 1760, 1465,
+ /*  2050 */  1466, 1466, 1466,  578, 1466, 1466, 1466, 1466, 1761, 1466,
- /*  2060 */   576, 1465, 1808, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2060 */   577, 1466, 1809, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2070 */   577, 1465, 1465, 1465, 1465, 1760, 1465,  576, 1465, 1465,
+ /*  2070 */   578, 1466, 1466, 1466, 1466, 1761, 1466,  577, 1466, 1466,
- /*  2080 */  1465, 1465, 1465, 1790, 1822, 1465, 1465, 1465,  285, 1791,
+ /*  2080 */  1466, 1466, 1466, 1791, 1823, 1466, 1466, 1466,  285, 1792,
- /*  2090 */   579, 1793, 1794,  575, 1465,  570, 1465, 1465, 1465, 1465,
+ /*  2090 */   580, 1794, 1795,  576, 1466,  571, 1466, 1466, 1466, 1466,
- /*  2100 */  1465, 1822, 1465, 1465, 1465,  298, 1791,  579, 1793, 1794,
+ /*  2100 */  1466, 1823, 1466, 1466, 1466,  298, 1792,  580, 1794, 1795,
- /*  2110 */   575, 1808,  570, 1465, 1465, 1465, 1465, 1465, 1465,  577,
+ /*  2110 */   576, 1809,  571, 1466, 1466, 1466, 1466, 1466, 1466,  578,
- /*  2120 */  1465, 1465, 1465, 1465, 1760, 1465,  576, 1465, 1465, 1465,
+ /*  2120 */  1466, 1466, 1466, 1466, 1761, 1466,  577, 1466, 1466, 1466,
- /*  2130 */  1465, 1465, 1465, 1465, 1465, 1465, 1465, 1790, 1465, 1465,
+ /*  2130 */  1466, 1466, 1466, 1466, 1466, 1466, 1466, 1791, 1466, 1466,
- /*  2140 */  1465, 1465, 1465, 1465, 1465, 1465, 1465, 1790, 1465, 1465,
+ /*  2140 */  1466, 1466, 1466, 1466, 1466, 1466, 1466, 1791, 1466, 1466,
- /*  2150 */  1822, 1465, 1465, 1465,  299, 1791,  579, 1793, 1794,  575,
+ /*  2150 */  1823, 1466, 1466, 1466,  299, 1792,  580, 1794, 1795,  576,
- /*  2160 */  1465,  570, 1465, 1465, 1465, 1808, 1465, 1465, 1465, 1465,
+ /*  2160 */  1466,  571, 1466, 1466, 1466, 1809, 1466, 1466, 1466, 1466,
- /*  2170 */  1465, 1465, 1465,  577, 1465, 1808, 1465, 1465, 1760, 1465,
+ /*  2170 */  1466, 1466, 1466,  578, 1466, 1809, 1466, 1466, 1761, 1466,
- /*  2180 */   576, 1465, 1465,  577, 1465, 1465, 1465, 1465, 1760, 1465,
+ /*  2180 */   577, 1466, 1466,  578, 1466, 1466, 1466, 1466, 1761, 1466,
- /*  2190 */   576, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1790, 1465,
+ /*  2190 */   577, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1791, 1466,
- /*  2200 */  1465, 1465, 1465, 1465, 1822, 1465, 1465, 1465, 1802, 1791,
+ /*  2200 */  1466, 1466, 1466, 1466, 1823, 1466, 1466, 1466, 1803, 1792,
- /*  2210 */   579, 1793, 1794,  575, 1822,  570, 1790, 1465, 1801, 1791,
+ /*  2210 */   580, 1794, 1795,  576, 1823,  571, 1791, 1466, 1802, 1792,
- /*  2220 */   579, 1793, 1794,  575, 1465,  570, 1808, 1465, 1465, 1465,
+ /*  2220 */   580, 1794, 1795,  576, 1466,  571, 1809, 1466, 1466, 1466,
- /*  2230 */  1465, 1465, 1465, 1465,  577, 1465, 1465, 1465, 1465, 1760,
+ /*  2230 */  1466, 1466, 1466, 1466,  578, 1466, 1466, 1466, 1466, 1761,
- /*  2240 */  1465,  576, 1465, 1465, 1808, 1465, 1465, 1465, 1465, 1465,
+ /*  2240 */  1466,  577, 1466, 1466, 1809, 1466, 1466, 1466, 1466, 1466,
- /*  2250 */  1465, 1465,  577, 1465, 1465, 1465, 1465, 1760, 1465,  576,
+ /*  2250 */  1466, 1466,  578, 1466, 1466, 1466, 1466, 1761, 1466,  577,
- /*  2260 */  1465, 1465, 1465, 1465, 1465, 1822, 1465, 1465, 1465, 1800,
+ /*  2260 */  1466, 1466, 1466, 1466, 1466, 1823, 1466, 1466, 1466, 1801,
- /*  2270 */  1791,  579, 1793, 1794,  575, 1790,  570, 1465, 1465, 1465,
+ /*  2270 */  1792,  580, 1794, 1795,  576, 1791,  571, 1466, 1466, 1466,
- /*  2280 */  1465, 1465, 1465, 1822, 1465, 1465, 1465,  310, 1791,  579,
+ /*  2280 */  1466, 1466, 1466, 1823, 1466, 1466, 1466,  310, 1792,  580,
- /*  2290 */  1793, 1794,  575, 1465,  570, 1465, 1790, 1465, 1465, 1465,
+ /*  2290 */  1794, 1795,  576, 1466,  571, 1466, 1791, 1466, 1466, 1466,
- /*  2300 */  1465, 1465, 1465, 1808, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2300 */  1466, 1466, 1466, 1809, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2310 */  1465,  577, 1465, 1465, 1465, 1465, 1760, 1465,  576, 1465,
+ /*  2310 */  1466,  578, 1466, 1466, 1466, 1466, 1761, 1466,  577, 1466,
- /*  2320 */  1465, 1465, 1465, 1465, 1808, 1465, 1465, 1465, 1465, 1465,
+ /*  2320 */  1466, 1466, 1466, 1466, 1809, 1466, 1466, 1466, 1466, 1466,
- /*  2330 */  1465, 1465,  577, 1465, 1465, 1465, 1465, 1760, 1465,  576,
+ /*  2330 */  1466, 1466,  578, 1466, 1466, 1466, 1466, 1761, 1466,  577,
- /*  2340 */  1465, 1465, 1822, 1465, 1465, 1465,  309, 1791,  579, 1793,
+ /*  2340 */  1466, 1466, 1823, 1466, 1466, 1466,  309, 1792,  580, 1794,
- /*  2350 */  1794,  575, 1790,  570, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2350 */  1795,  576, 1791,  571, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2360 */  1465, 1465, 1790, 1822, 1465, 1465, 1465,  311, 1791,  579,
+ /*  2360 */  1466, 1466, 1791, 1823, 1466, 1466, 1466,  311, 1792,  580,
- /*  2370 */  1793, 1794,  575, 1465,  570, 1465, 1465, 1465, 1465, 1465,
+ /*  2370 */  1794, 1795,  576, 1466,  571, 1466, 1466, 1466, 1466, 1466,
- /*  2380 */  1808, 1465, 1465, 1465, 1465, 1465, 1465, 1465,  577, 1465,
+ /*  2380 */  1809, 1466, 1466, 1466, 1466, 1466, 1466, 1466,  578, 1466,
- /*  2390 */  1808, 1465, 1465, 1760,  548,  576, 1465, 1465,  577, 1465,
+ /*  2390 */  1809, 1466, 1466, 1761,  549,  577, 1466, 1466,  578, 1466,
- /*  2400 */  1465, 1465, 1465, 1760, 1465,  576, 1465, 1465, 1465, 1465,
+ /*  2400 */  1466, 1466, 1466, 1761, 1466,  577, 1466, 1466, 1466, 1466,
- /*  2410 */  1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1822,
+ /*  2410 */  1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1823,
- /*  2420 */  1465, 1465,  127,  308, 1791,  579, 1793, 1794,  575, 1822,
+ /*  2420 */  1466, 1466,  127,  308, 1792,  580, 1794, 1795,  576, 1823,
- /*  2430 */   570, 1465, 1465,  288, 1791,  579, 1793, 1794,  575, 1465,
+ /*  2430 */   571, 1466, 1466,  288, 1792,  580, 1794, 1795,  576, 1466,
- /*  2440 */   570,  548,  553, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2440 */   571,  549,  554, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2450 */  1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2450 */  1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2460 */  1465,  125, 1465, 1465, 1465, 1465, 1465, 1465, 1465,  127,
+ /*  2460 */  1466,  125, 1466, 1466, 1466, 1466, 1466, 1466, 1466,  127,
- /*  2470 */  1465, 1465, 1465, 1465, 1465, 1465,  251, 1876,  547, 1465,
+ /*  2470 */  1466, 1466, 1466, 1466, 1466, 1466,  251, 1877,  548, 1466,
- /*  2480 */   546, 1465, 1465, 1934, 1465, 1465, 1465, 1465, 1465,  553,
+ /*  2480 */   547, 1466, 1466, 1935, 1466, 1466, 1466, 1466, 1466,  554,
- /*  2490 */  1465, 1465, 1465, 1465, 1465, 1465,  167, 1465, 1465, 1465,
+ /*  2490 */  1466, 1466, 1466, 1466, 1466, 1466,  167, 1466, 1466, 1466,
- /*  2500 */  1931, 1465, 1465, 1465, 1465, 1465, 1465, 1465,  125, 1465,
+ /*  2500 */  1932, 1466, 1466, 1466, 1466, 1466, 1466, 1466,  125, 1466,
- /*  2510 */  1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2510 */  1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2520 */  1465, 1465, 1465,  251, 1876,  547, 1465,  546, 1465, 1465,
+ /*  2520 */  1466, 1466, 1466,  251, 1877,  548, 1466,  547, 1466, 1466,
- /*  2530 */  1934, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /*  2530 */  1935, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
- /*  2540 */  1465, 1465, 1465,  165, 1465, 1465, 1465, 1931,
+ /*  2540 */  1466, 1466, 1466,  165, 1466, 1466, 1466, 1932,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   316,  390,  391,  316,  316,  312,  316,  314,  315,    1,
@@ -647,30 +647,30 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  1690 */   382,  383,  384,   35,  386,    0,   35,   22,   20,    0,
  /*  1700 */    47,   35,  308,    0,  154,   52,   53,   54,   55,   56,
  /*  1710 */   157,   22,  336,  173,    0,    0,    0,    0,    0,   90,
- /*  1720 */   344,  182,   89,    0,   89,  349,   89,  351,    0,  157,
+ /*  1720 */   344,   35,   89,    0,   89,  349,   89,  351,    0,  157,
- /*  1730 */   336,  157,  159,   39,   46,  155,  153,   99,  344,   43,
+ /*  1730 */   336,  157,  159,   39,   46,  155,   43,   99,  344,  153,
  /*  1740 */    43,   88,  231,  349,   91,  351,   46,   43,   89,   43,
  /*  1750 */   231,  375,   90,   89,   89,  379,  380,  381,  382,  383,
- /*  1760 */   384,  308,  386,   90,   90,   89,   46,   90,   89,  375,
+ /*  1760 */   384,  308,  386,   90,   90,  182,   89,   46,   89,  375,
  /*  1770 */    90,   46,   89,  379,  380,  381,  382,  383,  384,   89,
- /*  1780 */   386,   89,   43,   90,   46,   43,   46,   35,   90,  336,
+ /*  1780 */   386,   90,   90,   43,   46,   89,   43,   46,   90,  336,
- /*  1790 */    35,   90,   90,   35,   35,   35,   35,  344,    2,   22,
+ /*  1790 */    35,   90,   90,   35,   35,   35,   35,  344,   35,    2,
- /*  1800 */   225,   89,  349,   90,  351,  193,  153,  154,  231,  156,
+ /*  1800 */   225,   22,  349,   90,  351,  193,  153,  154,  231,  156,
  /*  1810 */   308,   43,   90,  160,   90,   46,   89,   46,   89,   89,
- /*  1820 */    89,   22,  195,   89,   35,   90,   35,   90,  375,  176,
+ /*  1820 */    89,   89,   22,   89,   35,   90,   35,   90,  375,  176,
  /*  1830 */    35,  308,  379,  380,  381,  382,  383,  384,  336,  386,
- /*  1840 */    89,  100,   89,   35,   90,   89,  344,   90,   35,   35,
+ /*  1840 */    89,   89,  100,   90,  195,   35,  344,   90,   35,   35,
- /*  1850 */    22,  349,   89,  351,   90,   89,  113,  113,  113,  336,
+ /*  1850 */    22,  349,   90,  351,   89,   89,   89,  113,  113,  336,
- /*  1860 */   113,   89,   89,  101,   43,   35,   22,  344,   89,   62,
+ /*  1860 */   113,  113,   89,   89,   43,  101,   35,  344,   22,   89,
- /*  1870 */    61,   35,  349,   35,  351,   35,   35,  375,   35,   68,
+ /*  1870 */    62,   35,  349,   61,  351,   35,   35,  375,   35,   35,
  /*  1880 */    35,  379,  380,  381,  382,  383,  384,   35,  386,  308,
- /*  1890 */    87,   43,   35,   35,   22,   35,   22,   35,  375,  308,
+ /*  1890 */    68,   87,   43,   35,   35,   22,   35,   22,  375,  308,
- /*  1900 */    35,   68,  379,  380,  381,  382,  383,  384,   35,  386,
+ /*  1900 */    35,   35,  379,  380,  381,  382,  383,  384,   22,  386,
- /*  1910 */    35,   35,   35,   35,   22,   35,    0,  336,   35,    0,
+ /*  1910 */    68,   35,   35,   35,   35,   35,   35,  336,    0,   35,
- /*  1920 */    39,   35,    0,   39,   35,  344,   47,  336,    0,   47,
+ /*  1920 */     0,   47,   39,   35,   39,  344,    0,  336,   35,   47,
- /*  1930 */   349,   35,  351,   39,   47,  344,   39,    0,   47,   35,
+ /*  1930 */   349,   39,  351,    0,   47,  344,   35,   39,   47,    0,
- /*  1940 */   349,   35,  351,    0,   20,   22,   21,  427,   22,   22,
+ /*  1940 */   349,   35,  351,    0,   35,   22,   21,  427,  427,   22,
- /*  1950 */    21,  308,  427,  427,  427,  427,  375,  427,  427,  427,
+ /*  1950 */    22,  308,   21,  427,   20,  427,  375,  427,  427,  427,
  /*  1960 */   379,  380,  381,  382,  383,  384,  375,  386,  308,  427,
  /*  1970 */   379,  380,  381,  382,  383,  384,  427,  386,  427,  336,
  /*  1980 */   427,  427,  427,  427,  427,  427,  427,  344,  427,  427,
@@ -731,7 +731,7 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  2530 */   405,  427,  427,  427,  427,  427,  427,  427,  427,  427,
  /*  2540 */   427,  427,  427,  418,  427,  427,  427,  422,
 };
-#define YY_SHIFT_COUNT    (665)
+#define YY_SHIFT_COUNT    (666)
 #define YY_SHIFT_MIN      (0)
 #define YY_SHIFT_MAX      (1943)
 static const unsigned short int yy_shift_ofst[] = {
@@ -786,22 +786,22 @@ static const unsigned short int yy_shift_ofst[] = {
  /*   480 */  1626, 1630, 1645, 1663, 1654, 1668, 1656, 1631, 1669, 1657,
  /*   490 */  1650, 1681, 1658, 1682, 1661, 1695, 1675, 1678, 1699, 1553,
  /*   500 */  1666, 1703, 1540, 1689, 1572, 1550, 1714, 1715, 1574, 1573,
- /*   510 */  1716, 1717, 1718, 1633, 1629, 1539, 1723, 1635, 1580, 1637,
+ /*   510 */  1716, 1717, 1718, 1633, 1629, 1686, 1583, 1723, 1635, 1580,
- /*   520 */  1728, 1694, 1583, 1659, 1638, 1688, 1696, 1511, 1664, 1662,
+ /*   520 */  1637, 1728, 1694, 1586, 1659, 1638, 1688, 1693, 1511, 1664,
- /*   530 */  1665, 1673, 1674, 1676, 1697, 1677, 1679, 1683, 1690, 1680,
+ /*   530 */  1662, 1665, 1673, 1674, 1677, 1697, 1680, 1679, 1683, 1690,
- /*   540 */  1704, 1700, 1720, 1692, 1706, 1519, 1693, 1698, 1725, 1575,
+ /*   540 */  1691, 1704, 1700, 1721, 1696, 1706, 1519, 1692, 1698, 1725,
- /*   550 */  1739, 1738, 1740, 1701, 1742, 1577, 1702, 1752, 1755, 1758,
+ /*   550 */  1575, 1740, 1738, 1741, 1701, 1743, 1577, 1702, 1755, 1758,
- /*   560 */  1759, 1760, 1761, 1702, 1796, 1777, 1612, 1768, 1712, 1713,
+ /*   560 */  1759, 1760, 1761, 1763, 1702, 1797, 1779, 1612, 1768, 1727,
- /*   570 */  1727, 1722, 1729, 1724, 1769, 1730, 1731, 1771, 1799, 1627,
+ /*   570 */  1713, 1729, 1722, 1730, 1724, 1769, 1731, 1732, 1771, 1800,
- /*   580 */  1734, 1741, 1735, 1789, 1791, 1751, 1737, 1795, 1753, 1754,
+ /*   580 */  1649, 1734, 1742, 1735, 1789, 1791, 1751, 1737, 1795, 1752,
- /*   590 */  1808, 1756, 1757, 1813, 1763, 1764, 1814, 1766, 1743, 1744,
+ /*   590 */  1753, 1810, 1765, 1757, 1813, 1766, 1762, 1814, 1767, 1744,
- /*   600 */  1745, 1747, 1828, 1762, 1772, 1773, 1830, 1779, 1821, 1821,
+ /*   600 */  1745, 1747, 1748, 1828, 1764, 1773, 1774, 1831, 1780, 1821,
- /*   610 */  1844, 1807, 1809, 1836, 1838, 1840, 1841, 1843, 1845, 1852,
+ /*   610 */  1821, 1846, 1808, 1812, 1836, 1840, 1841, 1843, 1844, 1845,
- /*   620 */  1811, 1803, 1848, 1857, 1858, 1872, 1860, 1874, 1862, 1865,
+ /*   620 */  1852, 1822, 1804, 1849, 1858, 1859, 1873, 1861, 1875, 1865,
- /*   630 */  1833, 1615, 1873, 1619, 1875, 1876, 1877, 1878, 1892, 1880,
+ /*   630 */  1866, 1842, 1615, 1876, 1619, 1877, 1878, 1879, 1880, 1886,
- /*   640 */  1916, 1883, 1879, 1881, 1919, 1886, 1882, 1884, 1922, 1889,
+ /*   640 */  1881, 1918, 1884, 1874, 1883, 1920, 1888, 1882, 1885, 1926,
- /*   650 */  1887, 1894, 1928, 1896, 1891, 1897, 1937, 1904, 1906, 1943,
+ /*   650 */  1893, 1887, 1892, 1933, 1901, 1891, 1898, 1939, 1906, 1909,
- /*   660 */  1923, 1925, 1926, 1927, 1929, 1924,
+ /*   660 */  1943, 1923, 1925, 1927, 1928, 1931, 1934,
 };
 #define YY_REDUCE_COUNT (275)
 #define YY_REDUCE_MIN   (-389)
@@ -837,73 +837,73 @@ static const short yy_reduce_ofst[] = {
  /*   270 */  1068, 1113, 1114, 1118, 1132, 1149,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*     0 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    10 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    10 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    20 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    20 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    30 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    30 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    40 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    40 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    50 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    50 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    60 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    60 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    70 */  1463, 1463, 1463, 1463, 1463, 1537, 1463, 1463, 1463, 1463,
+ /*    70 */  1464, 1464, 1464, 1464, 1464, 1538, 1464, 1464, 1464, 1464,
- /*    80 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*    80 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*    90 */  1463, 1463, 1535, 1693, 1463, 1870, 1463, 1463, 1463, 1463,
+ /*    90 */  1464, 1464, 1536, 1694, 1464, 1871, 1464, 1464, 1464, 1464,
- /*   100 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   100 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   110 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   110 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   120 */  1463, 1463, 1537, 1463, 1535, 1882, 1882, 1882, 1463, 1463,
+ /*   120 */  1464, 1464, 1538, 1464, 1536, 1883, 1883, 1883, 1464, 1464,
- /*   130 */  1463, 1463, 1736, 1736, 1463, 1463, 1463, 1463, 1635, 1463,
+ /*   130 */  1464, 1464, 1737, 1737, 1464, 1464, 1464, 1464, 1636, 1464,
- /*   140 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1728, 1463, 1951,
+ /*   140 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1729, 1464, 1952,
- /*   150 */  1463, 1463, 1463, 1734, 1905, 1463, 1463, 1463, 1463, 1588,
+ /*   150 */  1464, 1464, 1464, 1735, 1906, 1464, 1464, 1464, 1464, 1589,
- /*   160 */  1897, 1874, 1888, 1875, 1872, 1936, 1936, 1936, 1891, 1463,
+ /*   160 */  1898, 1875, 1889, 1876, 1873, 1937, 1937, 1937, 1892, 1464,
- /*   170 */  1901, 1463, 1721, 1698, 1463, 1463, 1698, 1695, 1695, 1463,
+ /*   170 */  1902, 1464, 1722, 1699, 1464, 1464, 1699, 1696, 1696, 1464,
- /*   180 */  1463, 1463, 1463, 1463, 1463, 1537, 1463, 1537, 1463, 1463,
+ /*   180 */  1464, 1464, 1464, 1464, 1464, 1538, 1464, 1538, 1464, 1464,
- /*   190 */  1537, 1463, 1537, 1537, 1537, 1463, 1537, 1463, 1463, 1463,
+ /*   190 */  1538, 1464, 1538, 1538, 1538, 1464, 1538, 1464, 1464, 1464,
- /*   200 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   200 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   210 */  1463, 1463, 1463, 1535, 1730, 1463, 1535, 1463, 1463, 1463,
+ /*   210 */  1464, 1464, 1464, 1536, 1731, 1464, 1536, 1464, 1464, 1464,
- /*   220 */  1535, 1910, 1463, 1463, 1463, 1463, 1910, 1463, 1463, 1535,
+ /*   220 */  1536, 1911, 1464, 1464, 1464, 1464, 1911, 1464, 1464, 1536,
- /*   230 */  1463, 1535, 1463, 1463, 1463, 1912, 1910, 1463, 1463, 1912,
+ /*   230 */  1464, 1536, 1464, 1464, 1464, 1913, 1911, 1464, 1464, 1913,
- /*   240 */  1910, 1463, 1463, 1463, 1924, 1920, 1912, 1928, 1926, 1903,
+ /*   240 */  1911, 1464, 1464, 1464, 1925, 1921, 1913, 1929, 1927, 1904,
- /*   250 */  1901, 1888, 1463, 1463, 1942, 1938, 1954, 1942, 1938, 1942,
+ /*   250 */  1902, 1889, 1464, 1464, 1943, 1939, 1955, 1943, 1939, 1943,
- /*   260 */  1938, 1463, 1604, 1463, 1463, 1463, 1535, 1495, 1463, 1723,
+ /*   260 */  1939, 1464, 1605, 1464, 1464, 1464, 1536, 1496, 1464, 1724,
- /*   270 */  1736, 1638, 1638, 1638, 1538, 1468, 1463, 1463, 1463, 1463,
+ /*   270 */  1737, 1639, 1639, 1639, 1539, 1469, 1464, 1464, 1464, 1464,
- /*   280 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1807, 1923,
+ /*   280 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1808, 1924,
- /*   290 */  1922, 1846, 1845, 1844, 1842, 1806, 1463, 1600, 1805, 1804,
+ /*   290 */  1923, 1847, 1846, 1845, 1843, 1807, 1464, 1601, 1806, 1805,
- /*   300 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1798, 1799,
+ /*   300 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1799, 1800,
- /*   310 */  1797, 1796, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   310 */  1798, 1797, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   320 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   320 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   330 */  1871, 1463, 1939, 1943, 1463, 1463, 1463, 1463, 1463, 1782,
+ /*   330 */  1872, 1464, 1940, 1944, 1464, 1464, 1464, 1464, 1464, 1783,
- /*   340 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   340 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   350 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   350 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   360 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   360 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   370 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   370 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   380 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   380 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   390 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   390 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   400 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   400 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   410 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   410 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   420 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   420 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   430 */  1463, 1463, 1463, 1463, 1500, 1463, 1463, 1463, 1463, 1463,
+ /*   430 */  1464, 1464, 1464, 1464, 1501, 1464, 1464, 1464, 1464, 1464,
- /*   440 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   440 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   450 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   450 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   460 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   460 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   470 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1572, 1571,
+ /*   470 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1573, 1572,
- /*   480 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   480 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   490 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   490 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   500 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   500 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   510 */  1463, 1463, 1463, 1463, 1463, 1463, 1740, 1463, 1463, 1463,
+ /*   510 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1741, 1464, 1464,
- /*   520 */  1463, 1463, 1463, 1463, 1463, 1463, 1904, 1463, 1463, 1463,
+ /*   520 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1905, 1464, 1464,
- /*   530 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   530 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   540 */  1463, 1463, 1782, 1463, 1921, 1463, 1881, 1877, 1463, 1463,
+ /*   540 */  1464, 1464, 1464, 1783, 1464, 1922, 1464, 1882, 1878, 1464,
- /*   550 */  1873, 1781, 1463, 1463, 1937, 1463, 1463, 1463, 1463, 1463,
+ /*   550 */  1464, 1874, 1782, 1464, 1464, 1938, 1464, 1464, 1464, 1464,
- /*   560 */  1463, 1463, 1463, 1463, 1866, 1463, 1463, 1839, 1824, 1463,
+ /*   560 */  1464, 1464, 1464, 1464, 1464, 1867, 1464, 1464, 1840, 1825,
- /*   570 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1792,
+ /*   570 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   580 */  1463, 1463, 1463, 1463, 1463, 1632, 1463, 1463, 1463, 1463,
+ /*   580 */  1793, 1464, 1464, 1464, 1464, 1464, 1633, 1464, 1464, 1464,
- /*   590 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1617, 1615,
+ /*   590 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1618,
- /*   600 */  1614, 1613, 1463, 1610, 1463, 1463, 1463, 1463, 1641, 1640,
+ /*   600 */  1616, 1615, 1614, 1464, 1611, 1464, 1464, 1464, 1464, 1642,
- /*   610 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   610 */  1641, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   620 */  1463, 1463, 1556, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   620 */  1464, 1464, 1464, 1557, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   630 */  1463, 1548, 1463, 1547, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   630 */  1464, 1464, 1549, 1464, 1548, 1464, 1464, 1464, 1464, 1464,
- /*   640 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   640 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   650 */  1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463, 1463,
+ /*   650 */  1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464, 1464,
- /*   660 */  1463, 1463, 1463, 1463, 1463, 1463,
+ /*   660 */  1464, 1464, 1464, 1464, 1464, 1464, 1464,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -2024,7 +2024,7 @@ static const char *const yyRuleName[] = {
  /* 272 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE",
  /* 273 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal",
  /* 274 */ "stream_options ::= stream_options WATERMARK duration_literal",
- /* 275 */ "stream_options ::= stream_options IGNORE EXPIRED",
+ /* 275 */ "stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER",
  /* 276 */ "cmd ::= KILL CONNECTION NK_INTEGER",
  /* 277 */ "cmd ::= KILL QUERY NK_STRING",
  /* 278 */ "cmd ::= KILL TRANSACTION NK_INTEGER",
@@ -3113,7 +3113,7 @@ static const struct {
   {  362,   -3 }, /* (272) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */
   {  362,   -4 }, /* (273) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */
   {  362,   -3 }, /* (274) stream_options ::= stream_options WATERMARK duration_literal */
-  {  362,   -3 }, /* (275) stream_options ::= stream_options IGNORE EXPIRED */
+  {  362,   -4 }, /* (275) stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */
   {  305,   -3 }, /* (276) cmd ::= KILL CONNECTION NK_INTEGER */
   {  305,   -3 }, /* (277) cmd ::= KILL QUERY NK_STRING */
   {  305,   -3 }, /* (278) cmd ::= KILL TRANSACTION NK_INTEGER */
@@ -4297,9 +4297,9 @@ static YYACTIONTYPE yy_reduce(
 { ((SStreamOptions*)yymsp[-3].minor.yy840)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy840)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy840); yylhsminor.yy840 = yymsp[-3].minor.yy840; }
   yymsp[-3].minor.yy840 = yylhsminor.yy840;
         break;
-      case 275: /* stream_options ::= stream_options IGNORE EXPIRED */
+      case 275: /* stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */
-{ ((SStreamOptions*)yymsp[-2].minor.yy840)->ignoreExpired = true; yylhsminor.yy840 = yymsp[-2].minor.yy840; }
+{ ((SStreamOptions*)yymsp[-3].minor.yy840)->ignoreExpired = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); yylhsminor.yy840 = yymsp[-3].minor.yy840; }
-  yymsp[-2].minor.yy840 = yylhsminor.yy840;
+  yymsp[-3].minor.yy840 = yylhsminor.yy840;
         break;
       case 276: /* cmd ::= KILL CONNECTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); }

source/libs/parser/test/parInitialCTest.cpp

@@ -571,7 +571,7 @@ TEST_F(ParserInitialCTest, createStream) {
   auto setCreateStreamReqFunc = [&](const char* pStream, const char* pSrcDb, const char* pSql,
                                     const char* pDstStb = nullptr, int8_t igExists = 0,
                                     int8_t triggerType = STREAM_TRIGGER_AT_ONCE, int64_t maxDelay = 0,
-                                    int64_t watermark = 0, int8_t igExpired = 0) {
+                                    int64_t watermark = 0, int8_t igExpired = STREAM_DEFAULT_IGNORE_EXPIRED) {
     snprintf(expect.name, sizeof(expect.name), "0.%s", pStream);
     snprintf(expect.sourceDB, sizeof(expect.sourceDB), "0.%s", pSrcDb);
     if (NULL != pDstStb) {
@@ -617,11 +617,11 @@ TEST_F(ParserInitialCTest, createStream) {
   clearCreateStreamReq();
 
   setCreateStreamReqFunc("s1", "test",
-                         "create stream if not exists s1 trigger max_delay 20s watermark 10s ignore expired into st1 "
+                         "create stream if not exists s1 trigger max_delay 20s watermark 10s ignore expired 0 into st1 "
                          "as select count(*) from t1 interval(10s)",
                          "st1", 1, STREAM_TRIGGER_MAX_DELAY, 20 * MILLISECOND_PER_SECOND, 10 * MILLISECOND_PER_SECOND,
-                         1);
+                         0);
-  run("CREATE STREAM IF NOT EXISTS s1 TRIGGER MAX_DELAY 20s WATERMARK 10s IGNORE EXPIRED INTO st1 AS SELECT COUNT(*) "
+  run("CREATE STREAM IF NOT EXISTS s1 TRIGGER MAX_DELAY 20s WATERMARK 10s IGNORE EXPIRED 0 INTO st1 AS SELECT COUNT(*) "
       "FROM t1 INTERVAL(10S)");
   clearCreateStreamReq();
 }

source/libs/planner/src/planLogicCreater.c

@@ -38,6 +38,27 @@ typedef struct SRewriteExprCxt {
   SNodeList* pExprs;
 } SRewriteExprCxt;
 
+static void setColumnInfo(SFunctionNode* pFunc, SColumnNode* pCol) {
+  switch (pFunc->funcType) {
+    case FUNCTION_TYPE_TBNAME:
+      pCol->colType = COLUMN_TYPE_TBNAME;
+      break;
+    case FUNCTION_TYPE_WSTART:
+    case FUNCTION_TYPE_WEND:
+      pCol->colId = PRIMARYKEY_TIMESTAMP_COL_ID;
+      pCol->colType = COLUMN_TYPE_WINDOW_PC;
+      break;
+    case FUNCTION_TYPE_WDURATION:
+      pCol->colType = COLUMN_TYPE_WINDOW_PC;
+      break;
+    case FUNCTION_TYPE_GROUP_KEY:
+      pCol->colType = COLUMN_TYPE_GROUP_KEY;
+      break;
+    default:
+      break;
+  }
+}
+
 static EDealRes doRewriteExpr(SNode** pNode, void* pContext) {
   switch (nodeType(*pNode)) {
     case QUERY_NODE_OPERATOR:
@@ -60,11 +81,7 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) {
           strcpy(pCol->node.aliasName, pToBeRewrittenExpr->aliasName);
           strcpy(pCol->colName, ((SExprNode*)pExpr)->aliasName);
           if (QUERY_NODE_FUNCTION == nodeType(pExpr)) {
-            if (FUNCTION_TYPE_WSTART == ((SFunctionNode*)pExpr)->funcType) {
+            setColumnInfo((SFunctionNode*)pExpr, pCol);
-              pCol->colId = PRIMARYKEY_TIMESTAMP_COL_ID;
-            } else if (FUNCTION_TYPE_TBNAME == ((SFunctionNode*)pExpr)->funcType) {
-              pCol->colType = COLUMN_TYPE_TBNAME;
-            }
           }
           nodesDestroyNode(*pNode);
           *pNode = (SNode*)pCol;
@@ -764,6 +781,57 @@ static int32_t createWindowLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSele
   return TSDB_CODE_FAILED;
 }
 
+static EDealRes needFillValueImpl(SNode* pNode, void* pContext) {
+  if (QUERY_NODE_COLUMN == nodeType(pNode)) {
+    SColumnNode* pCol = (SColumnNode*)pNode;
+    if (COLUMN_TYPE_WINDOW_PC != pCol->colType && COLUMN_TYPE_GROUP_KEY != pCol->colType) {
+      *(bool*)pContext = true;
+      return DEAL_RES_END;
+    }
+  }
+  return DEAL_RES_CONTINUE;
+}
+
+static bool needFillValue(SNode* pNode) {
+  bool hasFillCol = false;
+  nodesWalkExpr(pNode, needFillValueImpl, &hasFillCol);
+  return hasFillCol;
+}
+
+static int32_t partFillExprs(SSelectStmt* pSelect, SNodeList** pFillExprs, SNodeList** pNotFillExprs) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  SNode*  pProject = NULL;
+  FOREACH(pProject, pSelect->pProjectionList) {
+    if (needFillValue(pProject)) {
+      code = nodesListMakeStrictAppend(pFillExprs, nodesCloneNode(pProject));
+    } else if (QUERY_NODE_VALUE != nodeType(pProject)) {
+      code = nodesListMakeStrictAppend(pNotFillExprs, nodesCloneNode(pProject));
+    }
+    if (TSDB_CODE_SUCCESS != code) {
+      NODES_DESTORY_LIST(*pFillExprs);
+      NODES_DESTORY_LIST(*pNotFillExprs);
+      break;
+    }
+  }
+  if (!pSelect->isDistinct) {
+    SNode* pOrderExpr = NULL;
+    FOREACH(pOrderExpr, pSelect->pOrderByList) {
+      SNode* pExpr = ((SOrderByExprNode*)pOrderExpr)->pExpr;
+      if (needFillValue(pExpr)) {
+        code = nodesListMakeStrictAppend(pFillExprs, nodesCloneNode(pExpr));
+      } else if (QUERY_NODE_VALUE != nodeType(pExpr)) {
+        code = nodesListMakeStrictAppend(pNotFillExprs, nodesCloneNode(pExpr));
+      }
+      if (TSDB_CODE_SUCCESS != code) {
+        NODES_DESTORY_LIST(*pFillExprs);
+        NODES_DESTORY_LIST(*pNotFillExprs);
+        break;
+      }
+    }
+  }
+  return code;
+}
+
 static int32_t createFillLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
   if (NULL == pSelect->pWindow || QUERY_NODE_INTERVAL_WINDOW != nodeType(pSelect->pWindow) ||
       NULL == ((SIntervalWindowNode*)pSelect->pWindow)->pFill) {
@@ -785,10 +853,18 @@ static int32_t createFillLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
   pFill->node.resultDataOrder = pFill->node.requireDataOrder;
   pFill->inputTsOrder = ORDER_ASC;
 
-  int32_t code = nodesCollectColumns(pSelect, SQL_CLAUSE_WINDOW, NULL, COLLECT_COL_TYPE_ALL, &pFill->node.pTargets);
+  int32_t code = partFillExprs(pSelect, &pFill->pFillExprs, &pFill->pNotFillExprs);
-  if (TSDB_CODE_SUCCESS == code && NULL == pFill->node.pTargets) {
+  if (TSDB_CODE_SUCCESS == code) {
-    code = nodesListMakeStrictAppend(&pFill->node.pTargets,
+    code = rewriteExprsForSelect(pFill->pFillExprs, pSelect, SQL_CLAUSE_FILL);
-                                     nodesCloneNode(nodesListGetNode(pCxt->pCurrRoot->pTargets, 0)));
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = rewriteExprsForSelect(pFill->pNotFillExprs, pSelect, SQL_CLAUSE_FILL);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = createColumnByRewriteExprs(pFill->pFillExprs, &pFill->node.pTargets);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = createColumnByRewriteExprs(pFill->pNotFillExprs, &pFill->node.pTargets);
   }
 
   pFill->mode = pFillNode->mode;

source/libs/planner/src/planPhysiCreater.c

@@ -195,7 +195,7 @@ static int32_t addDataBlockSlotsImpl(SPhysiPlanContext* pCxt, SNodeList* pList,
 
   int32_t   code = TSDB_CODE_SUCCESS;
   SHashObj* pHash = taosArrayGetP(pCxt->pLocationHelper, pDataBlockDesc->dataBlockId);
-  int16_t   nextSlotId = taosHashGetSize(pHash), slotId = 0;
+  int16_t   nextSlotId = LIST_LENGTH(pDataBlockDesc->pSlots), slotId = 0;
   SNode*    pNode = NULL;
   FOREACH(pNode, pList) {
     SNode*      pExpr = QUERY_NODE_ORDER_BY_EXPR == nodeType(pNode) ? ((SOrderByExprNode*)pNode)->pExpr : pNode;
@@ -311,6 +311,10 @@ static EDealRes doSetSlotId(SNode* pNode, void* pContext) {
 
 static int32_t setNodeSlotId(SPhysiPlanContext* pCxt, int16_t leftDataBlockId, int16_t rightDataBlockId, SNode* pNode,
                              SNode** pOutput) {
+  if (NULL == pNode) {
+    return TSDB_CODE_SUCCESS;
+  }
+
   SNode* pRes = nodesCloneNode(pNode);
   if (NULL == pRes) {
     return TSDB_CODE_OUT_OF_MEMORY;
@@ -332,6 +336,10 @@ static int32_t setNodeSlotId(SPhysiPlanContext* pCxt, int16_t leftDataBlockId, i
 
 static int32_t setListSlotId(SPhysiPlanContext* pCxt, int16_t leftDataBlockId, int16_t rightDataBlockId,
                              const SNodeList* pList, SNodeList** pOutput) {
+  if (NULL == pList) {
+    return TSDB_CODE_SUCCESS;
+  }
+
   SNodeList* pRes = nodesCloneList(pList);
   if (NULL == pRes) {
     return TSDB_CODE_OUT_OF_MEMORY;
@@ -1372,14 +1380,23 @@ static int32_t createFillPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren
   pFill->inputTsOrder = pFillNode->inputTsOrder;
 
   SDataBlockDescNode* pChildTupe = (((SPhysiNode*)nodesListGetNode(pChildren, 0))->pOutputDataBlockDesc);
-  int32_t code = setListSlotId(pCxt, pChildTupe->dataBlockId, -1, pFillNode->node.pTargets, &pFill->pTargets);
+  int32_t code = setListSlotId(pCxt, pChildTupe->dataBlockId, -1, pFillNode->pFillExprs, &pFill->pFillExprs);
   if (TSDB_CODE_SUCCESS == code) {
-    code = addDataBlockSlots(pCxt, pFill->pTargets, pFill->node.pOutputDataBlockDesc);
+    code = addDataBlockSlots(pCxt, pFill->pFillExprs, pFill->node.pOutputDataBlockDesc);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = setListSlotId(pCxt, pChildTupe->dataBlockId, -1, pFillNode->pNotFillExprs, &pFill->pNotFillExprs);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = addDataBlockSlots(pCxt, pFill->pNotFillExprs, pFill->node.pOutputDataBlockDesc);
   }
 
   if (TSDB_CODE_SUCCESS == code) {
     code = setNodeSlotId(pCxt, pChildTupe->dataBlockId, -1, pFillNode->pWStartTs, &pFill->pWStartTs);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = addDataBlockSlot(pCxt, &pFill->pWStartTs, pFill->node.pOutputDataBlockDesc);
+  }
 
   if (TSDB_CODE_SUCCESS == code && NULL != pFillNode->pValues) {
     pFill->pValues = nodesCloneNode(pFillNode->pValues);

source/libs/planner/test/planIntervalTest.cpp

@@ -45,8 +45,15 @@ TEST_F(PlanIntervalTest, fill) {
       "WHERE ts > TIMESTAMP '2022-04-01 00:00:00' and ts < TIMESTAMP '2022-04-30 23:59:59' "
       "INTERVAL(10s) FILL(VALUE, 10, 20)");
 
-  run("SELECT COUNT(*) FROM st1 WHERE ts > TIMESTAMP '2022-04-01 00:00:00' and ts < TIMESTAMP '2022-04-30 23:59:59' "
+  run("SELECT _WSTART, TBNAME, COUNT(*) FROM st1 "
-      "PARTITION BY TBNAME interval(10s) fill(prev)");
+      "WHERE ts > '2022-04-01 00:00:00' and ts < '2022-04-30 23:59:59' "
+      "PARTITION BY TBNAME INTERVAL(10s) FILL(PREV)");
+
+  run("SELECT COUNT(c1), MAX(c3), COUNT(c1) FROM t1 "
+      "WHERE ts > '2022-04-01 00:00:00' and ts < '2022-04-30 23:59:59' INTERVAL(10s) FILL(PREV)");
+
+  run("SELECT COUNT(c1) FROM t1 WHERE ts > '2022-04-01 00:00:00' and ts < '2022-04-30 23:59:59' "
+      "PARTITION BY c2 INTERVAL(10s) FILL(PREV) ORDER BY c2");
 }
 
 TEST_F(PlanIntervalTest, selectFunc) {

source/libs/qcom/src/queryUtil.c

@@ -96,12 +96,12 @@ bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTag
   return true;
 }
 
-static void* pTaskQueue = NULL;
+static SSchedQueue pTaskQueue = {0};
 
 int32_t initTaskQueue() {
   int32_t queueSize = tsMaxShellConns * 2;
-  pTaskQueue = taosInitScheduler(queueSize, tsNumOfTaskQueueThreads, "tsc");
+  void *p = taosInitScheduler(queueSize, tsNumOfTaskQueueThreads, "tsc", &pTaskQueue);
-  if (NULL == pTaskQueue) {
+  if (NULL == p) {
     qError("failed to init task queue");
     return -1;
   }
@@ -111,7 +111,7 @@ int32_t initTaskQueue() {
 }
 
 int32_t cleanupTaskQueue() {
-  taosCleanUpScheduler(pTaskQueue);
+  taosCleanUpScheduler(&pTaskQueue);
   return 0;
 }
 
@@ -134,7 +134,7 @@ int32_t taosAsyncExec(__async_exec_fn_t execFn, void* execParam, int32_t* code)
   schedMsg.thandle = execParam;
   schedMsg.msg = code;
 
-  taosScheduleTask(pTaskQueue, &schedMsg);
+  taosScheduleTask(&pTaskQueue, &schedMsg);
   return 0;
 }
 

source/libs/transport/test/CMakeLists.txt

@@ -34,6 +34,7 @@ target_link_libraries (transportTest
   common
   gtest_main
   transport
+  function
 )
 
 target_link_libraries (transUT

source/util/src/terror.c

@@ -467,7 +467,6 @@ TAOS_DEFINE_ERROR(TSDB_CODE_FS_APP_ERROR,                 "tfs out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_INTERNAL_ERROR,           "catalog internal error")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_INVALID_INPUT,            "invalid catalog input parameters")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_NOT_READY,                "catalog is not ready")
-TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_MEMORY,                "catalog memory error")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_SYS_ERROR,                "catalog system error")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_DB_DROPPED,               "Database is dropped")
 TAOS_DEFINE_ERROR(TSDB_CODE_CTG_OUT_OF_SERVICE,           "catalog is out of service")

source/util/src/tlrucache.c

@@ -391,7 +391,7 @@ static LRUStatus taosLRUCacheShardInsertEntry(SLRUCacheShard *shard, SLRUEntry *
 
       assert(TAOS_LRU_ENTRY_IN_CACHE(old));
       TAOS_LRU_ENTRY_SET_IN_CACHE(old, false);
-      if (!TAOS_LRU_ENTRY_HAS_REFS(e)) {
+      if (!TAOS_LRU_ENTRY_HAS_REFS(old)) {
         taosLRUCacheShardLRURemove(shard, old);
         assert(shard->usage >= old->totalCharge);
         shard->usage -= old->totalCharge;

source/util/src/tsched.c

@@ -22,31 +22,17 @@
 
 #define DUMP_SCHEDULER_TIME_WINDOW 30000  // every 30sec, take a snap shot of task queue.
 
-typedef struct {
-  char          label[TSDB_LABEL_LEN];
-  tsem_t        emptySem;
-  tsem_t        fullSem;
-  TdThreadMutex queueMutex;
-  int32_t       fullSlot;
-  int32_t       emptySlot;
-  int32_t       queueSize;
-  int32_t       numOfThreads;
-  TdThread     *qthread;
-  SSchedMsg    *queue;
-  bool          stop;
-  void         *pTmrCtrl;
-  void         *pTimer;
-} SSchedQueue;
-
 static void *taosProcessSchedQueue(void *param);
 static void  taosDumpSchedulerStatus(void *qhandle, void *tmrId);
 
-void *taosInitScheduler(int32_t queueSize, int32_t numOfThreads, const char *label) {
+void *taosInitScheduler(int32_t queueSize, int32_t numOfThreads, const char *label, SSchedQueue *pSched) {
-  SSchedQueue *pSched = (SSchedQueue *)taosMemoryCalloc(sizeof(SSchedQueue), 1);
+  if (NULL == pSched) {
+    pSched = (SSchedQueue *)taosMemoryCalloc(sizeof(SSchedQueue), 1);
     if (pSched == NULL) {
       uError("%s: no enough memory for pSched", label);
       return NULL;
     }
+  }
 
   pSched->queue = (SSchedMsg *)taosMemoryCalloc(sizeof(SSchedMsg), queueSize);
   if (pSched->queue == NULL) {
@@ -86,7 +72,7 @@ void *taosInitScheduler(int32_t queueSize, int32_t numOfThreads, const char *lab
     return NULL;
   }
 
-  pSched->stop = false;
+  atomic_store_8(&pSched->stop, 0);
   for (int32_t i = 0; i < numOfThreads; ++i) {
     TdThreadAttr attr;
     taosThreadAttrInit(&attr);
@@ -107,7 +93,7 @@ void *taosInitScheduler(int32_t queueSize, int32_t numOfThreads, const char *lab
 }
 
 void *taosInitSchedulerWithInfo(int32_t queueSize, int32_t numOfThreads, const char *label, void *tmrCtrl) {
-  SSchedQueue *pSched = taosInitScheduler(queueSize, numOfThreads, label);
+  SSchedQueue *pSched = taosInitScheduler(queueSize, numOfThreads, label, NULL);
 
   if (tmrCtrl != NULL && pSched != NULL) {
     pSched->pTmrCtrl = tmrCtrl;
@@ -131,7 +117,7 @@ void *taosProcessSchedQueue(void *scheduler) {
       uFatal("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
       ASSERT(0);
     }
-    if (pSched->stop) {
+    if (atomic_load_8(&pSched->stop)) {
       break;
     }
 
@@ -172,6 +158,11 @@ void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
     return;
   }
 
+  if (atomic_load_8(&pSched->stop)) {
+    uError("sched is already stopped, msg:%p is dropped", pMsg);
+    return;
+  }
+
   if ((ret = tsem_wait(&pSched->emptySem)) != 0) {
     uFatal("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
     ASSERT(0);
@@ -202,7 +193,10 @@ void taosCleanUpScheduler(void *param) {
 
   uDebug("start to cleanup %s schedQsueue", pSched->label);
   
-  pSched->stop = true;
+  atomic_store_8(&pSched->stop, 1);
+
+  taosMsleep(200);
+  
   for (int32_t i = 0; i < pSched->numOfThreads; ++i) {
     if (taosCheckPthreadValid(pSched->qthread[i])) {
       tsem_post(&pSched->fullSem);
@@ -226,7 +220,7 @@ void taosCleanUpScheduler(void *param) {
 
   if (pSched->queue) taosMemoryFree(pSched->queue);
   if (pSched->qthread) taosMemoryFree(pSched->qthread);
-  taosMemoryFree(pSched);  // fix memory leak
+  //taosMemoryFree(pSched);
 }
 
 // for debug purpose, dump the scheduler status every 1min.

source/util/src/ttimer.c

@@ -555,7 +555,7 @@ static void taosTmrModuleInit(void) {
     return;
   }
 
-  tmrQhandle = taosInitScheduler(10000, taosTmrThreads, "tmr");
+  tmrQhandle = taosInitScheduler(10000, taosTmrThreads, "tmr", NULL);
   taosInitTimer(taosTimerLoopFunc, MSECONDS_PER_TICK);
 
   tmrDebug("timer module is initialized, number of threads: %d", taosTmrThreads);
@@ -606,6 +606,7 @@ void taosTmrCleanUp(void* handle) {
     taosUninitTimer();
 
     taosCleanUpScheduler(tmrQhandle);
+    taosMemoryFreeClear(tmrQhandle);
 
     for (int32_t i = 0; i < tListLen(wheels); i++) {
       time_wheel_t* wheel = wheels + i;

tests/docs-examples-test/csharp.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+pgrep taosd || taosd >> /dev/null 2>&1 &
+pgrep taosadapter || taosadapter >> /dev/null 2>&1 &
+cd ../../docs/examples/csharp
+
+dotnet run --project connect.csproj
+
+taos -s "drop database if exists power"
+dotnet run --project sqlinsert.csproj
+dotnet run --project query.csproj
+dotnet run --project asyncquery.csproj
+dotnet run --project subscribe.csproj
+
+taos -s "drop topic if exists topic_example"
+taos -s "drop database if exists power"
+dotnet run --project stmtinsert.csproj
+
+taos -s "drop database if exists test"
+dotnet run --project influxdbline.csproj
+
+taos -s "drop database if exists test"
+dotnet run --project optstelnet.csproj
+
+taos -s "drop database if exists test"
+dotnet run --project optsjson.csproj

tests/docs-examples-test/node.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+pgrep taosd || taosd >> /dev/null 2>&1 &
+pgrep taosadapter || taosadapter >> /dev/null 2>&1 &
+
+cd ../../docs/examples/node
+
+npm install
+cd restexample;
+
+node connect.js
+
+cd ../nativeexample
+
+node connect.js
+
+taos -s "drop database if exists power"
+node insert_example.js
+
+node query_example.js 
+
+node async_query_example.js
+
+node subscribe_demo.js
+
+taos -s "drop topic if exists topic_name_example"
+taos -s "drop database if exists power"
+node param_bind_example.js 
+
+taos -s "drop database if exists power"
+node multi_bind_example.js
+
+taos -s "drop database if exists test"
+node influxdb_line_example.js
+
+taos -s "drop database if exists test"
+node opentsdb_telnet_example.js
+
+taos -s "drop database if exists test"
+node opentsdb_json_example.js

tests/script/tsim/db/alter_option.sim

@@ -111,7 +111,7 @@ endi
 if $data21_db != 1000 then  # wal_level fsyncperiod
   return -1
 endi
-if $data22_db != 172800 then  # wal_retention_period
+if $data22_db != 345600 then  # wal_retention_period
   return -1
 endi
 if $data23_db != -1 then  # wal_retention_size

tests/script/tsim/parser/fill.sim

@@ -885,15 +885,15 @@ if $data10 != @20-01-01 01:01:10.000@ then
   return -1
 endi
 
-if $data11 != 1.000000000 then
+if $data11 != 99.000000000 then
   return -1
 endi
 
-if $data12 != 1.000000000 then
+if $data12 != 91.000000000 then
   return -1
 endi
 
-if $data13 != -87.000000000 then
+if $data13 != 90.000000000 then
   return -1
 endi
 
@@ -917,15 +917,15 @@ if $data70 != @20-01-01 01:02:10.000@ then
   return -1
 endi
 
-if $data71 != 1.000000000 then
+if $data71 != 99.000000000 then
   return -1
 endi
 
-if $data72 != 1.000000000 then
+if $data72 != 91.000000000 then
   return -1
 endi
 
-if $data73 != -87.000000000 then
+if $data73 != 90.000000000 then
   return -1
 endi
 
@@ -994,19 +994,19 @@ if $data10 != @20-01-01 01:01:10.000@ then
   return -1
 endi
 
-if $data11 != 1.000000000 then
+if $data11 != 99.000000000 then
   return -1
 endi
 
-if $data12 != 1.000000000 then
+if $data12 != 91.000000000 then
   return -1
 endi
 
-if $data13 != -87.000000000 then
+if $data13 != 90.000000000 then
   return -1
 endi
 
-if $data14 != 86 then
+if $data14 != 89 then
   return -1
 endi
 

tests/script/tsim/parser/fill_stb.sim

@@ -111,13 +111,15 @@ endi
 if $data12 != -2 then
   return -1
 endi
-if $data13 != -3.00000 then
+if $data13 != -3 then
   return -1
 endi
-if $data14 != -4.000000000 then
+if $data14 != -4.00000 then
+  print expect -4.00000, actual: $data14
   return -1
 endi
-if $data15 != -5 then
+if $data15 != -5.000000000 then
+  print expect -5.000000000, actual: $data15
   return -1
 endi
 if $data31 != -1 then
@@ -126,10 +128,10 @@ endi
 if $data52 != -2 then
   return -1
 endi
-if $data73 != -3.00000 then
+if $data73 != -3 then
   return -1
 endi
-if $data74 != -4.000000000 then
+if $data74 != -4.00000 then
   return -1
 endi
 

tests/script/tsim/parser/fill_us.sim

@@ -1010,6 +1010,7 @@ if $data31 != 9.000000000 then
   return -1
 endi
 if $data41 != 12.500000000 then
+  print expect 12.500000000, actual: $data41
   return -1
 endi
 if $data51 != 16.000000000 then

tests/script/tsim/show/basic.sim

@@ -210,6 +210,8 @@ if $rows != 3 then
   return -1
 endi
 
+sql_error select * from performance_schema.PERF_OFFSETS;
+
 sql show create stable stb;
 if $rows != 1 then
   return -1

tests/script/tsim/stream/ignoreExpiredData.sim

@@ -45,9 +45,9 @@ print $data00 $data01 $data02
 
 sql use test
 sql create table t1(ts timestamp, a int, b int , c int, d double);
-sql create stream streams1 trigger at_once IGNORE EXPIRED into streamt1 as select  _wstart, count(*) c1, sum(a) c3 from t1 interval(10s);
+sql create stream streams1 trigger at_once IGNORE EXPIRED 1 into streamt1 as select  _wstart, count(*) c1, sum(a) c3 from t1 interval(10s);
-sql create stream streams2 trigger at_once IGNORE EXPIRED into streamt2 as select  _wstart, count(*) c1, sum(a) c3 from t1 session(ts,10s);
+sql create stream streams2 trigger at_once IGNORE EXPIRED 1 into streamt2 as select  _wstart, count(*) c1, sum(a) c3 from t1 session(ts,10s);
-sql create stream streams3 trigger at_once IGNORE EXPIRED into streamt3 as select  _wstart, count(*) c1, sum(a) c3 from t1 state_window(a);
+sql create stream streams3 trigger at_once IGNORE EXPIRED 1 into streamt3 as select  _wstart, count(*) c1, sum(a) c3 from t1 state_window(a);
 sql insert into t1 values(1648791213000,1,2,3,1.0);
 sql insert into t1 values(1648791223001,1,2,3,1.1);
 sql insert into t1 values(1648791233002,2,2,3,2.1);
@@ -111,8 +111,8 @@ sql use test1
 sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
 sql create table ts1 using st tags(1,1,1);
 sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t1 trigger at_once IGNORE EXPIRED into streamtST1 as select  _wstart, count(*) c1, count(a) c2 , sum(a) c3 ,  max(b)  c5, min(c) c6 from st interval(10s) ;
+sql create stream stream_t1 trigger at_once IGNORE EXPIRED 1 into streamtST1 as select  _wstart, count(*) c1, count(a) c2 , sum(a) c3 ,  max(b)  c5, min(c) c6 from st interval(10s) ;
-sql create stream stream_t2 trigger at_once IGNORE EXPIRED into streamtST2 as select  _wstart, count(*) c1, count(a) c2 , sum(a) c3 ,  max(b)  c5, min(c) c6 from st session(ts, 10s) ;
+sql create stream stream_t2 trigger at_once IGNORE EXPIRED 1 into streamtST2 as select  _wstart, count(*) c1, count(a) c2 , sum(a) c3 ,  max(b)  c5, min(c) c6 from st session(ts, 10s) ;
 sql insert into ts1 values(1648791211000,1,2,3);
 sql insert into ts1 values(1648791222001,2,2,3);
 sql insert into ts2 values(1648791211000,1,2,3);

tests/script/tsim/user/privilege_sysinfo.sim

@@ -45,16 +45,16 @@ sql_error drop database db
 sql_error use db
 sql_error alter database db replica 1;
 sql_error show db.vgroups
-sql_error select * from information_schema.ins_stables where db_name = 'db'
+sql select * from information_schema.ins_stables where db_name = 'db'
-sql_error select * from information_schema.ins_tables where db_name = 'db'
+sql select * from information_schema.ins_tables where db_name = 'db'
 
 print =============== check show
-sql_error select * from information_schema.ins_users
+sql select * from information_schema.ins_users
 sql_error show cluster
-sql_error select * from information_schema.ins_dnodes
+sql select * from information_schema.ins_dnodes
-sql_error select * from information_schema.ins_mnodes
+sql select * from information_schema.ins_mnodes
 sql_error show snodes
-sql_error select * from information_schema.ins_qnodes
+sql select * from information_schema.ins_qnodes
 sql_error show bnodes
 sql_error show grants
 sql_error show dnode 1 variables;

tests/system-test/2-query/sample.py

@@ -515,7 +515,7 @@ class TDTestCase:
         #     "condition": "where ts>0 and ts < now interval(1h) fill(next)"
         # }
         # self.checksample(**err45)         # interval
-        tdSql.query("select sample( c1 , 1 )  from t1 where ts>0 and ts < now interval(1h) fill(next)")
+        tdSql.error("select sample( c1 , 1 )  from t1 where ts>0 and ts < now interval(1h) fill(next)")
         err46 = {
             "table_expr": "t1",
             "condition": "group by c6"

tests/system-test/6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py

@@ -29,7 +29,7 @@ class TDTestCase:
         self.vgroups = 2
         self.tb_nums = 10
         self.row_nums = 100
-        self.max_vote_time_cost = 10  # seconds
+        self.max_vote_time_cost = 30  # seconds
 
     def getBuildPath(self):
         selfPath = os.path.dirname(os.path.realpath(__file__))

tests/system-test/fulltest.sh

@@ -230,7 +230,7 @@ python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_insertdatas_stop_
 # python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_follower.py -N 4 -M 1
 # python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader_force_stop.py -N 4 -M 1
 # python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_querydatas_stop_leader.py -N 4 -M 1
-# python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py  -N 4 -M 1
+python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups.py  -N 4 -M 1
 # python3 test.py -f 6-cluster/vnode/4dnode1mnode_basic_replica3_vgroups_stopOne.py -N 4 -M 1