Merge branch 'develop' into 2.0

# Conflicts:
#	src/system/CMakeLists.txt
#	src/system/detail/CMakeLists.txt
#	src/system/lite/CMakeLists.txt
#	src/util/inc/textbuffer.h
#	src/vnode/detail/inc/vnodeTagMgmt.h
#	src/vnode/detail/src/vnodeQueryImpl.c
#	src/vnode/detail/src/vnodeSupertableQuery.c

CMakeLists.txt

@@ -36,7 +36,7 @@ ENDIF ()
 IF (NOT DEFINED TD_CLUSTER)
   MESSAGE(STATUS "Build the Lite Version")
   SET(TD_CLUSTER FALSE)
-  SET(TD_LITE TRUE)
+  SET(TD_EDGE TRUE)
 
   SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
   MESSAGE(STATUS "Community directory: " ${TD_COMMUNITY_DIR})
@@ -53,12 +53,18 @@ IF (NOT DEFINED TD_CLUSTER)
   SET(TD_MIPS_32 FALSE)
   SET(TD_DARWIN_64 FALSE)
   SET(TD_WINDOWS_64 FALSE)
+  SET(TD_PAGMODE_LITE FALSE)
+  
+  IF (${PAGMODE} MATCHES "lite")
+    SET(TD_PAGMODE_LITE TRUE)
+  ENDIF ()
 
   # if generate ARM version:
   #   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
   IF (${CPUTYPE} MATCHES "aarch32")
     SET(TD_ARM TRUE)
     SET(TD_ARM_32 TRUE)
+    SET(TD_PAGMODE_LITE TRUE)
     ADD_DEFINITIONS(-D_TD_ARM_)
     ADD_DEFINITIONS(-D_TD_ARM_32_)
   ELSEIF (${CPUTYPE} MATCHES "aarch64")

README.md

@@ -130,3 +130,8 @@ The TDengine community has also kindly built some of their own connectors! Follo
 # Contribute to TDengine
 
 Please follow the [contribution guidelines](CONTRIBUTING.md) to contribute to the project.
+
+# Join TDengine WeChat Group
+
+Add WeChat “tdengine” to join the group，you can communicate with other users.
+

documentation/tdenginedocs-cn/super-table/index.html

@@ -32,7 +32,7 @@ tags (location binary(20), type int)</code></pre>
 <p>查看数据库内全部STable，及其相关信息，包括STable的名称、创建时间、列数量、标签（TAG）数量、通过该STable建表的数量。 </p></li>
 <li><p>删除超级表</p>
 <pre><code class="mysql language-mysql">DROP TABLE &lt;stable_name&gt;</code></pre>
-<p>Note: 删除STable不会级联删除通过STable创建的表；相反删除STable时要求通过该STable创建的表都已经被删除。</p></li>
+<p>Note: 删除STable时，所有通过该STable创建的表都将被删除。</p></li>
 <li><p>查看属于某STable并满足查询条件的表</p>
 <pre><code class="mysql language-mysql">SELECT TBNAME,[TAG_NAME,…] FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] …)</code></pre>
 <p>查看属于某STable并满足查询条件的表。说明：TBNAME为关键词，显示通过STable建立的子表表名，查询过程中可以使用针对标签的条件。</p>

documentation/tdenginedocs-en/super-table/index.html

@@ -73,7 +73,7 @@ INTERVAL(10M)</code></pre>
 <p>It lists the STable's schema and tags</p>
 <a class='anchor' id='Drop-a-STable'></a><h3>Drop a STable</h3>
 <pre><code class="mysql language-mysql">DROP TABLE &lt;stable_name&gt;</code></pre>
-<p>To delete a STable, all the tables created via this STable shall be deleted first, otherwise, it will fail.</p>
+<p>To delete a STable, all the tables created via this STable will be deleted.</p>
 <a class='anchor' id='List-the-Associated-Tables-of-a-STable'></a><h3>List the Associated Tables of a STable</h3>
 <pre><code class="mysql language-mysql">SELECT TBNAME,[TAG_NAME, ...] FROM &lt;stable_name&gt; WHERE &lt;tag_name&gt; &lt;[=|=&lt;|&gt;=|&lt;&gt;] values..&gt; ([AND|OR] ...)</code></pre>
 <p>It will list all the tables which satisfy the tag filter conditions. The tables are all created from this specific STable. TBNAME is a new keyword introduced, it is the table name associated with the STable. </p>

packaging/deb/makedeb.sh

@@ -72,10 +72,10 @@ sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
 
 if [ "$verMode" == "cluster" ]; then
   debname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   debname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 

packaging/release.sh

@@ -5,15 +5,20 @@
 set -e
 #set -x
 
-# releash.sh -v [cluster | lite]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta]
+# releash.sh  -v [cluster | edge]  
+#             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] 
+#             -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  
+#             -V [stable | beta]
+#             -l [full | lite]
 
 # set parameters by default value
-verMode=lite     # [cluster, lite]
+verMode=edge     # [cluster, edge]
 verType=stable   # [stable, beta]
 cpuType=x64      # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
 osType=Linux     # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
+pagMode=full     # [full | lite]
 
-while getopts "hv:V:c:o:" arg
+while getopts "hv:V:c:o:l:" arg
 do
   case $arg in
     v)
@@ -28,12 +33,16 @@ do
       #echo "cpuType=$OPTARG"
       cpuType=$(echo $OPTARG)
       ;;
+    l)
+      #echo "pagMode=$OPTARG"
+      pagMode=$(echo $OPTARG)
+      ;;
     o)
       #echo "osType=$OPTARG"
       osType=$(echo $OPTARG)
       ;;
     h)
-      echo "Usage: `basename $0` -v [cluster | lite]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta]"
+      echo "Usage: `basename $0` -v [cluster | edge]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta] -l [full | lite]"
       exit 0
       ;;
     ?) #unknow option 
@@ -43,7 +52,7 @@ do
   esac
 done
 
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode}"
 
 curr_dir=$(pwd)
 
@@ -193,9 +202,9 @@ cd ${compile_dir}
 # check support cpu type
 if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
     if [ "$verMode" != "cluster" ]; then
-        cmake ../ -DCPUTYPE=${cpuType}
+      cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode}
     else
-	    cmake ../../ -DCPUTYPE=${cpuType}
+      cmake ../../ -DCPUTYPE=${cpuType}
     fi
 else
     echo "input cpuType=${cpuType} error!!!"
@@ -235,8 +244,8 @@ if [ "$osType" != "Darwin" ]; then
     echo "====do tar.gz package for all systems===="
     cd ${script_dir}/tools
     
-	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
-	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
+	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
 else
     cd ${script_dir}/tools
     ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}

packaging/rpm/makerpm.sh

@@ -65,10 +65,10 @@ cp_rpm_package ${pkg_dir}/RPMS
 
 if [ "$verMode" == "cluster" ]; then
   rpmname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   rpmname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 

packaging/tools/install.sh

@@ -6,7 +6,8 @@
 set -e
 #set -x
 
-verMode=lite
+verMode=edge
+pagMode=full
 
 # -----------------------Variables definition---------------------
 script_dir=$(dirname $(readlink -f "$0"))
@@ -479,7 +480,9 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     if [ -z $1 ]; then
         install_bin
@@ -554,7 +557,9 @@ function install_TDengine() {
     install_log 
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
 
     if [ -z $1 ]; then # install service and client

packaging/tools/install_client.sh

@@ -9,6 +9,7 @@ set -e
 # -----------------------Variables definition---------------------
 
 osType=Linux
+pagMode=full
 
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
@@ -180,7 +181,9 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     install_bin
     install_config
@@ -205,7 +208,9 @@ function install_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     install_bin
     install_config

packaging/tools/makeclient.sh

@@ -12,6 +12,7 @@ cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
+pagMode=$8
 
 if [ "$osType" != "Darwin" ]; then
     script_dir="$(dirname $(readlink -f $0))"
@@ -39,11 +40,17 @@ fi
 # Directories and files.
 
 if [ "$osType" != "Darwin" ]; then
+  if [ "$pagMode" == "lite" ]; then
+    strip ${build_dir}/bin/taosd 
+    strip ${build_dir}/bin/taos
+    bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+  else  
     bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh"
-    lib_files="${build_dir}/lib/libtaos.so.${version}"
+  fi
+  lib_files="${build_dir}/lib/libtaos.so.${version}"
 else
-    bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
-    lib_files="${build_dir}/lib/libtaos.${version}.dylib"
+  bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+  lib_files="${build_dir}/lib/libtaos.${version}.dylib"
 fi
 
 header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
@@ -74,18 +81,23 @@ if [ "$osType" == "Darwin" ]; then
     sed 's/osType=Linux/osType=Darwin/g' ${install_dir}/install_client.sh >> install_client_temp.sh
     mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >> install_client_temp.sh
+    mv install_client_temp.sh ${install_dir}/install_client.sh
+fi
 chmod a+x ${install_dir}/install_client.sh
 
 # Copy example code
 mkdir -p ${install_dir}/examples
 examples_dir="${top_dir}/tests/examples"
 cp -r ${examples_dir}/c      ${install_dir}/examples
-cp -r ${examples_dir}/JDBC   ${install_dir}/examples
-cp -r ${examples_dir}/matlab ${install_dir}/examples
-cp -r ${examples_dir}/python ${install_dir}/examples
-cp -r ${examples_dir}/R      ${install_dir}/examples
-cp -r ${examples_dir}/go     ${install_dir}/examples
-
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  cp -r ${examples_dir}/python ${install_dir}/examples
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  cp -r ${examples_dir}/go     ${install_dir}/examples
+fi
 # Copy driver
 mkdir -p ${install_dir}/driver 
 cp ${lib_files} ${install_dir}/driver
@@ -94,13 +106,14 @@ cp ${lib_files} ${install_dir}/driver
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
 
-if [ "$osType" != "Darwin" ]; then
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  if [ "$osType" != "Darwin" ]; then
     cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  fi
+  cp -r ${connector_dir}/grafana ${install_dir}/connector/
+  cp -r ${connector_dir}/python  ${install_dir}/connector/
+  cp -r ${connector_dir}/go      ${install_dir}/connector
 fi
-cp -r ${connector_dir}/grafana ${install_dir}/connector/
-cp -r ${connector_dir}/python  ${install_dir}/connector/
-cp -r ${connector_dir}/go      ${install_dir}/connector
-
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
 
@@ -110,13 +123,17 @@ cd ${release_dir}
 
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
 if [ "$verType" == "beta" ]; then
   pkg_name=${pkg_name}-${verType}
 elif [ "$verType" == "stable" ]; then  

packaging/tools/makepkg.sh

@@ -13,6 +13,7 @@ cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
+pagMode=$8
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
@@ -30,7 +31,14 @@ else
 fi
 
 # Directories and files.
-bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh"
+if [ "$pagMode" == "lite" ]; then
+  strip ${build_dir}/bin/taosd 
+  strip ${build_dir}/bin/taos
+  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh"
+else 
+  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh"
+fi
+
 lib_files="${build_dir}/lib/libtaos.so.${version}"
 header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
 cfg_dir="${top_dir}/packaging/cfg"
@@ -56,6 +64,9 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/taos
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm
 
 if [ "$verMode" == "cluster" ]; then
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
+    mv remove_temp.sh ${install_dir}/bin/remove.sh
+    
     mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
     cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
     rm -rf ${install_dir}/nginxd/png
@@ -70,25 +81,35 @@ fi
 
 cd ${install_dir}
 tar -zcv -f taos.tar.gz * --remove-files  || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar taos.tar.gz error !!!"
+    exit $exitcode
+fi
 
 cd ${curr_dir}
 cp ${install_files} ${install_dir}
 if [ "$verMode" == "cluster" ]; then
-    sed 's/verMode=lite/verMode=cluster/g' ${install_dir}/install.sh >> install_temp.sh
-	mv install_temp.sh ${install_dir}/install.sh
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install.sh >> install_temp.sh
+    mv install_temp.sh ${install_dir}/install.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh
+    mv install_temp.sh ${install_dir}/install.sh
 fi
 chmod a+x ${install_dir}/install.sh
 
 # Copy example code
 mkdir -p ${install_dir}/examples
 examples_dir="${top_dir}/tests/examples"
-cp -r ${examples_dir}/c      ${install_dir}/examples
-cp -r ${examples_dir}/JDBC   ${install_dir}/examples
-cp -r ${examples_dir}/matlab ${install_dir}/examples
-cp -r ${examples_dir}/python ${install_dir}/examples
-cp -r ${examples_dir}/R      ${install_dir}/examples
-cp -r ${examples_dir}/go     ${install_dir}/examples
-
+  cp -r ${examples_dir}/c      ${install_dir}/examples
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  cp -r ${examples_dir}/python ${install_dir}/examples
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  cp -r ${examples_dir}/go     ${install_dir}/examples
+fi
 # Copy driver
 mkdir -p ${install_dir}/driver 
 cp ${lib_files} ${install_dir}/driver
@@ -96,11 +117,12 @@ cp ${lib_files} ${install_dir}/driver
 # Copy connector
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
-cp ${build_dir}/lib/*.jar      ${install_dir}/connector
-cp -r ${connector_dir}/grafana ${install_dir}/connector/
-cp -r ${connector_dir}/python  ${install_dir}/connector/
-cp -r ${connector_dir}/go      ${install_dir}/connector
-
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  cp -r ${connector_dir}/grafana ${install_dir}/connector/
+  cp -r ${connector_dir}/python  ${install_dir}/connector/
+  cp -r ${connector_dir}/go      ${install_dir}/connector
+fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
 
@@ -110,13 +132,17 @@ cd ${release_dir}
 
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
 if [ "$verType" == "beta" ]; then
   pkg_name=${pkg_name}-${verType}
 elif [ "$verType" == "stable" ]; then 
@@ -127,5 +153,10 @@ else
 fi
 
 tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar ${pkg_name}.tar.gz error !!!"
+    exit $exitcode
+fi
 
 cd ${curr_dir}

packaging/tools/remove.sh

@@ -5,7 +5,7 @@
 set -e
 #set -x
 
-verMode=lite
+verMode=edge
 
 RED='\033[0;31m'
 GREEN='\033[1;32m'

src/client/inc/tscSecondaryMerge.h

@@ -68,7 +68,7 @@ typedef struct SLocalReducer {
   bool                   hasPrevRow;  // cannot be released
   bool                   hasUnprocessedRow;
   tOrderDescriptor *     pDesc;
-  tColModel *            resColModel;
+  SColumnModel *            resColModel;
   tExtMemBuffer **       pExtMemBuffer;      // disk-based buffer
   SInterpolationInfo     interpolationInfo;  // interpolation support structure
   char *                 pFinalRes;          // result data after interpo
@@ -90,21 +90,21 @@ typedef struct SSubqueryState {
 } SSubqueryState;
 
 typedef struct SRetrieveSupport {
-  tExtMemBuffer **  pExtMemBuffer;    // for build loser tree
+  tExtMemBuffer **  pExtMemBuffer;     // for build loser tree
   tOrderDescriptor *pOrderDescriptor;
-  tColModel *       pFinalColModel;   // colModel for final result
+  SColumnModel *    pFinalColModel;    // colModel for final result
   SSubqueryState *  pState;
   int32_t           subqueryIndex;     // index of current vnode in vnode list
   SSqlObj *         pParentSqlObj;
-  tFilePage *       localBuffer;  // temp buffer, there is a buffer for each vnode to
-  uint32_t          numOfRetry;   // record the number of retry times
+  tFilePage *       localBuffer;       // temp buffer, there is a buffer for each vnode to
+  uint32_t          numOfRetry;        // record the number of retry times
   pthread_mutex_t   queryMutex;
 } SRetrieveSupport;
 
 int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pDesc,
-                                 tColModel **pFinalModel, uint32_t nBufferSize);
+                                 SColumnModel **pFinalModel, uint32_t nBufferSize);
 
-void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, tColModel *pFinalModel,
+void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, SColumnModel *pFinalModel,
                                int32_t numOfVnodes);
 
 int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
@@ -116,7 +116,7 @@ int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tF
  * create local reducer to launch the second-stage reduce process at client site
  */
 void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
-                           tColModel *finalModel, SSqlCmd *pSqlCmd, SSqlRes *pRes);
+                           SColumnModel *finalModel, SSqlCmd *pSqlCmd, SSqlRes *pRes);
 
 void tscDestroyLocalReducer(SSqlObj *pSql);
 

src/client/src/tscFunctionImpl.c

@@ -27,6 +27,7 @@
 #include "ttime.h"
 #include "ttypes.h"
 #include "tutil.h"
+#include "tpercentile.h"
 
 #define GET_INPUT_CHAR(x) (((char *)((x)->aInputElemBuf)) + ((x)->startOffset) * ((x)->inputBytes))
 #define GET_INPUT_CHAR_INDEX(x, y) (GET_INPUT_CHAR(x) + (y) * (x)->inputBytes)
@@ -220,7 +221,7 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
     } else if (functionId == TSDB_FUNC_TWA) {
       *type = TSDB_DATA_TYPE_DOUBLE;
       *bytes = sizeof(STwaInfo);
-      *intermediateResBytes = sizeof(STwaInfo);
+      *intermediateResBytes = *bytes;
       return TSDB_CODE_SUCCESS;
     }
   }
@@ -271,7 +272,6 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
   } else if (functionId == TSDB_FUNC_PERCT) {
     *type = (int16_t)TSDB_DATA_TYPE_DOUBLE;
     *bytes = (int16_t)sizeof(double);
-    //*intermediateResBytes = POINTER_BYTES;
     *intermediateResBytes = (int16_t)sizeof(double);
   } else if (functionId == TSDB_FUNC_LEASTSQR) {
     *type = TSDB_DATA_TYPE_BINARY;
@@ -1878,7 +1878,8 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
   tVariantCreateFromBinary(&val, pData, tDataTypeDesc[type].nSize, type);
 
   tValuePair **pList = pInfo->res;
-
+  assert(pList != NULL);
+  
   if (pInfo->num < maxLen) {
     if (pInfo->num == 0 ||
         ((type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) &&
@@ -2416,7 +2417,7 @@ static bool percentile_function_setup(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   SSchema      field[1] = {{pCtx->inputType, "dummyCol", 0, pCtx->inputBytes}};
 
-  tColModel *pModel = tColModelCreate(field, 1, 1000);
+  SColumnModel *pModel = createColumnModel(field, 1, 1000);
   int32_t    orderIdx = 0;
 
   // tOrderDesc object

src/client/src/tscParseInsert.c

@@ -321,7 +321,7 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
       if (pToken->type == TK_NULL) {
         *(uint32_t *)payload = TSDB_DATA_NCHAR_NULL;
       } else {
-        // if the converted output len is over than pSchema->bytes, return error: 'Argument list too long'
+        // if the converted output len is over than pColumnModel->bytes, return error: 'Argument list too long'
         if (!taosMbsToUcs4(pToken->z, pToken->n, payload, pSchema->bytes)) {
           char buf[512] = {0};
           snprintf(buf, 512, "%s", strerror(errno));

src/client/src/tscSQLParser.c

@@ -72,7 +72,7 @@ static void setColumnOffsetValueInResultset(SQueryInfo* pQueryInfo);
 static int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, tVariantList* pList, SSqlCmd* pCmd);
 
 static int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
-static int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
+static int32_t parseSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
 
 static int32_t addProjectionExprAndResultField(SQueryInfo* pQueryInfo, tSQLExprItem* pItem);
 
@@ -657,14 +657,14 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
     return ret;
   }
   
-  if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+  if (parseSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_INVALID_SQL;
   }
   
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
+int32_t parseSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
   const char* msg0 = "sliding value too small";
   const char* msg1 = "sliding value no larger than the interval value";
 
@@ -685,7 +685,7 @@ int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
       return invalidSqlErrMsg(pQueryInfo->msg, msg1);
     }
   } else {
-    pSliding->n = pQueryInfo->nAggTimeInterval;
+    pQueryInfo->nSlidingTime = -1;
   }
 
   return TSDB_CODE_SUCCESS;
@@ -5453,8 +5453,6 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   const char* msg0 = "invalid table name";
   const char* msg1 = "table name too long";
   const char* msg2 = "point interpolation query needs timestamp";
-  const char* msg3 = "sliding value too small";
-  const char* msg4 = "sliding value no larger than the interval value";
   const char* msg5 = "fill only available for interval query";
   const char* msg6 = "start(end) time of query range required or time range too large";
   const char* msg7 = "illegal number of tables in from clause";
@@ -5587,30 +5585,6 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   if (!hasTimestampForPointInterpQuery(pQueryInfo)) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg2);
   }
-  
-//  // set sliding value, the query time range needs to be decide in the first place
-//  SSQLToken* pSliding = &pQuerySql->sliding;
-//  if (pSliding->n != 0) {
-//    if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) {  // sliding only allowed in stream
-//      const char* msg = "time range expected for sliding window query";
-//      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
-//    }
-//
-//    getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
-//    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-//      pQueryInfo->nSlidingTime /= 1000;
-//    }
-//
-//    if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
-//      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
-//    }
-//
-//    if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
-//      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-//    }
-//  } else {
-//    pQueryInfo->nSlidingTime = -1;
-//  }
 
   // in case of join query, time range is required.
   if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {

src/client/src/tscServer.c

@@ -901,7 +901,7 @@ int tscLaunchSTableSubqueries(SSqlObj *pSql) {
 
   tExtMemBuffer **  pMemoryBuf = NULL;
   tOrderDescriptor *pDesc = NULL;
-  tColModel *       pModel = NULL;
+  SColumnModel *       pModel = NULL;
 
   pRes->qhandle = 1;  // hack the qhandle check
 
@@ -1181,7 +1181,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
     tscTrace("%p sub:%p retrieve numOfRows:%d totalNumOfRows:%d from ip:%u,vid:%d,orderOfSub:%d", pPObj, pSql,
              pRes->numOfRows, pState->numOfRetrievedRows, pSvd->ip, pSvd->vnode, idx);
     
-    if (num > tsMaxNumOfOrderedResults) {
+    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
       tscError("%p sub:%p num of OrderedRes is too many, max allowed:%" PRId64 " , current:%" PRId64,
           pPObj, pSql, tsMaxNumOfOrderedResults, num);
       tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_SORTED_RES_TOO_MANY);
@@ -1194,7 +1194,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
     SSrcColumnInfo colInfo[256] = {0};
 
     tscGetSrcColumnInfo(colInfo, pQueryInfo);
-    tColModelDisplayEx(pDesc->pSchema, pRes->data, pRes->numOfRows, pRes->numOfRows, colInfo);
+    tColModelDisplayEx(pDesc->pColumnModel, pRes->data, pRes->numOfRows, pRes->numOfRows, colInfo);
 #endif
     if (tsTotalTmpDirGB != 0 && tsAvailTmpDirGB < tsMinimalTmpDirGB) {
       tscError("%p sub:%p client disk space remain %.3f GB, need at least %.3f GB, stop query", pPObj, pSql,
@@ -1202,6 +1202,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
       tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
       return;
     }
+    
     int32_t ret = saveToBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pRes->data,
                                pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
     if (ret < 0) {
@@ -1214,17 +1215,17 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
 
   } else {  // all data has been retrieved to client
     /* data in from current vnode is stored in cache and disk */
-    uint32_t numOfRowsFromVnode = trsupport->pExtMemBuffer[idx]->numOfAllElems + trsupport->localBuffer->numOfElems;
+    uint32_t numOfRowsFromVnode = trsupport->pExtMemBuffer[idx]->numOfTotalElems + trsupport->localBuffer->numOfElems;
     tscTrace("%p sub:%p all data retrieved from ip:%u,vid:%d, numOfRows:%d, orderOfSub:%d", pPObj, pSql, pSvd->ip,
              pSvd->vnode, numOfRowsFromVnode, idx);
 
-    tColModelCompact(pDesc->pSchema, trsupport->localBuffer, pDesc->pSchema->maxCapacity);
+    tColModelCompact(pDesc->pColumnModel, trsupport->localBuffer, pDesc->pColumnModel->capacity);
 
 #ifdef _DEBUG_VIEW
     printf("%" PRIu64 " rows data flushed to disk:\n", trsupport->localBuffer->numOfElems);
     SSrcColumnInfo colInfo[256] = {0};
     tscGetSrcColumnInfo(colInfo, pQueryInfo);
-    tColModelDisplayEx(pDesc->pSchema, trsupport->localBuffer->data, trsupport->localBuffer->numOfElems,
+    tColModelDisplayEx(pDesc->pColumnModel, trsupport->localBuffer->data, trsupport->localBuffer->numOfElems,
                        trsupport->localBuffer->numOfElems, colInfo);
 #endif
     
@@ -1256,7 +1257,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
     }
 
     // all sub-queries are returned, start to local merge process
-    pDesc->pSchema->maxCapacity = trsupport->pExtMemBuffer[idx]->numOfElemsPerPage;
+    pDesc->pColumnModel->capacity = trsupport->pExtMemBuffer[idx]->numOfElemsPerPage;
 
     tscTrace("%p retrieve from %d vnodes completed.final NumOfRows:%d,start to build loser tree", pPObj,
              pState->numOfTotal, pState->numOfRetrievedRows);
@@ -1516,7 +1517,7 @@ void tscUpdateVnodeInQueryMsg(SSqlObj *pSql, char *buf) {
   char *          pStart = buf + tsRpcHeadSize;
   SQueryMeterMsg *pQueryMsg = (SQueryMeterMsg *)pStart;
 
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {  // pSchema == NULL, query on meter
+  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {  // pColumnModel == NULL, query on meter
     SMeterMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
     pQueryMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
   } else {  // query on metric

src/client/src/tscStream.c

@@ -396,7 +396,9 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   int64_t minSlidingTime =
       (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinSlidingTime * 1000L : tsMinSlidingTime;
 
-  if (pQueryInfo->nSlidingTime < minSlidingTime) {
+  if (pQueryInfo->nSlidingTime == -1) {
+    pQueryInfo->nSlidingTime = pQueryInfo->nAggTimeInterval;
+  } else if (pQueryInfo->nSlidingTime < minSlidingTime) {
     tscWarn("%p stream:%p, original sliding value:%" PRId64 " too small, reset to:%" PRId64 "", pSql, pStream,
         pQueryInfo->nSlidingTime, minSlidingTime);
 

src/client/src/tscUtil.c

@@ -676,7 +676,7 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList,
                                 STableDataBlocks** dataBlocks) {
   *dataBlocks = NULL;
 
-  STableDataBlocks** t1 = (STableDataBlocks**)taosGetDataFromHash(pHashList, (const char*)&id, sizeof(id));
+  STableDataBlocks** t1 = (STableDataBlocks**)taosGetDataFromHashTable(pHashList, (const char*)&id, sizeof(id));
   if (t1 != NULL) {
     *dataBlocks = *t1;
   }

src/dnode/src/dnodeShell.c

@@ -442,22 +442,22 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
 
   if (code == TSDB_CODE_SUCCESS) {
     size = vnodeGetResultSize((void *)(pRetrieve->qhandle), &numOfRows);
+  
+    // buffer size for progress information, including meter count,
+    // and for each meter, including 'uid' and 'TSKEY'.
+    int progressSize = 0;
+    if (pQInfo->pMeterQuerySupporter != NULL)
+      progressSize = pQInfo->pMeterQuerySupporter->numOfMeters * (sizeof(int64_t) + sizeof(TSKEY)) + sizeof(int32_t);
+    else if (pQInfo->pObj != NULL)
+      progressSize = sizeof(int64_t) + sizeof(TSKEY) + sizeof(int32_t);
+  
+    pStart = taosBuildRspMsgWithSize(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, progressSize + size + 100);
+    if (pStart == NULL) {
+      taosSendSimpleRsp(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
+      goto _exit;
+    }
   }
 
-  // buffer size for progress information, including meter count,
-  // and for each meter, including 'uid' and 'TSKEY'.
-  int progressSize = 0;
-  if (pQInfo->pMeterQuerySupporter != NULL)
-    progressSize = pQInfo->pMeterQuerySupporter->numOfMeters * (sizeof(int64_t) + sizeof(TSKEY)) + sizeof(int32_t);
-  else if (pQInfo->pObj != NULL)
-    progressSize = sizeof(int64_t) + sizeof(TSKEY) + sizeof(int32_t);
-
-  pStart = taosBuildRspMsgWithSize(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, progressSize + size + 100);
-  if (pStart == NULL) {
-    taosSendSimpleRsp(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    goto _exit;
-  }
-  
   pMsg = pStart;
 
   *pMsg = code;
@@ -485,26 +485,28 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
 
   // write the progress information of each meter to response
   // this is required by subscriptions
-  if (pQInfo->pMeterQuerySupporter != NULL && pQInfo->pMeterQuerySupporter->pMeterSidExtInfo != NULL) {
-    *((int32_t*)pMsg) = htonl(pQInfo->pMeterQuerySupporter->numOfMeters);
-    pMsg += sizeof(int32_t);
-    for (int32_t i = 0; i < pQInfo->pMeterQuerySupporter->numOfMeters; i++) {
-      *((int64_t*)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->uid);
+  if (numOfRows > 0 && code == TSDB_CODE_SUCCESS) {
+    if (pQInfo->pMeterQuerySupporter != NULL && pQInfo->pMeterQuerySupporter->pMeterSidExtInfo != NULL) {
+      *((int32_t *)pMsg) = htonl(pQInfo->pMeterQuerySupporter->numOfMeters);
+      pMsg += sizeof(int32_t);
+      for (int32_t i = 0; i < pQInfo->pMeterQuerySupporter->numOfMeters; i++) {
+        *((int64_t *)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->uid);
+        pMsg += sizeof(int64_t);
+        *((TSKEY *)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->key);
+        pMsg += sizeof(TSKEY);
+      }
+    } else if (pQInfo->pObj != NULL) {
+      *((int32_t *)pMsg) = htonl(1);
+      pMsg += sizeof(int32_t);
+      *((int64_t *)pMsg) = htobe64(pQInfo->pObj->uid);
       pMsg += sizeof(int64_t);
-      *((TSKEY*)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->key);
+      if (pQInfo->pointsRead > 0) {
+        *((TSKEY *)pMsg) = htobe64(pQInfo->query.lastKey + 1);
+      } else {
+        *((TSKEY *)pMsg) = htobe64(pQInfo->query.lastKey);
+      }
       pMsg += sizeof(TSKEY);
     }
-  } else if (pQInfo->pObj != NULL) {
-    *((int32_t*)pMsg) = htonl(1);
-    pMsg += sizeof(int32_t);
-    *((int64_t*)pMsg) = htobe64(pQInfo->pObj->uid);
-    pMsg += sizeof(int64_t);
-    if (pQInfo->pointsRead > 0) {
-      *((TSKEY*)pMsg) = htobe64(pQInfo->query.lastKey + 1);
-    } else {
-      *((TSKEY*)pMsg) = htobe64(pQInfo->query.lastKey);
-    }
-    pMsg += sizeof(TSKEY);
   }
 
   msgLen = pMsg - pStart;

src/inc/tpercentile.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_TPERCENTILE_H
+#define TDENGINE_TPERCENTILE_H
+
+#include "textbuffer.h"
+
+typedef struct MinMaxEntry {
+  union {
+    double  dMinVal;
+    int32_t iMinVal;
+    int64_t i64MinVal;
+  };
+  union {
+    double  dMaxVal;
+    int32_t iMaxVal;
+    int64_t i64MaxVal;
+  };
+} MinMaxEntry;
+
+typedef struct tMemBucketSegment {
+  int32_t         numOfSlots;
+  MinMaxEntry *   pBoundingEntries;
+  tExtMemBuffer **pBuffer;
+} tMemBucketSegment;
+
+typedef struct tMemBucket {
+  int16_t numOfSegs;
+  int16_t nTotalSlots;
+  int16_t nSlotsOfSeg;
+  int16_t dataType;
+  
+  int16_t nElemSize;
+  int32_t numOfElems;
+  
+  int32_t nTotalBufferSize;
+  int32_t maxElemsCapacity;
+  
+  int16_t pageSize;
+  int16_t numOfTotalPages;
+  int16_t numOfAvailPages; /* remain available buffer pages */
+  
+  tMemBucketSegment *pSegs;
+  tOrderDescriptor * pOrderDesc;
+  
+  MinMaxEntry nRange;
+  
+  void (*HashFunc)(struct tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
+} tMemBucket;
+
+tMemBucket *tMemBucketCreate(int32_t totalSlots, int32_t nBufferSize, int16_t nElemSize, int16_t dataType,
+                             tOrderDescriptor *pDesc);
+
+void tMemBucketDestroy(tMemBucket *pBucket);
+
+void tMemBucketPut(tMemBucket *pBucket, void *data, int32_t numOfRows);
+
+double getPercentile(tMemBucket *pMemBucket, double percent);
+
+void tBucketIntHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
+
+void tBucketDoubleHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
+
+#endif  // TDENGINE_TPERCENTILE_H

src/inc/tresultBuf.h

+#ifndef TDENGINE_VNODEQUERYUTIL_H
+#define TDENGINE_VNODEQUERYUTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "textbuffer.h"
+
+typedef struct SIDList {
+  uint32_t alloc;
+  int32_t  size;
+  int32_t* pData;
+} SIDList;
+
+typedef struct SQueryResultBuf {
+  int32_t  numOfRowsPerPage;
+  int32_t  numOfPages;
+  int64_t  totalBufSize;
+  int32_t  fd;                  // data file fd
+  int32_t  allocateId;          // allocated page id
+  int32_t  incStep;             // minimum allocated pages
+  char*    pBuf;                // mmap buffer pointer
+  char*    path;                // file path
+  
+  uint32_t numOfAllocGroupIds;  // number of allocated id list
+  void*    idsTable;            // id hash table
+  SIDList* list;                // for each id, there is a page id list
+} SQueryResultBuf;
+
+/**
+ * create disk-based result buffer
+ * @param pResultBuf
+ * @param size
+ * @param rowSize
+ * @return
+ */
+int32_t createResultBuf(SQueryResultBuf** pResultBuf, int32_t size, int32_t rowSize);
+
+/**
+ *
+ * @param pResultBuf
+ * @param groupId
+ * @param pageId
+ * @return
+ */
+tFilePage* getNewDataBuf(SQueryResultBuf* pResultBuf, int32_t groupId, int32_t* pageId);
+
+/**
+ *
+ * @param pResultBuf
+ * @return
+ */
+int32_t getNumOfRowsPerPage(SQueryResultBuf* pResultBuf);
+
+/**
+ *
+ * @param pResultBuf
+ * @param groupId
+ * @return
+ */
+SIDList getDataBufPagesIdList(SQueryResultBuf* pResultBuf, int32_t groupId);
+
+/**
+ * get the specified buffer page by id
+ * @param pResultBuf
+ * @param id
+ * @return
+ */
+tFilePage* getResultBufferPageById(SQueryResultBuf* pResultBuf, int32_t id);
+
+/**
+ * get the total buffer size in the format of disk file
+ * @param pResultBuf
+ * @return
+ */
+int32_t getResBufSize(SQueryResultBuf* pResultBuf);
+
+/**
+ * get the number of groups in the result buffer
+ * @param pResultBuf
+ * @return
+ */
+int32_t getNumOfResultBufGroupId(SQueryResultBuf* pResultBuf);
+
+/**
+ * destroy result buffer
+ * @param pResultBuf
+ */
+void destroyResultBuf(SQueryResultBuf* pResultBuf);
+
+/**
+ *
+ * @param pList
+ * @return
+ */
+int32_t getLastPageId(SIDList *pList);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_VNODEQUERYUTIL_H

src/kit/shell/CMakeLists.txt

@@ -11,7 +11,13 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   LIST(REMOVE_ITEM SRC ./src/shellWindows.c)
   LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
   ADD_EXECUTABLE(shell ${SRC})  
-  TARGET_LINK_LIBRARIES(shell taos_static)
+  
+  IF (TD_PAGMODE_LITE)
+    TARGET_LINK_LIBRARIES(shell taos)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(shell taos_static)
+  ENDIF ()
+  
   SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
 ELSEIF (TD_WINDOWS_64)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)

src/kit/taosdemo/CMakeLists.txt

@@ -9,5 +9,11 @@ INCLUDE_DIRECTORIES(inc)
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
-  TARGET_LINK_LIBRARIES(taosdemo taos_static)
+  
+  IF (TD_PAGMODE_LITE)
+    TARGET_LINK_LIBRARIES(taosdemo taos)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosdemo taos_static)
+  ENDIF ()
+  
 ENDIF ()

src/kit/taosdump/CMakeLists.txt

@@ -9,5 +9,12 @@ INCLUDE_DIRECTORIES(inc)
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdump ${SRC})
-  TARGET_LINK_LIBRARIES(taosdump taos_static)
+  
+  IF (TD_PAGMODE_LITE)
+    TARGET_LINK_LIBRARIES(taosdump taos)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosdump taos_static)
+  ENDIF ()  
+  
+  
 ENDIF ()

src/mnode/src/mgmtDnodeInt.c

@@ -211,7 +211,7 @@ char *mgmtBuildCreateMeterIe(STabObj *pTable, char *pMsg, int vnode) {
 
   for (int i = 0; i < pTable->numOfColumns; ++i) {
     pCreateMeter->schema[i].type = pSchema[i].type;
-    /* strcpy(pCreateMeter->schema[i].name, pSchema[i].name); */
+    /* strcpy(pCreateMeter->schema[i].name, pColumnModel[i].name); */
     pCreateMeter->schema[i].bytes = htons(pSchema[i].bytes);
     pCreateMeter->schema[i].colId = htons(pSchema[i].colId);
   }

src/system/CMakeLists.txt

+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+ADD_SUBDIRECTORY(detail)
+
+IF (TD_EDGE)
+  ADD_SUBDIRECTORY(lite)
+ENDIF ()
\ No newline at end of file

src/system/detail/CMakeLists.txt

+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(./src SRC)
+  LIST(REMOVE_ITEM SRC ./src/vnodeFileUtil.c)
+  LIST(REMOVE_ITEM SRC ./src/taosGrant.c)
+
+  ADD_EXECUTABLE(taosd ${SRC})
+
+  IF (TD_PAGMODE_LITE)
+    TARGET_LINK_LIBRARIES(taosd taos trpc tutil sdb monitor pthread http)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosd taos_static trpc tutil sdb monitor pthread http)
+  ENDIF ()
+
+  IF (TD_EDGE)
+    TARGET_LINK_LIBRARIES(taosd taosd_edge)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosd taosd_cluster)
+  ENDIF ()
+
+  SET(PREPARE_ENV_CMD "prepare_env_cmd")
+  SET(PREPARE_ENV_TARGET "prepare_env_target")
+  ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
+    POST_BUILD 
+    COMMAND echo "make test directory"
+    DEPENDS taosd
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
+    COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMENT "prepare taosd environment")
+  ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
+
+ENDIF ()

src/system/lite/CMakeLists.txt

+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/system/detail/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(inc)
+
+  AUX_SOURCE_DIRECTORY(./src SRC)
+  ADD_LIBRARY(taosd_edge ${SRC})
+ENDIF ()

src/util/inc/hash.h

@@ -43,10 +43,10 @@ typedef struct SHashEntry {
 
 typedef struct HashObj {
   SHashEntry **hashList;
-  uint32_t     capacity;
-  int          size;
-  _hash_fn_t   hashFp;
-  bool         multithreadSafe;  // enable lock
+  uint32_t     capacity;         // number of slots
+  int          size;             // number of elements in hash table
+  _hash_fn_t   hashFp;           // hash function
+  bool         multithreadSafe;  // enable lock or not
 
 #if defined LINUX
   pthread_rwlock_t lock;
@@ -57,11 +57,13 @@ typedef struct HashObj {
 } HashObj;
 
 void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe);
+void  taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
 
 int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void *data, uint32_t size);
-void    taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
+int32_t taosNumElemsInHashTable(HashObj *pObj);
+
+char *taosGetDataFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
 
-char *taosGetDataFromHash(HashObj *pObj, const char *key, uint32_t keyLen);
 
 void taosCleanUpHashTable(void *handle);
 

src/util/inc/textbuffer.h

@@ -19,20 +19,14 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tutil.h"
+#include "os.h"
 #include "taosmsg.h"
+#include "tutil.h"
 
-#define DEFAULT_PAGE_SIZE               16384  // 16k larger than the SHistoInfo
-#define MIN_BUFFER_SIZE                 (1 << 19)
-#define MAX_TMPFILE_PATH_LENGTH         PATH_MAX
-#define INITIAL_ALLOCATION_BUFFER_SIZE  64
-
-// forward declare
-struct tTagSchema;
+#define DEFAULT_PAGE_SIZE 16384  // 16k larger than the SHistoInfo
+#define MIN_BUFFER_SIZE (1 << 19)
+#define MAX_TMPFILE_PATH_LENGTH PATH_MAX
+#define INITIAL_ALLOCATION_BUFFER_SIZE 64
 
 typedef enum EXT_BUFFER_FLUSH_MODEL {
   /*
@@ -61,12 +55,12 @@ typedef struct tFlushoutData {
   tFlushoutInfo *pFlushoutInfo;
 } tFlushoutData;
 
-typedef struct tFileMeta {
+typedef struct SFileInfo {
   uint32_t      nFileSize;  // in pages
-  uint32_t      nPageSize;
+  uint32_t      pageSize;
   uint32_t      numOfElemsInFile;
   tFlushoutData flushoutData;
-} tFileMeta;
+} SFileInfo;
 
 typedef struct tFilePage {
   uint64_t numOfElems;
@@ -78,51 +72,50 @@ typedef struct tFilePagesItem {
   tFilePage              item;
 } tFilePagesItem;
 
-typedef struct tColModel {
-  int32_t         maxCapacity;
-  int32_t         numOfCols;
-  int16_t *       colOffset;
-  struct SSchema *pFields;
-} tColModel;
+typedef struct SSchemaEx {
+  struct SSchema field;
+  int16_t        offset;
+} SSchemaEx;
+
+typedef struct SColumnModel {
+  int32_t    capacity;
+  int32_t    numOfCols;
+  int16_t    rowSize;
+  SSchemaEx *pFields;
+} SColumnModel;
 
-typedef struct tOrderIdx {
-  int32_t numOfOrderedCols;
+typedef struct SColumnOrderInfo {
+  int32_t numOfCols;
   int16_t pData[];
-} tOrderIdx;
+} SColumnOrderInfo;
 
 typedef struct tOrderDescriptor {
-  union {
-    struct tTagSchema *pTagSchema;
-    tColModel *        pSchema;
-  };
-  int32_t   tsOrder;  // timestamp order type if exists
-  tOrderIdx orderIdx;
+  SColumnModel *   pColumnModel;
+  int32_t          tsOrder;  // timestamp order type if exists
+  SColumnOrderInfo orderIdx;
 } tOrderDescriptor;
 
 typedef struct tExtMemBuffer {
-  int32_t nMaxSizeInPages;
-
+  int32_t inMemCapacity;
   int32_t nElemSize;
-  int32_t nPageSize;
-
-  int32_t numOfAllElems;
+  int32_t pageSize;
+  int32_t numOfTotalElems;
   int32_t numOfElemsInBuffer;
   int32_t numOfElemsPerPage;
+  int16_t numOfInMemPages;
 
-  int16_t         numOfPagesInMem;
   tFilePagesItem *pHead;
   tFilePagesItem *pTail;
 
-  tFileMeta fileMeta;
-
-  char  dataFilePath[MAX_TMPFILE_PATH_LENGTH];
-  FILE *dataFile;
-
-  tColModel *pColModel;
+  char *    path;
+  FILE *    file;
+  SFileInfo fileMeta;
 
+  SColumnModel *         pColumnModel;
   EXT_BUFFER_FLUSH_MODEL flushModel;
 } tExtMemBuffer;
 
+<<<<<<< HEAD:src/util/inc/textbuffer.h
 typedef struct tTagSchema {
   struct SSchema *pSchema;
   int32_t         numOfCols;
@@ -139,20 +132,32 @@ typedef struct tSidSet {
   tOrderIdx   orderIdx;
 } tSidSet;
 
+=======
+/**
+ *
+ * @param fileNamePattern
+ * @param dstPath
+ */
+>>>>>>> develop:src/inc/textbuffer.h
 void getTmpfilePath(const char *fileNamePattern, char *dstPath);
 
-/*
- * create ext-memory buffer
+/**
+ *
+ * @param inMemSize
+ * @param elemSize
+ * @param pModel
+ * @return
  */
-void tExtMemBufferCreate(tExtMemBuffer **pMemBuffer, int32_t numOfBufferSize, int32_t elemSize,
-                         const char *tmpDataFilePath, tColModel *pModel);
+tExtMemBuffer *createExtMemBuffer(int32_t inMemSize, int32_t elemSize, SColumnModel *pModel);
 
-/*
- * destroy ext-memory buffer
+/**
+ *
+ * @param pMemBuffer
+ * @return
  */
-void tExtMemBufferDestroy(tExtMemBuffer **pMemBuffer);
+void *destoryExtMemBuffer(tExtMemBuffer *pMemBuffer);
 
-/*
+/**
  * @param pMemBuffer
  * @param data       input data pointer
  * @param numOfRows  number of rows in data
@@ -161,12 +166,15 @@ void tExtMemBufferDestroy(tExtMemBuffer **pMemBuffer);
  */
 int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRows);
 
-/*
- * flush all data into disk and release all in-memory buffer
+/**
+ *
+ * @param pMemBuffer
+ * @return
  */
 bool tExtMemBufferFlush(tExtMemBuffer *pMemBuffer);
 
-/*
+/**
+ *
  * remove all data that has been put into buffer, including in buffer or
  * ext-buffer(disk)
  */
@@ -179,11 +187,44 @@ void tExtMemBufferClear(tExtMemBuffer *pMemBuffer);
  */
 bool tExtMemBufferLoadData(tExtMemBuffer *pMemBuffer, tFilePage *pFilePage, int32_t flushIdx, int32_t pageIdx);
 
+/**
+ *
+ * @param pMemBuffer
+ * @return
+ */
 bool tExtMemBufferIsAllDataInMem(tExtMemBuffer *pMemBuffer);
 
-tColModel *tColModelCreate(SSchema *field, int32_t numOfCols, int32_t maxCapacity);
+/**
+ *
+ * @param fields
+ * @param numOfCols
+ * @param blockCapacity
+ * @return
+ */
+SColumnModel *createColumnModel(SSchema *fields, int32_t numOfCols, int32_t blockCapacity);
+
+/**
+ *
+ * @param pSrc
+ * @return
+ */
+SColumnModel *cloneColumnModel(SColumnModel *pSrc);
+
+/**
+ *
+ * @param pModel
+ */
+void destroyColumnModel(SColumnModel *pModel);
+
+/*
+ * compress data into consecutive block without hole in data
+ */
+void tColModelCompact(SColumnModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity);
+
+void     tColModelErase(SColumnModel *pModel, tFilePage *inputBuffer, int32_t maxCapacity, int32_t s, int32_t e);
+SSchema *getColumnModelSchema(SColumnModel *pColumnModel, int32_t index);
 
-void tColModelDestroy(tColModel *pModel);
+int16_t getColumnModelOffset(SColumnModel *pColumnModel, int32_t index);
 
 typedef struct SSrcColumnInfo {
   int32_t functionId;
@@ -193,68 +234,18 @@ typedef struct SSrcColumnInfo {
 /*
  * display data in column format model for debug purpose only
  */
-void tColModelDisplay(tColModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount);
+void tColModelDisplay(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount);
 
-void tColModelDisplayEx(tColModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount, SSrcColumnInfo *pInfo);
+void tColModelDisplayEx(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount, SSrcColumnInfo *pInfo);
 
-/*
- * compress data into consecutive block without hole in data
- */
-void tColModelCompact(tColModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity);
-
-void tColModelErase(tColModel *pModel, tFilePage *inputBuffer, int32_t maxCapacity, int32_t s, int32_t e);
-
-tOrderDescriptor *tOrderDesCreate(int32_t *orderColIdx, int32_t numOfOrderCols, tColModel *pModel, int32_t tsOrderType);
+tOrderDescriptor *tOrderDesCreate(const int32_t *orderColIdx, int32_t numOfOrderCols, SColumnModel *pModel,
+                                  int32_t tsOrderType);
 
 void tOrderDescDestroy(tOrderDescriptor *pDesc);
 
-void tColModelAppend(tColModel *dstModel, tFilePage *dstPage, void *srcData, int32_t srcStartRows,
+void tColModelAppend(SColumnModel *dstModel, tFilePage *dstPage, void *srcData, int32_t srcStartRows,
                      int32_t numOfRowsToWrite, int32_t srcCapacity);
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct MinMaxEntry {
-  union {
-    double  dMinVal;
-    int32_t iMinVal;
-    int64_t i64MinVal;
-  };
-  union {
-    double  dMaxVal;
-    int32_t iMaxVal;
-    int64_t i64MaxVal;
-  };
-} MinMaxEntry;
-
-typedef struct tMemBucketSegment {
-  int32_t         numOfSlots;
-  MinMaxEntry *   pBoundingEntries;
-  tExtMemBuffer **pBuffer;
-} tMemBucketSegment;
-
-typedef struct tMemBucket {
-  int16_t numOfSegs;
-  int16_t nTotalSlots;
-  int16_t nSlotsOfSeg;
-  int16_t dataType;
-
-  int16_t nElemSize;
-  int32_t numOfElems;
-
-  int32_t nTotalBufferSize;
-  int32_t maxElemsCapacity;
-
-  int16_t nPageSize;
-  int16_t numOfTotalPages;
-  int16_t numOfAvailPages; /* remain available buffer pages */
-
-  tMemBucketSegment *pSegs;
-  tOrderDescriptor * pOrderDesc;
-
-  MinMaxEntry nRange;
-
-  void (*HashFunc)(struct tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-} tMemBucket;
-
 typedef int (*__col_compar_fn_t)(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
 
 void tColDataQSort(tOrderDescriptor *, int32_t numOfRows, int32_t start, int32_t end, char *data, int32_t orderType);
@@ -269,19 +260,6 @@ int32_t compare_a(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1
 int32_t compare_d(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1, int32_t numOfRow2, int32_t s2,
                   char *data2);
 
-tMemBucket* tMemBucketCreate(int32_t totalSlots, int32_t nBufferSize, int16_t nElemSize,
-                      int16_t dataType, tOrderDescriptor *pDesc);
-
-void tMemBucketDestroy(tMemBucket *pBucket);
-
-void tMemBucketPut(tMemBucket *pBucket, void *data, int32_t numOfRows);
-
-double getPercentile(tMemBucket *pMemBucket, double percent);
-
-void tBucketIntHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-
-void tBucketDoubleHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-
 #ifdef __cplusplus
 }
 #endif

src/util/inc/thistogram.h

@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#include "tskiplist.h"
-
 #define USE_ARRAYLIST
 
 #define MAX_HISTOGRAM_BIN 500

src/util/inc/tinterpolation.h

@@ -78,7 +78,7 @@ int32_t taosNumOfRemainPoints(SInterpolationInfo *pInterpoInfo);
  */
 int32_t taosDoInterpoResult(SInterpolationInfo *pInterpoInfo, int16_t interpoType, tFilePage **data,
                             int32_t numOfRawDataInRows, int32_t outputRows, int64_t nInterval,
-                            const int64_t *pPrimaryKeyArray, tColModel *pModel, char **srcData, int64_t *defaultVal,
+                            const int64_t *pPrimaryKeyArray, SColumnModel *pModel, char **srcData, int64_t *defaultVal,
                             const int32_t *functionIDs, int32_t bufSize);
 
 int taosDoLinearInterpolation(int32_t type, SPoint *point1, SPoint *point2, SPoint *point);

src/util/src/hash.c

@@ -346,6 +346,14 @@ static void doAddToHashTable(HashObj *pObj, SHashNode *pNode) {
 //  pTrace("key:%s %p add to hash table", key, pNode);
 }
 
+int32_t taosNumElemsInHashTable(HashObj *pObj) {
+  if (pObj == NULL) {
+    return 0;
+  }
+  
+  return pObj->size;
+}
+
 /**
  * add data node into hash table
  * @param pObj    hash object
@@ -392,7 +400,7 @@ int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void
   return 0;
 }
 
-char *taosGetDataFromHash(HashObj *pObj, const char *key, uint32_t keyLen) {
+char *taosGetDataFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
   if (pObj->multithreadSafe) {
     __rd_lock(&pObj->lock);
   }

src/util/src/tinterpolation.c

@@ -205,16 +205,18 @@ static char* getPos(char* data, int32_t bytes, int32_t order, int32_t capacity,
 //  }
 }
 
-static void setTagsValueInInterpolation(tFilePage** data, char** pTags, tColModel* pModel, int32_t order, int32_t start,
+static void setTagsValueInInterpolation(tFilePage** data, char** pTags, SColumnModel* pModel, int32_t order, int32_t start,
                                         int32_t capacity, int32_t num) {
   for (int32_t j = 0, i = start; i < pModel->numOfCols; ++i, ++j) {
-    char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, order, capacity, num);
-    assignVal(val1, pTags[j], pModel->pFields[i].bytes, pModel->pFields[i].type);
+    SSchema* pSchema = getColumnModelSchema(pModel, i);
+    
+    char* val1 = getPos(data[i]->data, pSchema->bytes, order, capacity, num);
+    assignVal(val1, pTags[j], pSchema->bytes, pSchema->type);
   }
 }
 
 static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interpoType, tFilePage** data,
-                                tColModel* pModel, int32_t* num, char** srcData, int64_t nInterval, int64_t* defaultVal,
+                                SColumnModel* pModel, int32_t* num, char** srcData, int64_t nInterval, int64_t* defaultVal,
                                 int64_t currentTimestamp, int32_t capacity, int32_t numOfTags, char** pTags,
                                 bool outOfBound) {
   char** prevValues = &pInterpoInfo->prevValues;
@@ -234,18 +236,23 @@ static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interp
     char* pInterpolationData = INTERPOL_IS_ASC_INTERPOL(pInterpoInfo) ? *prevValues : *nextValues;
     if (pInterpolationData != NULL) {
       for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
+        SSchema* pSchema = getColumnModelSchema(pModel, i);
+        int16_t offset = getColumnModelOffset(pModel, i);
+        
+        char* val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, capacity, *num);
 
-        if (isNull(pInterpolationData + pModel->colOffset[i], pModel->pFields[i].type)) {
-          setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
+        if (isNull(pInterpolationData + offset, pSchema->type)) {
+          setNull(val1, pSchema->type, pSchema->bytes);
         } else {
-          assignVal(val1, pInterpolationData + pModel->colOffset[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
+          assignVal(val1, pInterpolationData + offset, pSchema->bytes, pSchema->type);
         }
       }
     } else { /* no prev value yet, set the value for null */
       for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-        setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
+        SSchema* pSchema = getColumnModelSchema(pModel, i);
+  
+        char* val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, capacity, *num);
+        setNull(val1, pSchema->type, pSchema->bytes);
       }
     }
 
@@ -254,34 +261,41 @@ static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interp
     // TODO : linear interpolation supports NULL value
     if (*prevValues != NULL && !outOfBound) {
       for (int32_t i = 1; i < numOfValCols; ++i) {
-        int32_t type = pModel->pFields[i].type;
-        char*   val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
+        SSchema* pSchema = getColumnModelSchema(pModel, i);
+        int16_t offset = getColumnModelOffset(pModel, i);
+        
+        int16_t type = pSchema->type;
+        char*   val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, capacity, *num);
 
         if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_BOOL) {
-          setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
+          setNull(val1, type, pSchema->bytes);
           continue;
         }
 
-        point1 = (SPoint){.key = *(TSKEY*)(*prevValues), .val = *prevValues + pModel->colOffset[i]};
-        point2 = (SPoint){.key = currentTimestamp, .val = srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes};
+        point1 = (SPoint){.key = *(TSKEY*)(*prevValues), .val = *prevValues + offset};
+        point2 = (SPoint){.key = currentTimestamp, .val = srcData[i] + pInterpoInfo->rowIdx * pSchema->bytes};
         point = (SPoint){.key = pInterpoInfo->startTimestamp, .val = val1};
-        taosDoLinearInterpolation(pModel->pFields[i].type, &point1, &point2, &point);
+        taosDoLinearInterpolation(type, &point1, &point2, &point);
       }
 
       setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
 
     } else {
       for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-        setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
+        SSchema* pSchema = getColumnModelSchema(pModel, i);
+        
+        char* val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, capacity, *num);
+        setNull(val1, pSchema->type, pSchema->bytes);
       }
 
       setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
     }
   } else { /* default value interpolation */
     for (int32_t i = 1; i < numOfValCols; ++i) {
-      char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-      assignVal(val1, (char*)&defaultVal[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
+      SSchema* pSchema = getColumnModelSchema(pModel, i);
+  
+      char* val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, capacity, *num);
+      assignVal(val1, (char*)&defaultVal[i], pSchema->bytes, pSchema->type);
     }
 
     setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
@@ -295,7 +309,7 @@ static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interp
 
 int32_t taosDoInterpoResult(SInterpolationInfo* pInterpoInfo, int16_t interpoType, tFilePage** data,
                             int32_t numOfRawDataInRows, int32_t outputRows, int64_t nInterval,
-                            const int64_t* pPrimaryKeyArray, tColModel* pModel, char** srcData, int64_t* defaultVal,
+                            const int64_t* pPrimaryKeyArray, SColumnModel* pModel, char** srcData, int64_t* defaultVal,
                             const int32_t* functionIDs, int32_t bufSize) {
   int32_t num = 0;
   pInterpoInfo->numOfCurrentInterpo = 0;
@@ -328,17 +342,21 @@ int32_t taosDoInterpoResult(SInterpolationInfo* pInterpoInfo, int16_t interpoTyp
           (pInterpoInfo->startTimestamp > currentTimestamp && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo))) {
         /* set the next value for interpolation */
         if (*nextValues == NULL) {
-          *nextValues =
-              calloc(1, pModel->colOffset[pModel->numOfCols - 1] + pModel->pFields[pModel->numOfCols - 1].bytes);
+          *nextValues = calloc(1, pModel->rowSize);
           for (int i = 1; i < pModel->numOfCols; i++) {
-            setNull(*nextValues + pModel->colOffset[i], pModel->pFields[i].type, pModel->pFields[i].bytes);
+            int16_t offset = getColumnModelOffset(pModel, i);
+            SSchema* pSchema = getColumnModelSchema(pModel, i);
+            
+            setNull(*nextValues + offset, pSchema->type, pSchema->bytes);
           }
         }
 
         int32_t offset = pInterpoInfo->rowIdx;
         for (int32_t tlen = 0, i = 0; i < pModel->numOfCols - numOfTags; ++i) {
-          memcpy(*nextValues + tlen, srcData[i] + offset * pModel->pFields[i].bytes, pModel->pFields[i].bytes);
-          tlen += pModel->pFields[i].bytes;
+          SSchema* pSchema = getColumnModelSchema(pModel, i);
+          
+          memcpy(*nextValues + tlen, srcData[i] + offset * pSchema->bytes, pSchema->bytes);
+          tlen += pSchema->bytes;
         }
       }
 
@@ -358,37 +376,41 @@ int32_t taosDoInterpoResult(SInterpolationInfo* pInterpoInfo, int16_t interpoTyp
 
       if (pInterpoInfo->startTimestamp == currentTimestamp) {
         if (*prevValues == NULL) {
-          *prevValues =
-              calloc(1, pModel->colOffset[pModel->numOfCols - 1] + pModel->pFields[pModel->numOfCols - 1].bytes);
+          *prevValues = calloc(1, pModel->rowSize);
           for (int i = 1; i < pModel->numOfCols; i++) {
-            setNull(*prevValues + pModel->colOffset[i], pModel->pFields[i].type, pModel->pFields[i].bytes);
+            int16_t offset = getColumnModelOffset(pModel, i);
+            SSchema* pSchema = getColumnModelSchema(pModel, i);
+            
+            setNull(*prevValues + offset, pSchema->type, pSchema->bytes);
           }
         }
 
         // assign rows to dst buffer
         int32_t i = 0;
         for (int32_t tlen = 0; i < pModel->numOfCols - numOfTags; ++i) {
-          char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, bufSize, num);
+          int16_t offset = getColumnModelOffset(pModel, i);
+          SSchema* pSchema = getColumnModelSchema(pModel, i);
+          
+          char* val1 = getPos(data[i]->data, pSchema->bytes, pInterpoInfo->order, bufSize, num);
 
           if (i == 0 ||
               (functionIDs[i] != TSDB_FUNC_COUNT &&
-               !isNull(srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes, pModel->pFields[i].type)) ||
+               !isNull(srcData[i] + pInterpoInfo->rowIdx * pSchema->bytes, pSchema->type)) ||
               (functionIDs[i] == TSDB_FUNC_COUNT &&
-               *(int64_t*)(srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes) != 0)) {
-            assignVal(val1, srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes, pModel->pFields[i].bytes,
-                      pModel->pFields[i].type);
-            memcpy(*prevValues + tlen, srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes,
-                   pModel->pFields[i].bytes);
+               *(int64_t*)(srcData[i] + pInterpoInfo->rowIdx * pSchema->bytes) != 0)) {
+            
+            assignVal(val1, srcData[i] + pInterpoInfo->rowIdx * pSchema->bytes, pSchema->bytes, pSchema->type);
+            memcpy(*prevValues + tlen, srcData[i] + pInterpoInfo->rowIdx * pSchema->bytes, pSchema->bytes);
           } else {  // i > 0 and isNULL, do interpolation
             if (interpoType == TSDB_INTERPO_PREV) {
-              assignVal(val1, *prevValues + pModel->colOffset[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
+              assignVal(val1, *prevValues + offset, pSchema->bytes, pSchema->type);
             } else if (interpoType == TSDB_INTERPO_LINEAR) {
               // TODO:
             } else {
-              assignVal(val1, (char*)&defaultVal[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
+              assignVal(val1, (char*)&defaultVal[i], pSchema->bytes, pSchema->type);
             }
           }
-          tlen += pModel->pFields[i].bytes;
+          tlen += pSchema->bytes;
         }
 
         /* set the tag value for final result */

src/util/src/ttokenizer.c

@@ -274,7 +274,7 @@ int tSQLKeywordCode(const char* z, int n) {
     }
   }
 
-  SKeyword** pKey = (SKeyword**)taosGetDataFromHash(KeywordHashTable, key, n);
+  SKeyword** pKey = (SKeyword**)taosGetDataFromHashTable(KeywordHashTable, key, n);
   if (pKey != NULL) {
     return (*pKey)->type;
   } else {

src/vnode/detail/inc/vnodeQueryImpl.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_VNODEQUERYUTIL_H
-#define TDENGINE_VNODEQUERYUTIL_H
+#ifndef TDENGINE_VNODEQUERYIMPL_H
+#define TDENGINE_VNODEQUERYIMPL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -120,7 +120,7 @@ typedef enum {
 typedef int (*__block_search_fn_t)(char* data, int num, int64_t key, int order);
 
 static FORCE_INLINE SMeterObj* getMeterObj(void* hashHandle, int32_t sid) {
-  return *(SMeterObj**)taosGetDataFromHash(hashHandle, (const char*) &sid, sizeof(sid));
+  return *(SMeterObj**)taosGetDataFromHashTable(hashHandle, (const char*) &sid, sizeof(sid));
 }
 
 bool isQueryKilled(SQuery* pQuery);
@@ -209,7 +209,7 @@ int32_t vnodeGetHeaderFile(SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIndex);
  * @param ekey
  * @return
  */
-SMeterQueryInfo* createMeterQueryInfo(SQuery* pQuery, TSKEY skey, TSKEY ekey);
+SMeterQueryInfo* createMeterQueryInfo(SQuery* pQuery, int32_t sid, TSKEY skey, TSKEY ekey);
 
 /**
  * Destroy meter query info
@@ -224,7 +224,7 @@ void destroyMeterQueryInfo(SMeterQueryInfo *pMeterQueryInfo, int32_t numOfCols);
  * @param skey
  * @param ekey
  */
-void changeMeterQueryInfoForSuppleQuery(SMeterQueryInfo *pMeterQueryInfo, TSKEY skey, TSKEY ekey);
+void changeMeterQueryInfoForSuppleQuery(SQueryResultBuf* pResultBuf, SMeterQueryInfo *pMeterQueryInfo, TSKEY skey, TSKEY ekey);
 
 /**
  * add the new allocated disk page to meter query info
@@ -276,11 +276,11 @@ void displayInterResult(SData** pdata, SQuery* pQuery, int32_t numOfRows);
 
 void vnodePrintQueryStatistics(SMeterQuerySupportObj* pSupporter);
 
-void clearGroupResultBuf(SOutputRes* pOneOutputRes, int32_t nOutputCols);
-void copyGroupResultBuf(SOutputRes* dst, const SOutputRes* src, int32_t nOutputCols);
+void clearGroupResultBuf(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes *pOneOutputRes);
+void copyGroupResultBuf(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes* dst, const SOutputRes* src);
 
-void resetSlidingWindowInfo(SSlidingWindowInfo* pSlidingWindowInfo, int32_t numOfCols);
-void clearCompletedSlidingWindows(SSlidingWindowInfo* pSlidingWindowInfo, int32_t numOfCols);
+void resetSlidingWindowInfo(SQueryRuntimeEnv *pRuntimeEnv, SSlidingWindowInfo* pSlidingWindowInfo);
+void clearCompletedSlidingWindows(SQueryRuntimeEnv* pRuntimeEnv);
 int32_t numOfClosedSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo);
 void closeSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot);
 void closeAllSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo);
@@ -289,4 +289,4 @@ void closeAllSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo);
 }
 #endif
 
-#endif  // TDENGINE_VNODEQUERYUTIL_H
+#endif  // TDENGINE_VNODEQUERYIMPL_H

src/vnode/detail/inc/vnodeRead.h

@@ -21,6 +21,7 @@ extern "C" {
 #endif
 
 #include "os.h"
+#include "tresultBuf.h"
 
 #include "tinterpolation.h"
 #include "vnodeTagMgmt.h"
@@ -84,10 +85,15 @@ typedef struct SQueryCostSummary {
   int64_t tmpBufferInDisk;  // size of buffer for intermediate result
 } SQueryCostSummary;
 
+typedef struct SPosInfo {
+  int64_t pageId;
+  int32_t rowId;
+} SPosInfo;
+
 typedef struct SOutputRes {
   uint16_t     numOfRows;
   int32_t      nAlloc;
-  tFilePage**  result;
+  SPosInfo     pos;
   SResultInfo* resultInfo;
 } SOutputRes;
 
@@ -159,7 +165,7 @@ typedef struct SQueryRuntimeEnv {
   SInterpolationInfo  interpoInfo;
   SData**             pInterpoBuf;
   
-  SSlidingWindowInfo   swindowResInfo;
+  SSlidingWindowInfo  swindowResInfo;
   
   STSBuf*             pTSBuf;
   STSCursor           cur;
@@ -174,16 +180,17 @@ typedef struct SQueryRuntimeEnv {
    * So we keep a copy of the support structure as well as the cache block data itself.
    */
   SCacheBlock         cacheBlock;
+  
+  SQueryResultBuf*    pResultBuf;
+  bool                stableQuery;  // is super table query or not
 } SQueryRuntimeEnv;
 
-/* intermediate result during multimeter query involves interval */
+/* intermediate pos during multimeter query involves interval */
 typedef struct SMeterQueryInfo {
   int64_t      lastKey;
   int64_t      skey;
   int64_t      ekey;
   int32_t      numOfRes;
-  uint32_t     numOfPages;
-  uint32_t     numOfAlloc;
   int32_t      reverseIndex;    // reversed output indicator, start from (numOfRes-1)
   int16_t      reverseFillRes;  // denote if reverse fill the results in supplementary scan required or not
   int16_t      queryRangeSet;   // denote if the query range is set, only available for interval query
@@ -191,7 +198,7 @@ typedef struct SMeterQueryInfo {
   int64_t      tag;
   STSCursor    cur;
   SResultInfo* resultInfo;
-  uint32_t*    pageList;
+  int32_t      sid; // for retrieve the page id list
 } SMeterQueryInfo;
 
 typedef struct SMeterDataInfo {
@@ -235,16 +242,8 @@ typedef struct SMeterQuerySupportObj {
    */
   int32_t meterIdx;
 
-  int32_t meterOutputFd;
-  int32_t lastPageId;
-  int32_t numOfPages;
   int32_t numOfGroupResultPages;
   int32_t groupResultSize;
-
-  char*   meterOutputMMapBuf;
-  int64_t bufSize;
-  char    extBufFile[256];  // external file name
-
   SMeterDataInfo* pMeterDataInfo;
 
   TSKEY* tsList;

src/vnode/detail/inc/vnodeTagMgmt.h

@@ -32,14 +32,21 @@ extern "C" {
  * Note:
  * 1. we implement a quick sort algorithm, may remove it later.
  */
+typedef struct tSidSet {
+  int32_t            numOfSids;
+  int32_t            numOfSubSet;
+  SMeterSidExtInfo **pSids;
+  int32_t *          starterPos;  // position of each subgroup, generated according to
+
+  SColumnModel      *pColumnModel;
+  SColumnOrderInfo   orderIdx;
+} tSidSet;
 
 typedef int32_t (*__ext_compar_fn_t)(const void *p1, const void *p2, void *param);
 
 tSidSet *tSidSetCreate(struct SMeterSidExtInfo **pMeterSidExtInfo, int32_t numOfMeters, SSchema *pSchema,
                        int32_t numOfTags, SColIndexEx *colList, int32_t numOfOrderCols);
 
-tTagSchema *tCreateTagSchema(SSchema *pSchema, int32_t numOfTagCols);
-
 int32_t *calculateSubGroup(void **pSids, int32_t numOfMeters, int32_t *numOfSubset, tOrderDescriptor *pOrderDesc,
                            __ext_compar_fn_t compareFn);
 

src/vnode/detail/src/vnodeFile.c

@@ -127,7 +127,7 @@ int vnodeCreateHeadDataFile(int vnode, int fileId, char *headName, char *dataNam
   if (symlink(dDataName, dataName) != 0) return -1;
   if (symlink(dLastName, lastName) != 0) return -1;
 
-  dPrint("vid:%d, fileId:%d, empty header file:%s dataFile:%s lastFile:%s on disk:%s is created ",
+  dPrint("vid:%d, fileId:%d, empty header file:%s file:%s lastFile:%s on disk:%s is created ",
           vnode, fileId, headName, dataName, lastName, path);
 
   return 0;

src/vnode/detail/src/vnodeQueryProcess.c

@@ -132,7 +132,7 @@ static void queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMeterInfo) {
       pRuntimeEnv->pMeterObj = pMeterObj;
 
       if (pMeterInfo[k].pMeterQInfo == NULL) {
-        pMeterInfo[k].pMeterQInfo = createMeterQueryInfo(pQuery, pSupporter->rawSKey, pSupporter->rawEKey);
+        pMeterInfo[k].pMeterQInfo = createMeterQueryInfo(pQuery, pMeterObj->sid, pSupporter->rawSKey, pSupporter->rawEKey);
       }
 
       if (pMeterInfo[k].pMeterObj == NULL) {  // no data in disk for this meter, set its pointer
@@ -683,7 +683,7 @@ static void vnodeSTableSeqProcessor(SQInfo *pQInfo) {
     }
   
     resetCtxOutputBuf(pRuntimeEnv);
-    resetSlidingWindowInfo(&pRuntimeEnv->swindowResInfo, pQuery->numOfOutputCols);
+    resetSlidingWindowInfo(pRuntimeEnv, &pRuntimeEnv->swindowResInfo);
     
     while (pSupporter->meterIdx < pSupporter->numOfMeters) {
       int32_t k = pSupporter->meterIdx;
@@ -858,7 +858,9 @@ static void doOrderedScan(SQInfo *pQInfo) {
 static void setupMeterQueryInfoForSupplementQuery(SMeterQuerySupportObj *pSupporter) {
   for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
     SMeterQueryInfo *pMeterQueryInfo = pSupporter->pMeterDataInfo[i].pMeterQInfo;
-    changeMeterQueryInfoForSuppleQuery(pMeterQueryInfo, pSupporter->rawSKey, pSupporter->rawEKey);
+    SQueryResultBuf* pResultBuf = pSupporter->runtimeEnv.pResultBuf;
+    
+    changeMeterQueryInfoForSuppleQuery(pResultBuf, pMeterQueryInfo, pSupporter->rawSKey, pSupporter->rawEKey);
   }
 }
 
@@ -1086,7 +1088,7 @@ static void vnodeSingleMeterIntervalMainLooper(SMeterQuerySupportObj *pSupporter
            (pQuery->skey >= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery)));
 
     initCtxOutputBuf(pRuntimeEnv);
-    clearCompletedSlidingWindows(&pRuntimeEnv->swindowResInfo, pQuery->numOfOutputCols);
+    clearCompletedSlidingWindows(pRuntimeEnv);
     
     vnodeScanAllData(pRuntimeEnv);
     if (isQueryKilled(pQuery)) {