diff --git a/Jenkinsfile2 b/Jenkinsfile2
index fcc02dc3e0..80f6b8e9e7 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -201,6 +201,7 @@ def pre_test_win(){
'''
bat '''
cd %WIN_COMMUNITY_ROOT%
+ git clean -fxd
git reset --hard
git remote prune origin
git fetch
diff --git a/README.md b/README.md
index 8d2567a816..6aec756ec7 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ TDengine is an open source, high-performance, cloud native [time-series database
- **[Easy Data Analytics](https://tdengine.com/tdengine/time-series-data-analytics-made-easy/)**: 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](https://tdengine.com/tdengine/open-source-time-series-database/)**: TDengine’s core modules, including cluster feature, are all available under open source licenses. It has gathered 18.8k stars on GitHub. There is an active developer community, and over 139k running instances worldwide.
+- **[Open Source](https://tdengine.com/tdengine/open-source-time-series-database/)**: TDengine’s core modules, including cluster feature, are all available under open source licenses. It has gathered 19.9k stars on GitHub. There is an active developer community, and over 139k running instances worldwide.
For a full list of TDengine competitive advantages, please [check here](https://tdengine.com/tdengine/). The easiest way to experience TDengine is through [TDengine Cloud](https://cloud.tdengine.com).
diff --git a/cmake/cmake.define b/cmake/cmake.define
index 3f152f1f09..e34785cba6 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -123,14 +123,20 @@ ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ENDIF ()
- MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
IF (TD_INTEL_64 OR TD_INTEL_32)
ADD_DEFINITIONS("-msse4.2")
IF("${FMA_SUPPORT}" MATCHES "true")
- MESSAGE(STATUS "turn fma function support on")
+ MESSAGE(STATUS "fma function supported")
ADD_DEFINITIONS("-mfma")
ELSE ()
- MESSAGE(STATUS "turn fma function support off")
+ MESSAGE(STATUS "fma function NOT supported")
+ ENDIF()
+
+ IF("${SIMD_SUPPORT}" MATCHES "true")
+ ADD_DEFINITIONS("-mavx -mavx2")
+ MESSAGE(STATUS "SIMD instructions (AVX/AVX2) is ACTIVATED")
+ ELSE()
+ MESSAGE(STATUS "SIMD instruction (AVX/AVX2)is NOT ACTIVATED")
ENDIF()
ENDIF ()
diff --git a/cmake/cmake.platform b/cmake/cmake.platform
index eb8b63b4c2..e822cc5e2c 100644
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -1,20 +1,17 @@
cmake_minimum_required(VERSION 3.0)
-MESSAGE("Current system is ${CMAKE_SYSTEM_NAME}")
-
# init
SET(TD_LINUX FALSE)
SET(TD_WINDOWS FALSE)
SET(TD_DARWIN FALSE)
-MESSAGE("Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
if(CMAKE_COMPILER_IS_GNUCXX MATCHES 1)
set(CXX_COMPILER_IS_GNU TRUE)
else()
set(CXX_COMPILER_IS_GNU FALSE)
endif()
-MESSAGE("Current system name is ${CMAKE_SYSTEM_NAME}.")
+MESSAGE("Current system: ${CMAKE_SYSTEM_NAME}")
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -26,6 +23,8 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
ENDIF ()
+ MESSAGE("Current system processor: ${CMAKE_SYSTEM_PROCESSOR}")
+
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
SET(TD_LINUX TRUE)
@@ -44,7 +43,6 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
SET(OSTYPE "macOS")
ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare")
- MESSAGE("Current system processor is ${CMAKE_SYSTEM_PROCESSOR}.")
IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
MESSAGE("Current system arch is arm64")
SET(TD_DARWIN_64 TRUE)
@@ -80,24 +78,22 @@ ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
ENDIF()
IF ("${CPUTYPE}" STREQUAL "")
- MESSAGE(STATUS "The current platform " ${CMAKE_SYSTEM_PROCESSOR} " is detected")
-
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)")
- MESSAGE(STATUS "The current platform is amd64")
+ MESSAGE(STATUS "Current platform is amd64")
SET(PLATFORM_ARCH_STR "amd64")
SET(TD_INTEL_64 TRUE)
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)")
- MESSAGE(STATUS "The current platform is x86")
+ MESSAGE(STATUS "Current platform is x86")
SET(PLATFORM_ARCH_STR "i386")
SET(TD_INTEL_32 TRUE)
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l")
- MESSAGE(STATUS "The current platform is aarch32")
+ MESSAGE(STATUS "Current platform is aarch32")
SET(PLATFORM_ARCH_STR "arm")
SET(TD_ARM_32 TRUE)
ADD_DEFINITIONS("-D_TD_ARM_")
ADD_DEFINITIONS("-D_TD_ARM_32")
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)")
- MESSAGE(STATUS "The current platform is aarch64")
+ MESSAGE(STATUS "Current platform is aarch64")
SET(PLATFORM_ARCH_STR "arm64")
SET(TD_ARM_64 TRUE)
ADD_DEFINITIONS("-D_TD_ARM_")
@@ -151,5 +147,5 @@ ENDIF ()
MESSAGE(STATUS "platform arch:" ${PLATFORM_ARCH_STR})
-MESSAGE("C Compiler ID: ${CMAKE_C_COMPILER_ID}")
-MESSAGE("CXX Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
+MESSAGE("C Compiler: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_C_COMPILER_VERSION})")
+MESSAGE("CXX Compiler: ${CMAKE_CXX_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_CXX_COMPILER_VERSION})")
diff --git a/cmake/cmake.version b/cmake/cmake.version
index 5c5abe79bb..9faa7c75dd 100644
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -2,7 +2,7 @@
IF (DEFINED VERNUMBER)
SET(TD_VER_NUMBER ${VERNUMBER})
ELSE ()
- SET(TD_VER_NUMBER "3.0.1.7")
+ SET(TD_VER_NUMBER "3.0.1.8")
ENDIF ()
IF (DEFINED VERCOMPATIBLE)
@@ -26,7 +26,7 @@ ELSEIF (HAVE_GIT)
SET(TD_VER_GIT "no git commit id")
ENDIF ()
ELSE ()
- message(STATUS "no git cmd")
+ message(STATUS "no git found")
SET(TD_VER_GIT "no git commit id")
ENDIF ()
@@ -70,9 +70,9 @@ MESSAGE(STATUS "compatible: " ${TD_VER_COMPATIBLE})
MESSAGE(STATUS "commit id: " ${TD_VER_GIT})
MESSAGE(STATUS "build date: " ${TD_VER_DATE})
MESSAGE(STATUS "build type: " ${CMAKE_BUILD_TYPE})
-MESSAGE(STATUS "type: " ${TD_VER_VERTYPE})
-MESSAGE(STATUS "cpu: " ${TD_VER_CPUTYPE})
-MESSAGE(STATUS "os: " ${TD_VER_OSTYPE})
+MESSAGE(STATUS "type: " ${TD_VER_VERTYPE})
+MESSAGE(STATUS "cpu: " ${TD_VER_CPUTYPE})
+MESSAGE(STATUS "os: " ${TD_VER_OSTYPE})
MESSAGE(STATUS "============= compile version parameter information end ============= ")
STRING(REPLACE "." "_" TD_LIB_VER_NUMBER ${TD_VER_NUMBER})
diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
index 5b35e30efb..577166353b 100644
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/cmake/taostools_CMakeLists.txt.in
@@ -2,7 +2,7 @@
# taos-tools
ExternalProject_Add(taos-tools
GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
- GIT_TAG fab042d
+ GIT_TAG 7e9ce09
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index 8bfdf72cc7..32bdc21e7c 100644
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
@@ -10,6 +10,10 @@ For TDengine 2.x installation packages by version, please visit [here](https://w
import Release from "/components/ReleaseV3";
+## 3.0.1.8
+
+
+
## 3.0.1.7
diff --git a/docs/en/28-releases/02-tools.md b/docs/en/28-releases/02-tools.md
index 2bc22a4450..7126b5a997 100644
--- a/docs/en/28-releases/02-tools.md
+++ b/docs/en/28-releases/02-tools.md
@@ -10,6 +10,10 @@ For other historical version installers, please visit [here](https://www.taosdat
import Release from "/components/ReleaseV3";
+## 2.3.0
+
+
+
## 2.2.9
diff --git a/docs/zh/12-taos-sql/14-stream.md b/docs/zh/12-taos-sql/14-stream.md
index cd726e0a0e..932ad30b1a 100644
--- a/docs/zh/12-taos-sql/14-stream.md
+++ b/docs/zh/12-taos-sql/14-stream.md
@@ -72,7 +72,7 @@ SHOW STREAMS;
若要展示更详细的信息，可以使用：
```sql
-SELECT * from performance_schema.`perf_streams`;
+SELECT * from information_schema.`ins_streams`;
```
## 流式计算的触发模式
diff --git a/docs/zh/20-third-party/01-grafana.mdx b/docs/zh/20-third-party/01-grafana.mdx
index 83f3f8bb25..d5cfe847ca 100644
--- a/docs/zh/20-third-party/01-grafana.mdx
+++ b/docs/zh/20-third-party/01-grafana.mdx
@@ -77,7 +77,7 @@ sudo -u grafana grafana-cli plugins install tdengine-datasource
或者从 [GitHub](https://github.com/taosdata/grafanaplugin/releases/tag/latest) 或 [Grafana](https://grafana.com/grafana/plugins/tdengine-datasource/?tab=installation) 下载 .zip 文件到本地并解压到 Grafana 插件目录。命令行下载示例如下：
```bash
-GF_VERSION=3.2.2
+GF_VERSION=3.2.7
# from GitHub
wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
# from Grafana
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index fd2be899eb..7ed9e0c5a0 100644
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
@@ -10,6 +10,11 @@ TDengine 2.x 各版本安装包请访问[这里](https://www.taosdata.com/all-do
import Release from "/components/ReleaseV3";
+## 3.0.1.8
+
+
+
+
## 3.0.1.7
diff --git a/docs/zh/28-releases/02-tools.md b/docs/zh/28-releases/02-tools.md
index 3f73b53fab..67ca3fae67 100644
--- a/docs/zh/28-releases/02-tools.md
+++ b/docs/zh/28-releases/02-tools.md
@@ -10,6 +10,10 @@ taosTools 各版本安装包下载链接如下：
import Release from "/components/ReleaseV3";
+## 2.3.0
+
+
+
## 2.2.9
diff --git a/examples/JDBC/taosdemo/pom.xml b/examples/JDBC/taosdemo/pom.xml
index 724ecc7407..68224bbad5 100644
--- a/examples/JDBC/taosdemo/pom.xml
+++ b/examples/JDBC/taosdemo/pom.xml
@@ -88,7 +88,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
diff --git a/examples/JDBC/taosdemo/readme.md b/examples/JDBC/taosdemo/readme.md
index e5f4eb132b..edac970399 100644
--- a/examples/JDBC/taosdemo/readme.md
+++ b/examples/JDBC/taosdemo/readme.md
@@ -2,12 +2,10 @@
cd tests/examples/JDBC/taosdemo
mvn clean package -Dmaven.test.skip=true
# 先建表，再插入的
-java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host [hostname] -database [database] -doCreateTable true -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
+java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host -database -doCreateTable true -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
# 不建表，直接插入的
-java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host [hostname] -database [database] -doCreateTable false -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
+java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host -database -doCreateTable false -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
```
-需求：
-1. 可以读lowa的配置文件
-2. 支持JDBC-JNI和JDBC-restful
-3. 读取配置文件，持续执行查询
\ No newline at end of file
+如果发生错误 Exception in thread "main" java.lang.UnsatisfiedLinkError: no taos in java.library.path
+请检查是否安装 TDengine 客户端安装包或编译 TDengine 安装。如果确定已经安装过还出现这个错误，可以在命令行 java 后加 -Djava.library.path=/usr/local/lib 来指定寻找共享库的路径。
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 674bdcf171..9c1f2063a7 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -225,13 +225,13 @@ typedef struct SVarColAttr {
// pBlockAgg->numOfNull == info.rows, all data are null
// pBlockAgg->numOfNull == 0, no data are null.
typedef struct SColumnInfoData {
- char* pData; // the corresponding block data in memory
+ char* pData; // the corresponding block data in memory
union {
char* nullbitmap; // bitmap, one bit for each item in the list
SVarColAttr varmeta;
};
- SColumnInfo info; // column info
- bool hasNull; // if current column data has null value.
+ SColumnInfo info; // column info
+ bool hasNull; // if current column data has null value.
} SColumnInfoData;
typedef struct SQueryTableDataCond {
diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 9982a187d7..db6ca65cf0 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -24,11 +24,6 @@
extern "C" {
#endif
-typedef struct SCorEpSet {
- int32_t version;
- SEpSet epSet;
-} SCorEpSet;
-
typedef struct SBlockOrderInfo {
bool nullFirst;
int32_t order;
@@ -36,14 +31,6 @@ typedef struct SBlockOrderInfo {
SColumnInfoData* pColData;
} SBlockOrderInfo;
-int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp);
-void addEpIntoEpSet(SEpSet* pEpSet, const char* fqdn, uint16_t port);
-
-bool isEpsetEqual(const SEpSet* s1, const SEpSet* s2);
-
-void updateEpSet_s(SCorEpSet* pEpSet, SEpSet* pNewEpSet);
-SEpSet getEpSet_s(SCorEpSet* pEpSet);
-
#define NBIT (3u)
#define BitPos(_n) ((_n) & ((1 << NBIT) - 1))
#define BMCharPos(bm_, r_) ((bm_)[(r_) >> NBIT])
diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 2076906f70..0ded2bc4b5 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -44,6 +44,8 @@ extern int32_t tsCompatibleModel;
extern bool tsPrintAuth;
extern int64_t tsTickPerMin[3];
extern int32_t tsCountAlwaysReturnValue;
+extern float tsSelectivityRatio;
+extern int32_t tsTagFilterResCacheSize;
// queue & threads
extern int32_t tsNumOfRpcThreads;
diff --git a/include/common/tmisce.h b/include/common/tmisce.h
new file mode 100644
index 0000000000..b9f5cf5b91
--- /dev/null
+++ b/include/common/tmisce.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * 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 .
+ */
+
+#ifndef TDENGINE_TMISCE_H
+#define TDENGINE_TMISCE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tmsg.h"
+
+typedef struct SCorEpSet {
+ int32_t version;
+ SEpSet epSet;
+} SCorEpSet;
+
+int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp);
+void addEpIntoEpSet(SEpSet* pEpSet, const char* fqdn, uint16_t port);
+
+bool isEpsetEqual(const SEpSet* s1, const SEpSet* s2);
+
+void updateEpSet_s(SCorEpSet* pEpSet, SEpSet* pNewEpSet);
+SEpSet getEpSet_s(SCorEpSet* pEpSet);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TDENGINE_TMISCE_H
diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 29d68aba14..86967bb579 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -649,34 +649,6 @@ int32_t tSerializeSGetUserAuthRsp(void* buf, int32_t bufLen, SGetUserAuthRsp* pR
int32_t tDeserializeSGetUserAuthRsp(void* buf, int32_t bufLen, SGetUserAuthRsp* pRsp);
void tFreeSGetUserAuthRsp(SGetUserAuthRsp* pRsp);
-typedef struct {
- int16_t lowerRelOptr;
- int16_t upperRelOptr;
- int16_t filterstr; // denote if current column is char(binary/nchar)
-
- union {
- struct {
- int64_t lowerBndi;
- int64_t upperBndi;
- };
- struct {
- double lowerBndd;
- double upperBndd;
- };
- struct {
- int64_t pz;
- int64_t len;
- };
- };
-} SColumnFilterInfo;
-
-typedef struct {
- int16_t numOfFilters;
- union {
- int64_t placeholder;
- SColumnFilterInfo* filterInfo;
- };
-} SColumnFilterList;
/*
* for client side struct, only column id, type, bytes are necessary
* But for data in vnode side, we need all the following information.
@@ -687,10 +659,10 @@ typedef struct {
int16_t slotId;
};
- int8_t type;
- int32_t bytes;
uint8_t precision;
uint8_t scale;
+ int32_t bytes;
+ int8_t type;
} SColumnInfo;
typedef struct STimeWindow {
diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index 1fe30a2d66..0bca254e14 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -142,8 +142,11 @@ int32_t qGetQueryTableSchemaVersion(qTaskInfo_t tinfo, char* dbName, char* table
*/
int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds, bool* hasMore, SLocalFetch* pLocal);
+
int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pBlock, uint64_t* useconds);
+void qCleanExecTaskBlockBuf(qTaskInfo_t tinfo);
+
/**
* kill the ongoing query asynchronously
* @param tinfo qhandle
diff --git a/include/libs/function/function.h b/include/libs/function/function.h
index 0831e477ff..13a8370dfd 100644
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -115,7 +115,7 @@ typedef struct SInputColumnInfoData {
int32_t startRowIndex; // handle started row index
int32_t numOfRows; // the number of rows needs to be handled
int32_t numOfInputCols; // PTS is not included
- bool colDataAggIsSet; // if agg is set or not
+ bool colDataSMAIsSet; // if agg is set or not
SColumnInfoData *pPTS; // primary timestamp column
SColumnInfoData **pData;
SColumnDataAgg **pColumnDataAgg;
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index ecd1b6f916..4099551188 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -140,15 +140,40 @@ typedef struct {
int8_t type;
} SStreamCheckpoint;
-typedef struct {
- int8_t type;
-} SStreamTaskDestroy;
-
typedef struct {
int8_t type;
SSDataBlock* pBlock;
} SStreamTrigger;
+typedef struct SStreamQueueNode SStreamQueueNode;
+
+struct SStreamQueueNode {
+ SStreamQueueItem* item;
+ SStreamQueueNode* next;
+};
+
+typedef struct {
+ SStreamQueueNode* head;
+ int64_t size;
+} SStreamQueueRes;
+
+void streamFreeQitem(SStreamQueueItem* data);
+
+bool streamQueueResEmpty(const SStreamQueueRes* pRes);
+int64_t streamQueueResSize(const SStreamQueueRes* pRes);
+SStreamQueueNode* streamQueueResFront(SStreamQueueRes* pRes);
+SStreamQueueNode* streamQueueResPop(SStreamQueueRes* pRes);
+void streamQueueResClear(SStreamQueueRes* pRes);
+SStreamQueueRes streamQueueBuildRes(SStreamQueueNode* pNode);
+
+typedef struct {
+ SStreamQueueNode* pHead;
+} SStreamQueue1;
+
+bool streamQueueHasTask(const SStreamQueue1* pQueue);
+int32_t streamQueuePush(SStreamQueue1* pQueue, SStreamQueueItem* pItem);
+SStreamQueueRes streamQueueGetRes(SStreamQueue1* pQueue);
+
typedef struct {
STaosQueue* queue;
STaosQall* qall;
diff --git a/include/os/os.h b/include/os/os.h
index e780611c41..ab4d0a406e 100644
--- a/include/os/os.h
+++ b/include/os/os.h
@@ -43,6 +43,7 @@ extern "C" {
#include
#include
#include
+#include
#if defined(DARWIN)
#else
@@ -82,6 +83,12 @@ extern "C" {
#include
#include
+#if __AVX__
+#include
+#elif __SSE4_2__
+#include
+#endif
+
#include "osThread.h"
#include "osAtomic.h"
diff --git a/include/os/osDef.h b/include/os/osDef.h
index 297d19e21a..0bf9c6184e 100644
--- a/include/os/osDef.h
+++ b/include/os/osDef.h
@@ -168,22 +168,22 @@ void syslog(int unused, const char *format, ...);
} \
} while (0)
-#define DEFAULT_DOUBLE_COMP(x, y) \
- do { \
- if (isnan(x) && isnan(y)) { \
- return 0; \
- } \
- if (isnan(x)) { \
- return -1; \
- } \
- if (isnan(y)) { \
- return 1; \
- } \
- if ((x) == (y)) { \
- return 0; \
- } else { \
- return (x) < (y) ? -1 : 1; \
- } \
+#define DEFAULT_DOUBLE_COMP(x, y) \
+ do { \
+ if (isnan(x) && isnan(y)) { \
+ return 0; \
+ } \
+ if (isnan(x)) { \
+ return -1; \
+ } \
+ if (isnan(y)) { \
+ return 1; \
+ } \
+ if (fabs((x) - (y)) <= DBL_EPSILON) { \
+ return 0; \
+ } else { \
+ return (x) < (y) ? -1 : 1; \
+ } \
} while (0)
#define DEFAULT_FLOAT_COMP(x, y) DEFAULT_DOUBLE_COMP(x, y)
diff --git a/include/os/osEnv.h b/include/os/osEnv.h
index c1fdc9e404..a3bd209693 100644
--- a/include/os/osEnv.h
+++ b/include/os/osEnv.h
@@ -36,6 +36,11 @@ extern int64_t tsStreamMax;
extern float tsNumOfCores;
extern int64_t tsTotalMemoryKB;
extern char *tsProcPath;
+extern char tsSIMDEnable;
+extern char tsSSE42Enable;
+extern char tsAVXEnable;
+extern char tsAVX2Enable;
+extern char tsFMAEnable;
extern char configDir[];
extern char tsDataDir[];
diff --git a/include/os/osMemory.h b/include/os/osMemory.h
index 14d53a7a06..4681ff6674 100644
--- a/include/os/osMemory.h
+++ b/include/os/osMemory.h
@@ -37,6 +37,7 @@ void taosMemoryFree(void *ptr);
int64_t taosMemorySize(void *ptr);
void taosPrintBackTrace();
void taosMemoryTrim(int32_t size);
+void *taosMemoryMallocAlign(uint32_t alignment, int64_t size);
#define taosMemoryFreeClear(ptr) \
do { \
diff --git a/include/os/osSemaphore.h b/include/os/osSemaphore.h
index e52da96f01..5fc89d9d24 100644
--- a/include/os/osSemaphore.h
+++ b/include/os/osSemaphore.h
@@ -29,7 +29,7 @@ typedef dispatch_semaphore_t tsem_t;
int tsem_init(tsem_t *sem, int pshared, unsigned int value);
int tsem_wait(tsem_t *sem);
-int tsem_timewait(tsem_t *sim, int64_t nanosecs);
+int tsem_timewait(tsem_t *sim, int64_t milis);
int tsem_post(tsem_t *sem);
int tsem_destroy(tsem_t *sem);
@@ -38,7 +38,7 @@ int tsem_destroy(tsem_t *sem);
#define tsem_t sem_t
#define tsem_init sem_init
int tsem_wait(tsem_t *sem);
-int tsem_timewait(tsem_t *sim, int64_t nanosecs);
+int tsem_timewait(tsem_t *sim, int64_t milis);
#define tsem_post sem_post
#define tsem_destroy sem_destroy
diff --git a/include/os/osSysinfo.h b/include/os/osSysinfo.h
index 47cdb02a6f..7765a60f88 100644
--- a/include/os/osSysinfo.h
+++ b/include/os/osSysinfo.h
@@ -40,6 +40,7 @@ int32_t taosGetOsReleaseName(char *releaseName, int32_t maxLen);
int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores);
int32_t taosGetCpuCores(float *numOfCores);
void taosGetCpuUsage(double *cpu_system, double *cpu_engine);
+int32_t taosGetCpuInstructions(char* sse42, char* avx, char* avx2, char* fma);
int32_t taosGetTotalMemory(int64_t *totalKB);
int32_t taosGetProcMemory(int64_t *usedKB);
int32_t taosGetSysMemory(int64_t *usedKB);
diff --git a/include/util/tarray.h b/include/util/tarray.h
index e95568197b..0632db3103 100644
--- a/include/util/tarray.h
+++ b/include/util/tarray.h
@@ -104,6 +104,15 @@ static FORCE_INLINE void* taosArrayPush(SArray* pArray, const void* pData) {
return taosArrayAddBatch(pArray, pData, 1);
}
+/**
+ * @brief reserve the capacity of the array
+ *
+ * @param pArray
+ * @param num
+ * @return void* the start position of the reserved memory
+ */
+void* taosArrayReserve(SArray* pArray, int32_t num);
+
/**
*
* @param pArray
diff --git a/include/util/tlist.h b/include/util/tlist.h
index 1954bda145..3dbdb72f9e 100644
--- a/include/util/tlist.h
+++ b/include/util/tlist.h
@@ -225,7 +225,7 @@ void *tdListFree(SList *list);
void tdListPrependNode(SList *list, SListNode *node);
void tdListAppendNode(SList *list, SListNode *node);
int32_t tdListPrepend(SList *list, void *data);
-int32_t tdListAppend(SList *list, void *data);
+int32_t tdListAppend(SList *list, const void *data);
SListNode *tdListPopHead(SList *list);
SListNode *tdListPopTail(SList *list);
SListNode *tdListGetHead(SList *list);
diff --git a/include/util/tpagedbuf.h b/include/util/tpagedbuf.h
index 5f81ccfcfd..73af65997d 100644
--- a/include/util/tpagedbuf.h
+++ b/include/util/tpagedbuf.h
@@ -24,12 +24,9 @@
extern "C" {
#endif
-typedef struct SArray* SIDList;
typedef struct SPageInfo SPageInfo;
typedef struct SDiskbasedBuf SDiskbasedBuf;
-#define DEFAULT_INTERN_BUF_PAGE_SIZE (1024LL) // in bytes
-
typedef struct SFilePage {
int32_t num;
char data[];
@@ -69,7 +66,7 @@ void* getNewBufPage(SDiskbasedBuf* pBuf, int32_t* pageId);
* @param pBuf
* @return
*/
-SIDList getDataBufPagesIdList(SDiskbasedBuf* pBuf);
+SArray* getDataBufPagesIdList(SDiskbasedBuf* pBuf);
/**
* get the specified buffer page by id
@@ -111,7 +108,7 @@ void destroyDiskbasedBuf(SDiskbasedBuf* pBuf);
* @param pList
* @return
*/
-SPageInfo* getLastPageInfo(SIDList pList);
+SPageInfo* getLastPageInfo(SArray* pList);
/**
*
diff --git a/packaging/docker/DockerfileCloud b/packaging/docker/DockerfileCloud
index 21e387bab3..fa8fcabf34 100644
--- a/packaging/docker/DockerfileCloud
+++ b/packaging/docker/DockerfileCloud
@@ -12,6 +12,7 @@ RUN apt install -y curl
COPY ${pkgFile} /root/
ENV TINI_VERSION v0.19.0
+ENV TAOS_DISABLE_ADAPTER 1
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${cpuType} /tini
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /root/
@@ -26,4 +27,4 @@ COPY ./bin/* /usr/bin/
ENTRYPOINT ["/tini", "--", "/usr/bin/entrypoint.sh"]
CMD ["bash", "-c", "/usr/bin/run.sh"]
-VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]
+VOLUME [ "/var/lib/taos", "/var/log/taos" ]
diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh
deleted file mode 100755
index 3654beadcb..0000000000
--- a/packaging/docker/run.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/bash
-
-TAOS_RUN_TAOSBENCHMARK_TEST_ONCE=0
-#ADMIN_URL=${ADMIN_URL:-http://172.26.10.84:10001}
-TAOSD_STARTUP_TIMEOUT_SECOND=${TAOSD_STARTUP_TIMEOUT_SECOND:-160}
-TAOS_TIMEOUT_SECOND=${TAOS_TIMEOUT_SECOND:-5}
-BACKUP_CORE_FOLDER=/var/log/corefile
-ALERT_URL=app/system/alert/add
-
-echo "ADMIN_URL: ${ADMIN_URL}"
-echo "TAOS_TIMEOUT_SECOND: ${TAOS_TIMEOUT_SECOND}"
-
-function set_service_state() {
- #echo "set service state: $1, $2"
- service_state="$1"
- service_msg="$2"
-}
-set_service_state "init" "ok"
-app_name=`hostname |cut -d\- -f1`
-
-function check_taosd() {
- timeout $TAOS_TIMEOUT_SECOND taos -s "show databases;" >/dev/null
- local ret=$?
- if [ $ret -ne 0 ]; then
- echo "`date` check taosd error $ret"
- if [ "x$1" != "xignore" ]; then
- set_service_state "error" "taos check failed $ret"
- fi
- else
- set_service_state "ready" "ok"
- fi
-}
-function post_error_msg() {
- if [ ! -z "${ADMIN_URL}" ]; then
- taos_version=`taos --version`
- echo "app_name: ${app_name}"
- echo "service_state: ${service_state}"
- echo "`date` service_msg: ${service_msg}"
- echo "${taos_version}"
- curl --connect-timeout 10 --max-time 20 -X POST -H "Content-Type: application/json" \
- -d"{\"appName\":\"${app_name}\",\
- \"alertLevel\":\"${service_state}\",\
- \"taosVersion\":\"${taos_version}\",\
- \"alertMsg\":\"${service_msg}\"}" \
- ${ADMIN_URL}/${ALERT_URL}
- fi
-}
-function check_taosd_exit_type() {
- local core_pattern=`cat /proc/sys/kernel/core_pattern`
- echo "$core_pattern" | grep -q "^/"
- if [ $? -eq 0 ]; then
- core_folder=`dirname $core_pattern`
- core_prefix=`basename $core_pattern | sed "s/%.*//"`
- else
- core_folder=`pwd`
- core_prefix="$core_pattern"
- fi
- local core_files=`ls $core_folder | grep "^${core_prefix}"`
- if [ ! -z "$core_files" ]; then
- # move core files to another folder
- mkdir -p ${BACKUP_CORE_FOLDER}
- cp ${core_folder}/${core_prefix}* ${BACKUP_CORE_FOLDER}/
- rm -f ${core_folder}/${core_prefix}*
- set_service_state "error" "taosd exit with core file"
- else
- set_service_state "error" "taosd exit without core file"
- fi
-}
-disk_usage_level=(60 80 99)
-current_disk_level=0
-disk_state="ok"
-disk_msg="ok"
-get_usage_ok="yes"
-function post_disk_error_msg() {
- if [ ! -z "${ADMIN_URL}" ]; then
- taos_version=`taos --version`
- echo "app_name: ${app_name}"
- echo "disk_state: ${disk_state}"
- echo "`date` disk_msg: ${disk_msg}"
- echo "${taos_version}"
- curl --connect-timeout 10 --max-time 20 -X POST -H "Content-Type: application/json" \
- -d"{\"appName\":\"${app_name}\",\
- \"alertLevel\":\"${disk_state}\",\
- \"taosVersion\":\"${taos_version}\",\
- \"alertMsg\":\"${disk_msg}\"}" \
- ${ADMIN_URL}/${ALERT_URL}
- fi
-}
-function check_disk() {
- local folder=`cat /etc/taos/taos.cfg|grep -v "^#"|grep dataDir|awk '{print $NF}'`
- if [ -z "$folder" ]; then
- folder="/var/lib/taos"
- fi
- local mount_point="$folder"
- local usage=""
- while [ -z "$usage" ]; do
- usage=`df -h|grep -w "${mount_point}"|awk '{print $5}'|grep -v Use|sed "s/%$//"`
- if [ "x${mount_point}" = "x/" ]; then
- break
- fi
- mount_point=`dirname ${mount_point}`
- done
- if [ -z "$usage" ]; then
- disk_state="error"
- disk_msg="cannot get disk usage"
- if [ "$get_usage_ok" = "yes" ]; then
- post_disk_error_msg
- get_usage_ok="no"
- fi
- else
- get_usage_ok="yes"
- local current_level=0
- for level in ${disk_usage_level[*]}; do
- if [ ${usage} -ge ${level} ]; then
- disk_state="error"
- disk_msg="disk usage over ${level}%"
- current_level=${level}
- fi
- done
- if [ ${current_level} -gt ${current_disk_level} ]; then
- post_disk_error_msg
- elif [ ${current_level} -lt ${current_disk_level} ]; then
- echo "disk usage reduced from ${current_disk_level} to ${current_level}"
- fi
- current_disk_level=${current_level}
- fi
-}
-function run_taosd() {
- taosd
- set_service_state "error" "taosd exit"
- # post error msg
- # check crash or OOM
- check_taosd_exit_type
- post_error_msg
-}
-function print_service_state_change() {
- if [ "x$1" != "x${service_state}" ]; then
- echo "`date` service state: ${service_state}, ${service_msg}"
- fi
-}
-taosd_start_time=`date +%s`
-while ((1))
-do
- check_disk
- # echo "outer loop: $a"
- output=`timeout $TAOS_TIMEOUT_SECOND taos -k`
- if [ -z "${output}" ]; then
- echo "`date` taos -k error"
- status=""
- else
- status=${output:0:1}
- fi
- # echo $output
- # echo $status
- if [ "$status"x = "0"x ]
- then
- # taosd_start_time=`date +%s`
- run_taosd &
- fi
- # echo "$status"x "$TAOS_RUN_TAOSBENCHMARK_TEST"x "$TAOS_RUN_TAOSBENCHMARK_TEST_ONCE"x
- if [ "$status"x = "2"x ] && [ "$TAOS_RUN_TAOSBENCHMARK_TEST"x = "1"x ] && [ "$TAOS_RUN_TAOSBENCHMARK_TEST_ONCE"x = "0"x ]
- then
- TAOS_RUN_TAOSBENCHMARK_TEST_ONCE=1
- # result=`taos -s "show databases;" | grep " test "`
- # if [ "${result:0:5}"x != " test"x ]
- # then
- # taosBenchmark -y -t 1000 -n 1000 -S 900000
- # fi
- taos -s "select stable_name from information_schema.ins_stables where db_name = 'test';"|grep -q -w meters
- if [ $? -ne 0 ]; then
- taosBenchmark -y -t 1000 -n 1000 -S 900000
- taos -s "create user admin_user pass 'NDS65R6t' sysinfo 0;"
- taos -s "GRANT ALL on test.* to admin_user;"
- fi
- fi
- # check taosd status
- if [ "$service_state" = "ready" ]; then
- # check taosd status
- check_taosd
- print_service_state_change "ready"
- if [ "$service_state" = "error" ]; then
- post_error_msg
- fi
- elif [ "$service_state" = "init" ]; then
- check_taosd "ignore"
- # check timeout
- current_time=`date +%s`
- time_elapsed=$(( current_time - taosd_start_time ))
- if [ ${time_elapsed} -gt ${TAOSD_STARTUP_TIMEOUT_SECOND} ]; then
- set_service_state "error" "taosd startup timeout"
- post_error_msg
- fi
- print_service_state_change "init"
- elif [ "$service_state" = "error" ]; then
- # check taosd status
- check_taosd
- print_service_state_change "error"
- fi
- # check taosadapter
- nc -z localhost 6041
- if [ $? -ne 0 ]; then
- taosadapter &
- fi
- sleep 10
-done
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index e569a97723..aae20c587d 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -26,7 +26,7 @@ extern "C" {
#include "query.h"
#include "taos.h"
#include "tcommon.h"
-#include "tdatablock.h"
+#include "tmisce.h"
#include "tdef.h"
#include "thash.h"
#include "tlist.h"
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 0f881beb66..6bdc835217 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -69,7 +69,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
} else {
SDBVgInfo *vgInfo = taosMemoryCalloc(1, sizeof(SDBVgInfo));
if (NULL == vgInfo) {
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+ goto _return;
}
vgInfo->vgVersion = rsp->vgVersion;
@@ -81,7 +82,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
if (NULL == vgInfo->vgHash) {
taosMemoryFree(vgInfo);
tscError("hash init[%d] failed", rsp->vgNum);
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+ goto _return;
}
for (int32_t j = 0; j < rsp->vgNum; ++j) {
@@ -90,7 +92,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
tscError("hash push failed, errno:%d", errno);
taosHashCleanup(vgInfo->vgHash);
taosMemoryFree(vgInfo);
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+ goto _return;
}
}
@@ -98,12 +101,14 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
}
if (code) {
- return code;
+ goto _return;
}
}
+_return:
+
tFreeSUseDbBatchRsp(&batchUseRsp);
- return TSDB_CODE_SUCCESS;
+ return code;
}
static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) {
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 423cfcdc5b..976d1dd1b0 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -20,13 +20,13 @@
#include "functionMgt.h"
#include "os.h"
#include "query.h"
-#include "qworker.h"
#include "scheduler.h"
#include "tglobal.h"
#include "tmsg.h"
#include "tref.h"
#include "trpc.h"
#include "version.h"
+#include "tdatablock.h"
#define TSC_VAR_NOT_RELEASE 1
#define TSC_VAR_RELEASED 0
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 8437c93bae..4bd74a842f 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -20,6 +20,8 @@
#include "query.h"
#include "tdef.h"
#include "tname.h"
+#include "tdatablock.h"
+#include "systable.h"
static void setErrno(SRequestObj* pRequest, int32_t code) {
pRequest->code = code;
@@ -47,8 +49,6 @@ int32_t genericRspCallback(void* param, SDataBuf* pMsg, int32_t code) {
int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
SRequestObj *pRequest = acquireRequest(*(int64_t*)param);
if (NULL == pRequest) {
- setErrno(pRequest, TSDB_CODE_TSC_DISCONNECTED);
- tsem_post(&pRequest->body.rspSem);
goto End;
}
@@ -326,6 +326,17 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
int32_t code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
if (TSDB_CODE_SUCCESS == code) {
catalogRemoveDB(pCatalog, dropdbRsp.db, dropdbRsp.uid);
+ STscObj* pTscObj = pRequest->pTscObj;
+
+ SRequestConnInfo conn = {.pTrans = pTscObj->pAppInfo->pTransporter,
+ .requestId = pRequest->requestId,
+ .requestObjRefId = pRequest->self,
+ .mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)};
+ char dbFName[TSDB_DB_FNAME_LEN];
+ snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB);
+ catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
+ snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB);
+ catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
}
}
diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index 4cd1b5416c..83bbe392cf 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -179,6 +179,8 @@ typedef struct {
SSmlMsgBuf msgBuf;
SHashObj *dumplicateKey; // for dumplicate key
SArray *colsContainer; // for cols parse, if dataFormat == false
+
+ cJSON *root; // for parse json
} SSmlHandle;
//=================================================================================================
@@ -1317,10 +1319,6 @@ static void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag) {
SArray *kvArray = (SArray *)taosArrayGetP(tag->cols, i);
for (int j = 0; j < taosArrayGetSize(kvArray); ++j) {
SSmlKv *p = (SSmlKv *)taosArrayGetP(kvArray, j);
- if (info->protocol == TSDB_SML_JSON_PROTOCOL &&
- (p->type == TSDB_DATA_TYPE_NCHAR || p->type == TSDB_DATA_TYPE_BINARY)) {
- taosMemoryFree((void *)p->value);
- }
taosMemoryFree(p);
}
taosArrayDestroy(kvArray);
@@ -1338,17 +1336,8 @@ static void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag) {
}
for (size_t i = 0; i < taosArrayGetSize(tag->tags); i++) {
SSmlKv *p = (SSmlKv *)taosArrayGetP(tag->tags, i);
- if (info->protocol == TSDB_SML_JSON_PROTOCOL) {
- taosMemoryFree((void *)p->key);
- if (p->type == TSDB_DATA_TYPE_NCHAR || p->type == TSDB_DATA_TYPE_BINARY) {
- taosMemoryFree((void *)p->value);
- }
- }
taosMemoryFree(p);
}
- if (info->protocol == TSDB_SML_JSON_PROTOCOL && tag->sTableName) {
- taosMemoryFree((void *)tag->sTableName);
- }
taosArrayDestroy(tag->cols);
taosArrayDestroy(tag->tags);
taosMemoryFree(tag);
@@ -1508,6 +1497,8 @@ static void smlDestroyInfo(SSmlHandle *info) {
taosArrayDestroy(info->colsContainer);
}
destroyRequest(info->pRequest);
+
+ cJSON_Delete(info->root);
taosMemoryFreeClear(info);
}
@@ -1583,16 +1574,6 @@ cleanup:
}
/************* TSDB_SML_JSON_PROTOCOL function start **************/
-static int32_t smlJsonCreateSring(const char **output, char *input, int32_t inputLen) {
- *output = (const char *)taosMemoryCalloc(1, inputLen);
- if (*output == NULL) {
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
- }
-
- memcpy((void *)(*output), input, inputLen);
- return TSDB_CODE_SUCCESS;
-}
-
static int32_t smlParseMetricFromJSON(SSmlHandle *info, cJSON *root, SSmlTableInfo *tinfo) {
cJSON *metric = cJSON_GetObjectItem(root, "metric");
if (!cJSON_IsString(metric)) {
@@ -1605,7 +1586,8 @@ static int32_t smlParseMetricFromJSON(SSmlHandle *info, cJSON *root, SSmlTableIn
return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
}
- return smlJsonCreateSring(&tinfo->sTableName, metric->valuestring, tinfo->sTableNameLen);
+ tinfo->sTableName = metric->valuestring;
+ return TSDB_CODE_SUCCESS;
}
static int32_t smlParseTSFromJSONObj(SSmlHandle *info, cJSON *root, int64_t *tsVal) {
@@ -1857,7 +1839,8 @@ static int32_t smlConvertJSONString(SSmlKv *pVal, char *typeStr, cJSON *value) {
return TSDB_CODE_PAR_INVALID_VAR_COLUMN_LEN;
}
- return smlJsonCreateSring(&pVal->value, value->valuestring, pVal->length);
+ pVal->value = value->valuestring;
+ return TSDB_CODE_SUCCESS;
}
static int32_t smlParseValueFromJSONObj(cJSON *root, SSmlKv *kv) {
@@ -2015,10 +1998,8 @@ static int32_t smlParseTagsFromJSON(cJSON *root, SArray *pKVs, char *childTableN
// key
kv->keyLen = keyLen;
- ret = smlJsonCreateSring(&kv->key, tag->string, kv->keyLen);
- if (ret != TSDB_CODE_SUCCESS) {
- return ret;
- }
+ kv->key = tag->string;
+
// value
ret = smlParseValueFromJSON(tag, kv);
if (ret != TSDB_CODE_SUCCESS) {
@@ -2278,16 +2259,16 @@ static int32_t smlParseJSON(SSmlHandle *info, char *payload) {
return TSDB_CODE_TSC_INVALID_JSON;
}
- cJSON *root = cJSON_Parse(payload);
- if (root == NULL) {
+ info->root = cJSON_Parse(payload);
+ if (info->root == NULL) {
uError("SML:0x%" PRIx64 " parse json failed:%s", info->id, payload);
return TSDB_CODE_TSC_INVALID_JSON;
}
// multiple data points must be sent in JSON array
- if (cJSON_IsObject(root)) {
+ if (cJSON_IsObject(info->root)) {
payloadNum = 1;
- } else if (cJSON_IsArray(root)) {
- payloadNum = cJSON_GetArraySize(root);
+ } else if (cJSON_IsArray(info->root)) {
+ payloadNum = cJSON_GetArraySize(info->root);
} else {
uError("SML:0x%" PRIx64 " Invalid JSON Payload", info->id);
ret = TSDB_CODE_TSC_INVALID_JSON;
@@ -2295,7 +2276,7 @@ static int32_t smlParseJSON(SSmlHandle *info, char *payload) {
}
for (int32_t i = 0; i < payloadNum; ++i) {
- cJSON *dataPoint = (payloadNum == 1 && cJSON_IsObject(root)) ? root : cJSON_GetArrayItem(root, i);
+ cJSON *dataPoint = (payloadNum == 1 && cJSON_IsObject(info->root)) ? info->root : cJSON_GetArrayItem(info->root, i);
ret = smlParseTelnetLine(info, dataPoint, -1);
if (ret != TSDB_CODE_SUCCESS) {
uError("SML:0x%" PRIx64 " Invalid JSON Payload", info->id);
@@ -2304,7 +2285,6 @@ static int32_t smlParseJSON(SSmlHandle *info, char *payload) {
}
end:
- cJSON_Delete(root);
return ret;
}
diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index 1dd3174c29..ade0c95227 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -25,6 +25,13 @@
#include "tref.h"
#include "ttimer.h"
+#if 0
+#undef tsem_post
+#define tsem_post(x) \
+ tscInfo("call sem post at %s %d", __FUNCTION__, __LINE__); \
+ sem_post(x)
+#endif
+
int32_t tmqAskEp(tmq_t* tmq, bool async);
typedef struct {
@@ -733,12 +740,12 @@ void tmqSendHbReq(void* param, void* tmrId) {
req.consumerId = tmq->consumerId;
req.epoch = tmq->epoch;
- int32_t tlen = tSerializeSMqHbReq(NULL, 0, &req);
+ int32_t tlen = tSerializeSMqHbReq(NULL, 0, &req);
if (tlen < 0) {
tscError("tSerializeSMqHbReq failed");
return;
}
- void *pReq = taosMemoryCalloc(1, tlen);
+ void* pReq = taosMemoryCalloc(1, tlen);
if (tlen < 0) {
tscError("failed to malloc MqHbReq msg, size:%d", tlen);
return;
@@ -1397,12 +1404,12 @@ int32_t tmqAskEp(tmq_t* tmq, bool async) {
req.epoch = tmq->epoch;
strcpy(req.cgroup, tmq->groupId);
- int32_t tlen = tSerializeSMqAskEpReq(NULL, 0, &req);
+ int32_t tlen = tSerializeSMqAskEpReq(NULL, 0, &req);
if (tlen < 0) {
tscError("tSerializeSMqAskEpReq failed");
return -1;
}
- void *pReq = taosMemoryCalloc(1, tlen);
+ void* pReq = taosMemoryCalloc(1, tlen);
if (tlen < 0) {
tscError("failed to malloc askEpReq msg, size:%d", tlen);
return -1;
@@ -1461,7 +1468,7 @@ int32_t tmqAskEp(tmq_t* tmq, bool async) {
return code;
}
-void tmqBuildConsumeReqImpl(SMqPollReq *pReq, tmq_t* tmq, int64_t timeout, SMqClientTopic* pTopic, SMqClientVg* pVg) {
+void tmqBuildConsumeReqImpl(SMqPollReq* pReq, tmq_t* tmq, int64_t timeout, SMqClientTopic* pTopic, SMqClientVg* pVg) {
/*strcpy(pReq->topic, pTopic->topicName);*/
/*strcpy(pReq->cgroup, tmq->groupId);*/
@@ -1561,20 +1568,20 @@ int32_t tmqPollImpl(tmq_t* tmq, int64_t timeout) {
tsem_post(&tmq->rspSem);
return -1;
}
- char *msg = taosMemoryCalloc(1, msgSize);
+ char* msg = taosMemoryCalloc(1, msgSize);
if (NULL == msg) {
atomic_store_32(&pVg->vgStatus, TMQ_VG_STATUS__IDLE);
tsem_post(&tmq->rspSem);
return -1;
}
-
+
if (tSerializeSMqPollReq(msg, msgSize, &req) < 0) {
taosMemoryFree(msg);
atomic_store_32(&pVg->vgStatus, TMQ_VG_STATUS__IDLE);
tsem_post(&tmq->rspSem);
return -1;
}
-
+
SMqPollCbParam* pParam = taosMemoryMalloc(sizeof(SMqPollCbParam));
if (pParam == NULL) {
taosMemoryFree(msg);
@@ -1797,17 +1804,20 @@ TAOS_RES* tmq_consumer_poll(tmq_t* tmq, int64_t timeout) {
return NULL;
}
if (timeout != -1) {
- int64_t endTime = taosGetTimestampMs();
- int64_t leftTime = endTime - startTime;
- if (leftTime > timeout) {
- tscDebug("consumer:%" PRId64 ", (epoch %d) timeout, no rsp, start time %" PRId64 ", end time %" PRId64,
- tmq->consumerId, tmq->epoch, startTime, endTime);
+ int64_t currentTime = taosGetTimestampMs();
+ int64_t passedTime = currentTime - startTime;
+ if (passedTime > timeout) {
+ tscDebug("consumer:%" PRId64 ", (epoch %d) timeout, no rsp, start time %" PRId64 ", current time %" PRId64,
+ tmq->consumerId, tmq->epoch, startTime, currentTime);
return NULL;
}
- tsem_timewait(&tmq->rspSem, leftTime * 1000);
+ /*tscInfo("consumer:%" PRId64 ", (epoch %d) wait, start time %" PRId64 ", current time %" PRId64*/
+ /*", left time %" PRId64,*/
+ /*tmq->consumerId, tmq->epoch, startTime, currentTime, (timeout - passedTime));*/
+ tsem_timewait(&tmq->rspSem, (timeout - passedTime));
} else {
// use tsem_timewait instead of tsem_wait to avoid unexpected stuck
- tsem_timewait(&tmq->rspSem, 500 * 1000);
+ tsem_timewait(&tmq->rspSem, 1000);
}
}
}
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 3021c586a3..cfa2964e16 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -19,6 +19,8 @@
#include "tlog.h"
#include "tname.h"
+#define MALLOC_ALIGN_BYTES 32
+
int32_t colDataGetLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRows) {
ASSERT(pColumnInfoData != NULL);
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
@@ -509,8 +511,12 @@ SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int3
isNull = colDataIsNull(pColData, pBlock->info.rows, j, pBlock->pBlockAgg[i]);
}
- char* p = colDataGetData(pColData, j);
- colDataAppend(pDstCol, j - startIndex, p, isNull);
+ if (isNull) {
+ colDataAppendNULL(pDstCol, j - startIndex);
+ } else {
+ char* p = colDataGetData(pColData, j);
+ colDataAppend(pDstCol, j - startIndex, p, false);
+ }
}
}
@@ -807,7 +813,9 @@ static int32_t blockDataAssign(SColumnInfoData* pCols, const SSDataBlock* pDataB
SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, i);
if (IS_VAR_DATA_TYPE(pSrc->info.type)) {
- memcpy(pDst->pData, pSrc->pData, pSrc->varmeta.length);
+ if (pSrc->varmeta.length != 0) {
+ memcpy(pDst->pData, pSrc->pData, pSrc->varmeta.length);
+ }
pDst->varmeta.length = pSrc->varmeta.length;
for (int32_t j = 0; j < pDataBlock->info.rows; ++j) {
@@ -1168,6 +1176,7 @@ static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo*
pColumn->varmeta.offset = (int32_t*)tmp;
memset(&pColumn->varmeta.offset[existedRows], 0, sizeof(int32_t) * (numOfRows - existedRows));
} else {
+ // prepare for the null bitmap
char* tmp = taosMemoryRealloc(pColumn->nullbitmap, BitmapLen(numOfRows));
if (tmp == NULL) {
return TSDB_CODE_OUT_OF_MEMORY;
@@ -1178,11 +1187,19 @@ static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo*
memset(&pColumn->nullbitmap[oldLen], 0, BitmapLen(numOfRows) - oldLen);
ASSERT(pColumn->info.bytes);
- tmp = taosMemoryRealloc(pColumn->pData, numOfRows * pColumn->info.bytes);
+
+ // make sure the allocated memory is MALLOC_ALIGN_BYTES aligned
+ tmp = taosMemoryMallocAlign(MALLOC_ALIGN_BYTES, numOfRows * pColumn->info.bytes);
if (tmp == NULL) {
return TSDB_CODE_OUT_OF_MEMORY;
}
+ // copy back the existed data
+ if (pColumn->pData != NULL) {
+ memcpy(tmp, pColumn->pData, existedRows * pColumn->info.bytes);
+ taosMemoryFreeClear(pColumn->pData);
+ }
+
pColumn->pData = tmp;
if (clearPayload) {
memset(tmp + pColumn->info.bytes * existedRows, 0, pColumn->info.bytes * (numOfRows - existedRows));
@@ -1305,12 +1322,9 @@ int32_t copyDataBlock(SSDataBlock* dst, const SSDataBlock* src) {
for (int32_t i = 0; i < numOfCols; ++i) {
SColumnInfoData* pDst = taosArrayGet(dst->pDataBlock, i);
SColumnInfoData* pSrc = taosArrayGet(src->pDataBlock, i);
- if (pSrc->pData == NULL) {
- continue;
- }
-
colDataAssign(pDst, pSrc, src->info.rows, &src->info);
}
+
uint32_t cap = dst->info.capacity;
dst->info = src->info;
dst->info.capacity = cap;
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index f2d8b9aa7c..2e3389fb62 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -15,9 +15,8 @@
#define _DEFAULT_SOURCE
#include "tglobal.h"
-#include "tcompare.h"
#include "tconfig.h"
-#include "tdatablock.h"
+#include "tmisce.h"
#include "tgrant.h"
#include "tlog.h"
@@ -120,6 +119,9 @@ int32_t tsMinIntervalTime = 1;
// maximum memory allowed to be allocated for a single csv load (in MB)
int32_t tsMaxMemUsedByInsert = 1024;
+float tsSelectivityRatio = 1.0;
+int32_t tsTagFilterResCacheSize = 1024*10;
+
// the maximum allowed query buffer size during query processing for each data node.
// -1 no limit (default)
// 0 no query allowed, queries are disabled
@@ -318,7 +320,14 @@ static int32_t taosAddSystemCfg(SConfig *pCfg) {
if (cfgAddLocale(pCfg, "locale", tsLocale) != 0) return -1;
if (cfgAddCharset(pCfg, "charset", tsCharset) != 0) return -1;
if (cfgAddBool(pCfg, "enableCoreFile", 1, 1) != 0) return -1;
- if (cfgAddFloat(pCfg, "numOfCores", tsNumOfCores, 0, 100000, 1) != 0) return -1;
+ if (cfgAddFloat(pCfg, "numOfCores", tsNumOfCores, 1, 100000, 1) != 0) return -1;
+
+ if (cfgAddBool(pCfg, "SSE42", tsSSE42Enable, 0) != 0) return -1;
+ if (cfgAddBool(pCfg, "AVX", tsAVXEnable, 0) != 0) return -1;
+ if (cfgAddBool(pCfg, "AVX2", tsAVX2Enable, 0) != 0) return -1;
+ if (cfgAddBool(pCfg, "FMA", tsFMAEnable, 0) != 0) return -1;
+ if (cfgAddBool(pCfg, "SIMD-Supported", tsSIMDEnable, 0) != 0) return -1;
+
if (cfgAddInt64(pCfg, "openMax", tsOpenMax, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddInt64(pCfg, "streamMax", tsStreamMax, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddInt32(pCfg, "pageSizeKB", tsPageSizeKB, 0, INT64_MAX, 1) != 0) return -1;
diff --git a/source/common/src/tmisce.c b/source/common/src/tmisce.c
index dfaebc99f6..dfb1917fcf 100644
--- a/source/common/src/tmisce.c
+++ b/source/common/src/tmisce.c
@@ -14,7 +14,7 @@
*/
#define _DEFAULT_SOURCE
-#include "tdatablock.h"
+#include "tmisce.h"
#include "tglobal.h"
#include "tlog.h"
#include "tname.h"
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 7575554bcf..cd97ceaae1 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -2537,24 +2537,22 @@ int32_t tDeserializeSUseDbRspImp(SDecoder *pDecoder, SUseDbRsp *pRsp) {
if (tDecodeI16(pDecoder, &pRsp->hashSuffix) < 0) return -1;
if (tDecodeI8(pDecoder, &pRsp->hashMethod) < 0) return -1;
- if (pRsp->vgNum <= 0) {
- return 0;
- }
+ if (pRsp->vgNum > 0) {
+ pRsp->pVgroupInfos = taosArrayInit(pRsp->vgNum, sizeof(SVgroupInfo));
+ if (pRsp->pVgroupInfos == NULL) {
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ return -1;
+ }
- pRsp->pVgroupInfos = taosArrayInit(pRsp->vgNum, sizeof(SVgroupInfo));
- if (pRsp->pVgroupInfos == NULL) {
- terrno = TSDB_CODE_OUT_OF_MEMORY;
- return -1;
- }
-
- for (int32_t i = 0; i < pRsp->vgNum; ++i) {
- SVgroupInfo vgInfo = {0};
- if (tDecodeI32(pDecoder, &vgInfo.vgId) < 0) return -1;
- if (tDecodeU32(pDecoder, &vgInfo.hashBegin) < 0) return -1;
- if (tDecodeU32(pDecoder, &vgInfo.hashEnd) < 0) return -1;
- if (tDecodeSEpSet(pDecoder, &vgInfo.epSet) < 0) return -1;
- if (tDecodeI32(pDecoder, &vgInfo.numOfTable) < 0) return -1;
- taosArrayPush(pRsp->pVgroupInfos, &vgInfo);
+ for (int32_t i = 0; i < pRsp->vgNum; ++i) {
+ SVgroupInfo vgInfo = {0};
+ if (tDecodeI32(pDecoder, &vgInfo.vgId) < 0) return -1;
+ if (tDecodeU32(pDecoder, &vgInfo.hashBegin) < 0) return -1;
+ if (tDecodeU32(pDecoder, &vgInfo.hashEnd) < 0) return -1;
+ if (tDecodeSEpSet(pDecoder, &vgInfo.epSet) < 0) return -1;
+ if (tDecodeI32(pDecoder, &vgInfo.numOfTable) < 0) return -1;
+ taosArrayPush(pRsp->pVgroupInfos, &vgInfo);
+ }
}
if (tDecodeI32(pDecoder, &pRsp->errCode) < 0) return -1;
diff --git a/source/common/src/tname.c b/source/common/src/tname.c
index 4d83b6e3d8..0d47ef1e7f 100644
--- a/source/common/src/tname.c
+++ b/source/common/src/tname.c
@@ -316,6 +316,7 @@ static int compareKv(const void* p1, const void* p2) {
void buildChildTableName(RandTableName* rName) {
SStringBuilder sb = {0};
taosStringBuilderAppendStringLen(&sb, rName->stbFullName, rName->stbFullNameLen);
+ if(sb.buf == NULL) return;
taosArraySort(rName->tags, compareKv);
for (int j = 0; j < taosArrayGetSize(rName->tags); ++j) {
taosStringBuilderAppendChar(&sb, ',');
diff --git a/source/dnode/mgmt/node_util/src/dmEps.c b/source/dnode/mgmt/node_util/src/dmEps.c
index 7fe7d44827..4bc2e64fad 100644
--- a/source/dnode/mgmt/node_util/src/dmEps.c
+++ b/source/dnode/mgmt/node_util/src/dmEps.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "dmUtil.h"
+#include "tmisce.h"
static void dmPrintEps(SDnodeData *pData);
static bool dmIsEpChanged(SDnodeData *pData, int32_t dnodeId, const char *ep);
diff --git a/source/dnode/mgmt/test/sut/src/client.cpp b/source/dnode/mgmt/test/sut/src/client.cpp
index 6b4c23c0de..a27a511651 100644
--- a/source/dnode/mgmt/test/sut/src/client.cpp
+++ b/source/dnode/mgmt/test/sut/src/client.cpp
@@ -15,6 +15,7 @@
#include "sut.h"
#include "tdatablock.h"
+#include "tmisce.h"
static void processClientRsp(void* parent, SRpcMsg* pRsp, SEpSet* pEpSet) {
TestClient* client = (TestClient*)parent;
diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c
index 300251d64d..58f8172282 100644
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
@@ -324,15 +324,15 @@ static int32_t mndProcessMqTimerMsg(SRpcMsg *pMsg) {
}
static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
- SMnode *pMnode = pMsg->info.node;
- SMqHbReq req = {0};
+ SMnode *pMnode = pMsg->info.node;
+ SMqHbReq req = {0};
if (tDeserializeSMqHbReq(pMsg->pCont, pMsg->contLen, &req) < 0) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
- int64_t consumerId = req.consumerId;
+ int64_t consumerId = req.consumerId;
SMqConsumerObj *pConsumer = mndAcquireConsumer(pMnode, consumerId);
if (pConsumer == NULL) {
mError("consumer %" PRId64 " not exist", consumerId);
@@ -363,17 +363,17 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
}
static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
- SMnode *pMnode = pMsg->info.node;
- SMqAskEpReq req = {0};
- SMqAskEpRsp rsp = {0};
+ SMnode *pMnode = pMsg->info.node;
+ SMqAskEpReq req = {0};
+ SMqAskEpRsp rsp = {0};
if (tDeserializeSMqAskEpReq(pMsg->pCont, pMsg->contLen, &req) < 0) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
- int64_t consumerId = req.consumerId;
- int32_t epoch = req.epoch;
+ int64_t consumerId = req.consumerId;
+ int32_t epoch = req.epoch;
SMqConsumerObj *pConsumer = mndAcquireConsumer(pMnode, consumerId);
if (pConsumer == NULL) {
@@ -457,6 +457,8 @@ static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
if (topicEp.vgs == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
taosRUnLockLatch(&pConsumer->lock);
+ taosRUnLockLatch(&pSub->lock);
+ mndReleaseSubscribe(pMnode, pSub);
goto FAIL;
}
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 521f924fad..2a3ecf1924 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -24,6 +24,7 @@
#include "mndTrans.h"
#include "mndUser.h"
#include "mndVgroup.h"
+#include "tmisce.h"
#define TSDB_DNODE_VER_NUMBER 1
#define TSDB_DNODE_RESERVE_SIZE 64
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index 563b3cd3cf..b02ca4c773 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -20,7 +20,7 @@
#include "mndShow.h"
#include "mndSync.h"
#include "mndTrans.h"
-#include "mndUser.h"
+#include "tmisce.h"
#define MNODE_VER_NUMBER 1
#define MNODE_RESERVE_SIZE 64
diff --git a/source/dnode/mnode/impl/src/mndScheduler.c b/source/dnode/mnode/impl/src/mndScheduler.c
index e8428ea470..f71bd1c626 100644
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
@@ -317,9 +317,9 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
bool externalTargetDB = strcmp(pStream->sourceDb, pStream->targetDb) != 0;
SDbObj* pDbObj = mndAcquireDb(pMnode, pStream->targetDb);
ASSERT(pDbObj != NULL);
- sdbRelease(pSdb, pDbObj);
bool multiTarget = pDbObj->cfg.numOfVgroups > 1;
+ sdbRelease(pSdb, pDbObj);
if (planTotLevel == 2 || externalTargetDB || multiTarget || pStream->fixedSinkVgId) {
/*if (true) {*/
@@ -451,7 +451,6 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
SStreamChildEpInfo* pEpInfo = taosMemoryMalloc(sizeof(SStreamChildEpInfo));
if (pEpInfo == NULL) {
- ASSERT(0);
terrno = TSDB_CODE_OUT_OF_MEMORY;
sdbRelease(pSdb, pVgroup);
qDestroyQueryPlan(pPlan);
@@ -586,6 +585,8 @@ int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscrib
} else {
pVgEp->qmsg = strdup("");
}
+
+ sdbRelease(pSdb, pVgroup);
}
ASSERT(pSub->unassignedVgs->size > 0);
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index 58c89d76aa..ffb46e5f1b 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -782,6 +782,7 @@ SUB_DECODE_OVER:
return NULL;
}
+ mTrace("subscribe:%s, decode from raw:%p, row:%p", pSub->key, pRaw, pSub);
return pRow;
}
@@ -928,6 +929,7 @@ int32_t mndDropSubByTopic(SMnode *pMnode, STrans *pTrans, const char *topicName)
action.msgType = TDMT_VND_TMQ_DELETE_SUB;
if (mndTransAppendRedoAction(pTrans, &action) != 0) {
taosMemoryFree(pReq);
+ sdbRelease(pSdb, pSub);
return -1;
}
}
@@ -936,6 +938,8 @@ int32_t mndDropSubByTopic(SMnode *pMnode, STrans *pTrans, const char *topicName)
sdbRelease(pSdb, pSub);
goto END;
}
+
+ sdbRelease(pSdb, pSub);
}
code = 0;
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index 522036afa2..f1db6a12fc 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -512,6 +512,8 @@ static int32_t mndCreateTopic(SMnode *pMnode, SRpcMsg *pReq, SCMCreateTopicReq *
mndTransDrop(pTrans);
return -1;
}
+
+ sdbRelease(pSdb, pVgroup);
}
}
diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c
index 7901093315..b549ed1a68 100644
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
@@ -22,6 +22,7 @@
#include "mndShow.h"
#include "mndTrans.h"
#include "mndUser.h"
+#include "tmisce.h"
#define VGROUP_VER_NUMBER 1
#define VGROUP_RESERVE_SIZE 64
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 27084700b0..7ef3207b4d 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -99,15 +99,21 @@ void metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
void metaReaderReleaseLock(SMetaReader *pReader);
void metaReaderClear(SMetaReader *pReader);
int32_t metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
+int32_t metaGetTableEntryByUidCache(SMetaReader *pReader, tb_uid_t uid);
int metaGetTableEntryByName(SMetaReader *pReader, const char *name);
int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj *tags);
int32_t metaGetTableTagsByUids(SMeta *pMeta, int64_t suid, SArray *uidList, SHashObj *tags);
int32_t metaReadNext(SMetaReader *pReader);
const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
int metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
-int metaGetTableUidByName(void *meta, char *tbName, int64_t *uid);
+int metaGetTableUidByName(void *meta, char *tbName, uint64_t *uid);
int metaGetTableTypeByName(void *meta, char *tbName, ETableType *tbType);
bool metaIsTableExist(SMeta *pMeta, tb_uid_t uid);
+int32_t metaGetCachedTableUidList(SMeta *pMeta, tb_uid_t suid, const uint8_t *key, int32_t keyLen, SArray *pList,
+ bool *acquired);
+int32_t metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
+ int32_t payloadLen, double selectivityRatio);
+int32_t metaUidCacheClear(SMeta *pMeta, uint64_t suid);
typedef struct SMetaFltParam {
tb_uid_t suid;
diff --git a/source/dnode/vnode/src/inc/meta.h b/source/dnode/vnode/src/inc/meta.h
index 2ceae91f7c..dbfe9e1671 100644
--- a/source/dnode/vnode/src/inc/meta.h
+++ b/source/dnode/vnode/src/inc/meta.h
@@ -70,7 +70,8 @@ int32_t metaCacheDrop(SMeta* pMeta, int64_t uid);
int32_t metaStatsCacheUpsert(SMeta* pMeta, SMetaStbStats* pInfo);
int32_t metaStatsCacheDrop(SMeta* pMeta, int64_t uid);
int32_t metaStatsCacheGet(SMeta* pMeta, int64_t uid, SMetaStbStats* pInfo);
-void metaUpdateStbStats(SMeta *pMeta, int64_t uid, int64_t delta);
+void metaUpdateStbStats(SMeta *pMeta, int64_t uid, int64_t delta);
+int32_t metaUidFilterCacheGet(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, LRUHandle** pHandle);
struct SMeta {
TdThreadRwlock lock;
diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index d335e84c4c..7fb962e3a7 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -185,6 +185,8 @@ int32_t tMapDataSearch(SMapData *pMapData, void *pSearchItem, int32_t (*tGetItem
int32_t (*tItemCmprFn)(const void *, const void *), void *pItem);
int32_t tPutMapData(uint8_t *p, SMapData *pMapData);
int32_t tGetMapData(uint8_t *p, SMapData *pMapData);
+int32_t tMapDataToArray(SMapData *pMapData, int32_t itemSize, int32_t (*tGetItemFn)(uint8_t *, void *),
+ SArray **ppArray);
// other
int32_t tsdbKeyFid(TSKEY key, int32_t minutes, int8_t precision);
void tsdbFidKeyRange(int32_t fid, int32_t minutes, int8_t precision, TSKEY *minKey, TSKEY *maxKey);
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index ac9fabf052..f229b3b127 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -142,7 +142,7 @@ typedef struct SMetaInfo {
int64_t version;
int32_t skmVer;
} SMetaInfo;
-int32_t metaGetInfo(SMeta* pMeta, int64_t uid, SMetaInfo* pInfo);
+int32_t metaGetInfo(SMeta* pMeta, int64_t uid, SMetaInfo* pInfo, SMetaReader* pReader);
typedef struct {
int64_t uid;
diff --git a/source/dnode/vnode/src/meta/metaCache.c b/source/dnode/vnode/src/meta/metaCache.c
index 356aa78c22..6a704d0425 100644
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
@@ -31,6 +31,12 @@ typedef struct SMetaStbStatsEntry {
SMetaStbStats info;
} SMetaStbStatsEntry;
+typedef struct STagFilterResEntry {
+ uint64_t suid; // uid for super table
+ SList list; // the linked list of md5 digest, extracted from the serialized tag query condition
+ uint32_t qTimes;// queried times for current super table
+} STagFilterResEntry;
+
struct SMetaCache {
// child, normal, super, table entry cache
struct SEntryCache {
@@ -47,6 +53,11 @@ struct SMetaCache {
} sStbStatsCache;
// query cache
+ struct STagFilterResCache {
+ SHashObj* pTableEntry;
+ SLRUCache* pUidResCache;
+ uint64_t keyBuf[3];
+ } sTagFilterResCache;
};
static void entryCacheClose(SMeta* pMeta) {
@@ -79,6 +90,12 @@ static void statsCacheClose(SMeta* pMeta) {
}
}
+static void freeCacheEntryFp(void* param) {
+ STagFilterResEntry** p = param;
+ tdListEmpty(&(*p)->list);
+ taosMemoryFreeClear(*p);
+}
+
int32_t metaCacheOpen(SMeta* pMeta) {
int32_t code = 0;
SMetaCache* pCache = NULL;
@@ -109,9 +126,20 @@ int32_t metaCacheOpen(SMeta* pMeta) {
goto _err2;
}
- pMeta->pCache = pCache;
+ pCache->sTagFilterResCache.pUidResCache = taosLRUCacheInit(5*1024*1024, -1, 0.5);
+ if (pCache->sTagFilterResCache.pUidResCache == NULL) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ goto _err2;
+ }
-_exit:
+ pCache->sTagFilterResCache.pTableEntry = taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK);
+ if (pCache->sTagFilterResCache.pTableEntry == NULL) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ goto _err2;
+ }
+
+ taosHashSetFreeFp(pCache->sTagFilterResCache.pTableEntry, freeCacheEntryFp);
+ pMeta->pCache = pCache;
return code;
_err2:
@@ -119,7 +147,6 @@ _err2:
_err:
taosMemoryFree(pCache);
-
metaError("vgId:%d, meta open cache failed since %s", TD_VID(pMeta->pVnode), tstrerror(code));
return code;
}
@@ -128,6 +155,9 @@ void metaCacheClose(SMeta* pMeta) {
if (pMeta->pCache) {
entryCacheClose(pMeta);
statsCacheClose(pMeta);
+
+ taosHashCleanup(pMeta->pCache->sTagFilterResCache.pTableEntry);
+ taosLRUCacheCleanup(pMeta->pCache->sTagFilterResCache.pUidResCache);
taosMemoryFree(pMeta->pCache);
pMeta->pCache = NULL;
}
@@ -388,3 +418,142 @@ int32_t metaStatsCacheGet(SMeta* pMeta, int64_t uid, SMetaStbStats* pInfo) {
return code;
}
+
+int32_t metaGetCachedTableUidList(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1, bool* acquireRes) {
+ uint64_t* pBuf = pMeta->pCache->sTagFilterResCache.keyBuf;
+
+ // generate the composed key for LRU cache
+ SLRUCache* pCache = pMeta->pCache->sTagFilterResCache.pUidResCache;
+
+ pBuf[0] = suid;
+ memcpy(&pBuf[1], pKey, keyLen);
+
+ int32_t len = keyLen + sizeof(uint64_t);
+ LRUHandle *pHandle = taosLRUCacheLookup(pCache, pBuf, len);
+ if (pHandle == NULL) {
+ *acquireRes = 0;
+ return TSDB_CODE_SUCCESS;
+ } else { // do some book mark work after acquiring the filter result from cache
+ STagFilterResEntry** pEntry = taosHashGet(pMeta->pCache->sTagFilterResCache.pTableEntry, &suid, sizeof(uint64_t));
+ ASSERT(pEntry != NULL);
+ *acquireRes = 1;
+
+ const char* p = taosLRUCacheValue(pMeta->pCache->sTagFilterResCache.pUidResCache, pHandle);
+ int32_t size = *(int32_t*) p;
+ taosArrayAddBatch(pList1, p + sizeof(int32_t), size);
+
+ (*pEntry)->qTimes += 1;
+ taosLRUCacheRelease(pCache, pHandle, false);
+
+ // check if scanning all items are necessary or not
+ if ((*pEntry)->qTimes >= 5000 && TD_DLIST_NELES(&(*pEntry)->list) > 10) {
+ SArray* pList = taosArrayInit(64, POINTER_BYTES);
+
+ SListIter iter = {0};
+ tdListInitIter(&(*pEntry)->list, &iter, TD_LIST_FORWARD);
+
+ SListNode* pNode = NULL;
+ while ((pNode = tdListNext(&iter)) != NULL) {
+ memcpy(pBuf + sizeof(suid), pNode->data, keyLen);
+
+ // check whether it is existed in LRU cache, and remove it from linked list if not.
+ LRUHandle* pRes = taosLRUCacheLookup(pCache, pBuf, len);
+ if (pRes == NULL) { // remove the item in the linked list
+ taosArrayPush(pList, &pNode);
+ } else {
+ taosLRUCacheRelease(pCache, pRes, false);
+ }
+ }
+
+ // remove the keys, of which query uid lists have been replaced already.
+ size_t s = taosArrayGetSize(pList);
+ for(int32_t i = 0; i < s; ++i) {
+ SListNode** p1 = taosArrayGet(pList, i);
+ tdListPopNode(&(*pEntry)->list, *p1);
+ }
+
+ (*pEntry)->qTimes = 0; // reset the query times
+ }
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+static void freePayload(const void* key, size_t keyLen, void* value) {
+ if (value == NULL) {
+ return;
+ }
+ taosMemoryFree(value);
+}
+
+// check both the payload size and selectivity ratio
+int32_t metaUidFilterCachePut(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload, int32_t payloadLen, double selectivityRatio) {
+ if (selectivityRatio > tsSelectivityRatio) {
+ metaDebug("vgId:%d, suid:%" PRIu64
+ " failed to add to uid list cache, due to selectivity ratio %.2f less than threshold %.2f",
+ TD_VID(pMeta->pVnode), suid, selectivityRatio, tsSelectivityRatio);
+ taosMemoryFree(pPayload);
+ return TSDB_CODE_SUCCESS;
+ }
+
+ if (payloadLen > tsTagFilterResCacheSize) {
+ metaDebug("vgId:%d, suid:%" PRIu64
+ " failed to add to uid list cache, due to payload length %d greater than threshold %d",
+ TD_VID(pMeta->pVnode), suid, payloadLen, tsTagFilterResCacheSize);
+ taosMemoryFree(pPayload);
+ return TSDB_CODE_SUCCESS;
+ }
+
+ SLRUCache* pCache = pMeta->pCache->sTagFilterResCache.pUidResCache;
+ SHashObj* pTableEntry = pMeta->pCache->sTagFilterResCache.pTableEntry;
+
+ STagFilterResEntry** pEntry = taosHashGet(pTableEntry, &suid, sizeof(uint64_t));
+ if (pEntry == NULL) {
+ STagFilterResEntry* p = taosMemoryMalloc(sizeof(STagFilterResEntry));
+ p->qTimes = 0;
+ tdListInit(&p->list, keyLen);
+ taosHashPut(pTableEntry, &suid, sizeof(uint64_t), &p, POINTER_BYTES);
+ tdListAppend(&p->list, pKey);
+ } else {
+ tdListAppend(&(*pEntry)->list, pKey);
+ }
+
+ uint64_t* pBuf = pMeta->pCache->sTagFilterResCache.keyBuf;
+ pBuf[0] = suid;
+
+ memcpy(&pBuf[1], pKey, keyLen);
+ ASSERT(sizeof(uint64_t) + keyLen == 24);
+
+ // add to cache.
+ taosLRUCacheInsert(pCache, pBuf, sizeof(uint64_t) + keyLen, pPayload, payloadLen, freePayload, NULL, TAOS_LRU_PRIORITY_LOW);
+ metaDebug("vgId:%d, suid:%"PRIu64" list cache added into cache, total:%d, tables:%d", TD_VID(pMeta->pVnode),
+ suid, (int32_t) taosLRUCacheGetUsage(pCache), taosHashGetSize(pTableEntry));
+
+ return TSDB_CODE_SUCCESS;
+}
+
+// remove the lru cache that are expired due to the tags value update, or creating, or dropping, of child tables
+int32_t metaUidCacheClear(SMeta* pMeta, uint64_t suid) {
+ STagFilterResEntry** pEntry = taosHashGet(pMeta->pCache->sTagFilterResCache.pTableEntry, &suid, sizeof(uint64_t));
+ if (pEntry == NULL || listNEles(&(*pEntry)->list) == 0) {
+ return TSDB_CODE_SUCCESS;
+ }
+
+ int32_t keyLen = sizeof(uint64_t) * 3;
+ uint64_t p[3] = {0};
+ p[0] = suid;
+
+ SListIter iter = {0};
+ tdListInitIter(&(*pEntry)->list, &iter, TD_LIST_FORWARD);
+
+ SListNode* pNode = NULL;
+ while ((pNode = tdListNext(&iter)) != NULL) {
+ memcpy(&p[1], pNode->data, 16);
+ taosLRUCacheErase(pMeta->pCache->sTagFilterResCache.pUidResCache, p, keyLen);
+ }
+
+ (*pEntry)->qTimes = 0;
+ tdListEmpty(&(*pEntry)->list);
+
+ return TSDB_CODE_SUCCESS;
+}
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 620022c06d..0257aede3d 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -152,7 +152,7 @@ bool metaIsTableExist(SMeta *pMeta, tb_uid_t uid) {
}
int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
- SMeta *pMeta = pReader->pMeta;
+ SMeta *pMeta = pReader->pMeta;
int64_t version1;
// query uid.idx
@@ -165,6 +165,18 @@ int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
return metaGetTableEntryByVersion(pReader, version1, uid);
}
+int metaGetTableEntryByUidCache(SMetaReader *pReader, tb_uid_t uid) {
+ SMeta *pMeta = pReader->pMeta;
+
+ SMetaInfo info;
+ if (metaGetInfo(pMeta, uid, &info, pReader) == TSDB_CODE_NOT_FOUND) {
+ terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
+ return -1;
+ }
+
+ return metaGetTableEntryByVersion(pReader, info.version, uid);
+}
+
int metaGetTableEntryByName(SMetaReader *pReader, const char *name) {
SMeta *pMeta = pReader->pMeta;
tb_uid_t uid;
@@ -211,7 +223,7 @@ int metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName) {
return 0;
}
-int metaGetTableUidByName(void *meta, char *tbName, int64_t *uid) {
+int metaGetTableUidByName(void *meta, char *tbName, uint64_t *uid) {
int code = 0;
SMetaReader mr = {0};
metaReaderInit(&mr, (SMeta *)meta, 0);
@@ -614,7 +626,7 @@ int32_t metaGetTbTSchemaEx(SMeta *pMeta, tb_uid_t suid, tb_uid_t uid, int32_t sv
SSkmDbKey skmDbKey;
if (sver <= 0) {
SMetaInfo info;
- if (metaGetInfo(pMeta, suid ? suid : uid, &info) == 0) {
+ if (metaGetInfo(pMeta, suid ? suid : uid, &info, NULL) == 0) {
sver = info.skmVer;
} else {
TBC *pSkmDbC = NULL;
@@ -1126,8 +1138,8 @@ int32_t metaFilterTableName(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
valid = tdbTbcGet(pCursor->pCur, (const void **)pEntryKey, &nEntryKey, (const void **)&pEntryVal, &nEntryVal);
if (valid < 0) break;
- char *pTableKey = (char *)pEntryKey;
- int32_t cmp = (*param->filterFunc)(pTableKey, pName, pCursor->type);
+ char *pTableKey = (char *)pEntryKey;
+ cmp = (*param->filterFunc)(pTableKey, pName, pCursor->type);
if (cmp == 0) {
tb_uid_t tuid = *(tb_uid_t *)pEntryVal;
taosArrayPush(pUids, &tuid);
@@ -1379,10 +1391,11 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj
int32_t metaCacheGet(SMeta *pMeta, int64_t uid, SMetaInfo *pInfo);
-int32_t metaGetInfo(SMeta *pMeta, int64_t uid, SMetaInfo *pInfo) {
+int32_t metaGetInfo(SMeta *pMeta, int64_t uid, SMetaInfo *pInfo, SMetaReader *pReader) {
int32_t code = 0;
void *pData = NULL;
int nData = 0;
+ int lock = 0;
metaRLock(pMeta);
@@ -1407,11 +1420,22 @@ int32_t metaGetInfo(SMeta *pMeta, int64_t uid, SMetaInfo *pInfo) {
pInfo->version = ((SUidIdxVal *)pData)->version;
pInfo->skmVer = ((SUidIdxVal *)pData)->skmVer;
+ if (pReader != NULL) {
+ lock = !(pReader->flags & META_READER_NOLOCK);
+ if (lock) {
+ metaULock(pReader->pMeta);
+ // metaReaderReleaseLock(pReader);
+ }
+ }
// upsert the cache
metaWLock(pMeta);
metaCacheUpsert(pMeta, pInfo);
metaULock(pMeta);
+ if (lock) {
+ metaRLock(pReader->pMeta);
+ }
+
_exit:
tdbFree(pData);
return code;
diff --git a/source/dnode/vnode/src/meta/metaSma.c b/source/dnode/vnode/src/meta/metaSma.c
index 3ada7d1814..52452bf710 100644
--- a/source/dnode/vnode/src/meta/metaSma.c
+++ b/source/dnode/vnode/src/meta/metaSma.c
@@ -36,7 +36,7 @@ int32_t metaCreateTSma(SMeta *pMeta, int64_t version, SSmaCfg *pCfg) {
// validate req
// save smaIndex
metaReaderInit(&mr, pMeta, 0);
- if (metaGetTableEntryByUid(&mr, pCfg->indexUid) == 0) {
+ if (metaGetTableEntryByUidCache(&mr, pCfg->indexUid) == 0) {
#if 1
terrno = TSDB_CODE_TSMA_ALREADY_EXIST;
metaReaderClear(&mr);
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 841999ef9f..5c97ee5633 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -207,7 +207,7 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
tb_uid_t uid = *(tb_uid_t *)pData;
tdbFree(pData);
SMetaInfo info;
- metaGetInfo(pMeta, uid, &info);
+ metaGetInfo(pMeta, uid, &info, NULL);
if (info.uid == info.suid) {
return 0;
} else {
@@ -458,6 +458,7 @@ int metaCreateTable(SMeta *pMeta, int64_t version, SVCreateTbReq *pReq, STableMe
metaWLock(pMeta);
metaUpdateStbStats(pMeta, me.ctbEntry.suid, 1);
+ metaUidCacheClear(pMeta, me.ctbEntry.suid);
metaULock(pMeta);
} else {
me.ntbEntry.ctime = pReq->ctime;
@@ -681,6 +682,7 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
--pMeta->pVnode->config.vndStats.numOfCTables;
metaUpdateStbStats(pMeta, e.ctbEntry.suid, -1);
+ metaUidCacheClear(pMeta, e.ctbEntry.suid);
} else if (e.type == TSDB_NORMAL_TABLE) {
// drop schema.db (todo)
@@ -691,6 +693,7 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
// drop schema.db (todo)
metaStatsCacheDrop(pMeta, uid);
+ metaUidCacheClear(pMeta, uid);
--pMeta->pVnode->config.vndStats.numOfSTables;
}
@@ -1074,6 +1077,8 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
tdbTbUpsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), ctbEntry.ctbEntry.pTags,
((STag *)(ctbEntry.ctbEntry.pTags))->len, &pMeta->txn);
+ metaUidCacheClear(pMeta, ctbEntry.ctbEntry.suid);
+
metaULock(pMeta);
tDecoderClear(&dc1);
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index 03532eb6d4..51842a8ae4 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -660,6 +660,13 @@ _end:
return code;
}
+static void tdBlockDataDestroy(SArray *pBlockArr) {
+ for (int32_t i = 0; i < taosArrayGetSize(pBlockArr); ++i) {
+ blockDataDestroy(taosArrayGetP(pBlockArr, i));
+ }
+ taosArrayDestroy(pBlockArr);
+}
+
static int32_t tdRSmaExecAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSmaInfoItem *pItem, STSchema *pTSchema,
int64_t suid) {
SArray *pResList = taosArrayInit(1, POINTER_BYTES);
@@ -701,38 +708,44 @@ static int32_t tdRSmaExecAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSma
#endif
for (int32_t i = 0; i < taosArrayGetSize(pResList); ++i) {
SSDataBlock *output = taosArrayGetP(pResList, i);
- smaDebug("result block, uid:%"PRIu64", groupid:%"PRIu64", rows:%d", output->info.uid, output->info.groupId,
- output->info.rows);
+ smaDebug("result block, uid:%" PRIu64 ", groupid:%" PRIu64 ", rows:%d", output->info.uid, output->info.groupId,
+ output->info.rows);
- STsdb *sinkTsdb = (pItem->level == TSDB_RETENTION_L1 ? pSma->pRSmaTsdb[0] : pSma->pRSmaTsdb[1]);
- SSubmitReq *pReq = NULL;
+ STsdb *sinkTsdb = (pItem->level == TSDB_RETENTION_L1 ? pSma->pRSmaTsdb[0] : pSma->pRSmaTsdb[1]);
+ SSubmitReq *pReq = NULL;
// TODO: the schema update should be handled later(TD-17965)
if (buildSubmitReqFromDataBlock(&pReq, output, pTSchema, SMA_VID(pSma), suid) < 0) {
- smaError("vgId:%d, build submit req for rsma table suid:%" PRIu64 ", uid:%"PRIu64", level %" PRIi8 " failed since %s", SMA_VID(pSma),
- suid, output->info.groupId, pItem->level, terrstr());
+ smaError("vgId:%d, build submit req for rsma table suid:%" PRIu64 ", uid:%" PRIu64 ", level %" PRIi8
+ " failed since %s",
+ SMA_VID(pSma), suid, output->info.groupId, pItem->level, terrstr());
goto _err;
}
if (pReq && tdProcessSubmitReq(sinkTsdb, output->info.version, pReq) < 0) {
taosMemoryFreeClear(pReq);
- smaError("vgId:%d, process submit req for rsma suid:%"PRIu64", uid:%" PRIu64 " level %" PRIi8 " failed since %s",
+ smaError("vgId:%d, process submit req for rsma suid:%" PRIu64 ", uid:%" PRIu64 " level %" PRIi8
+ " failed since %s",
SMA_VID(pSma), suid, output->info.groupId, pItem->level, terrstr());
goto _err;
}
- smaDebug("vgId:%d, process submit req for rsma suid:%" PRIu64 ",uid:%"PRIu64", level %" PRIi8 " ver %" PRIi64 " len %" PRIu32,
- SMA_VID(pSma), suid, output->info.groupId, pItem->level, output->info.version, htonl(pReq->header.contLen));
+ smaDebug("vgId:%d, process submit req for rsma suid:%" PRIu64 ",uid:%" PRIu64 ", level %" PRIi8 " ver %" PRIi64
+ " len %" PRIu32,
+ SMA_VID(pSma), suid, output->info.groupId, pItem->level, output->info.version,
+ htonl(pReq->header.contLen));
taosMemoryFreeClear(pReq);
}
}
taosArrayDestroy(pResList);
+ qCleanExecTaskBlockBuf(taskInfo);
return TSDB_CODE_SUCCESS;
_err:
taosArrayDestroy(pResList);
+ qCleanExecTaskBlockBuf(taskInfo);
return TSDB_CODE_FAILED;
}
@@ -820,8 +833,7 @@ static int32_t tdRsmaPrintSubmitReq(SSma *pSma, SSubmitReq *pReq) {
static int32_t tdExecuteRSmaImpl(SSma *pSma, const void *pMsg, int32_t msgSize, int32_t inputType, SRSmaInfo *pInfo,
ERsmaExecType type, int8_t level) {
int32_t idx = level - 1;
-
- void *qTaskInfo = (type == RSMA_EXEC_COMMIT) ? RSMA_INFO_IQTASK(pInfo, idx) : RSMA_INFO_QTASK(pInfo, idx);
+ void *qTaskInfo = (type == RSMA_EXEC_COMMIT) ? RSMA_INFO_IQTASK(pInfo, idx) : RSMA_INFO_QTASK(pInfo, idx);
if (!qTaskInfo) {
smaDebug("vgId:%d, no qTaskInfo to execute rsma %" PRIi8 " task for suid:%" PRIu64, SMA_VID(pSma), level,
pInfo->suid);
@@ -911,7 +923,7 @@ static int32_t tdRSmaInfoClone(SSma *pSma, SRSmaInfo *pInfo) {
SMetaReader mr = {0};
metaReaderInit(&mr, SMA_META(pSma), 0);
smaDebug("vgId:%d, rsma clone qTaskInfo for suid:%" PRIi64, SMA_VID(pSma), pInfo->suid);
- if (metaGetTableEntryByUid(&mr, pInfo->suid) < 0) {
+ if (metaGetTableEntryByUidCache(&mr, pInfo->suid) < 0) {
smaError("vgId:%d, rsma clone, failed to get table meta for %" PRIi64 " since %s", SMA_VID(pSma), pInfo->suid,
terrstr());
goto _err;
@@ -1115,7 +1127,7 @@ static int32_t tdRSmaRestoreQTaskInfoInit(SSma *pSma, int64_t *nTables) {
for (int64_t i = 0; i < arrSize; ++i) {
tb_uid_t suid = *(tb_uid_t *)taosArrayGet(suidList, i);
smaDebug("vgId:%d, rsma restore, suid is %" PRIi64, TD_VID(pVnode), suid);
- if (metaGetTableEntryByUid(&mr, suid) < 0) {
+ if (metaGetTableEntryByUidCache(&mr, suid) < 0) {
smaError("vgId:%d, rsma restore, failed to get table meta for %" PRIi64 " since %s", TD_VID(pVnode), suid,
terrstr());
goto _err;
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 6c1c552ccb..61f027039d 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -379,7 +379,6 @@ int32_t tqProcessOffsetCommitReq(STQ* pTq, int64_t version, char* msg, int32_t m
STqHandle* pHandle = taosHashGet(pTq->pHandle, offset.subKey, strlen(offset.subKey));
if (pHandle) {
if (walRefVer(pHandle->pRef, offset.val.version) < 0) {
- ASSERT(0);
return -1;
}
}
diff --git a/source/dnode/vnode/src/tq/tqExec.c b/source/dnode/vnode/src/tq/tqExec.c
index 3887f72740..8bcfe53712 100644
--- a/source/dnode/vnode/src/tq/tqExec.c
+++ b/source/dnode/vnode/src/tq/tqExec.c
@@ -48,7 +48,7 @@ static int32_t tqAddTbNameToRsp(const STQ* pTq, int64_t uid, SMqDataRsp* pRsp, i
SMetaReader mr = {0};
metaReaderInit(&mr, pTq->pVnode->pMeta, 0);
// TODO add reference to gurantee success
- if (metaGetTableEntryByUid(&mr, uid) < 0) {
+ if (metaGetTableEntryByUidCache(&mr, uid) < 0) {
metaReaderClear(&mr);
return -1;
}
diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c
index a15d19fbe1..612e465295 100644
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
@@ -291,6 +291,7 @@ int32_t tqMetaRestoreHandle(STQ* pTq) {
STqHandle handle;
tDecoderInit(&decoder, (uint8_t*)pVal, vLen);
tDecodeSTqHandle(&decoder, &handle);
+ tDecoderClear(&decoder);
handle.pRef = walOpenRef(pTq->pVnode->pWal);
if (handle.pRef == NULL) {
@@ -345,6 +346,8 @@ int32_t tqMetaRestoreHandle(STQ* pTq) {
taosHashPut(pTq->pHandle, pKey, kLen, &handle, sizeof(STqHandle));
}
+ tdbFree(pKey);
+ tdbFree(pVal);
tdbTbcClose(pCur);
return 0;
}
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index afb7ac39de..e41b1d8aa8 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -766,7 +766,7 @@ int32_t tqUpdateTbUidList(STQ* pTq, const SArray* tbUidList, bool isAdd) {
for (int32_t i = 0; i < taosArrayGetSize(tbUidList); ++i) {
uint64_t* id = (uint64_t*)taosArrayGet(tbUidList, i);
- int32_t code = metaGetTableEntryByUid(&mr, *id);
+ int32_t code = metaGetTableEntryByUidCache(&mr, *id);
if (code != TSDB_CODE_SUCCESS) {
qError("failed to get table meta, uid:%" PRIu64 " code:%s", *id, tstrerror(terrno));
continue;
diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 291a5ab1eb..d71eb33951 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -392,7 +392,7 @@ static tb_uid_t getTableSuidByUid(tb_uid_t uid, STsdb *pTsdb) {
SMetaReader mr = {0};
metaReaderInit(&mr, pTsdb->pVnode->pMeta, 0);
- if (metaGetTableEntryByUid(&mr, uid) < 0) {
+ if (metaGetTableEntryByUidCache(&mr, uid) < 0) {
metaReaderClear(&mr); // table not esist
return 0;
}
diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
index ddf2949607..0a7f59e429 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@@ -104,7 +104,7 @@ int32_t tsdbInsertTableData(STsdb *pTsdb, int64_t version, SSubmitMsgIter *pMsgI
tb_uid_t uid = pMsgIter->uid;
SMetaInfo info;
- code = metaGetInfo(pTsdb->pVnode->pMeta, uid, &info);
+ code = metaGetInfo(pTsdb->pVnode->pMeta, uid, &info, NULL);
if (code) {
code = TSDB_CODE_TDB_TABLE_NOT_EXIST;
goto _err;
@@ -114,7 +114,7 @@ int32_t tsdbInsertTableData(STsdb *pTsdb, int64_t version, SSubmitMsgIter *pMsgI
goto _err;
}
if (info.suid) {
- metaGetInfo(pTsdb->pVnode->pMeta, info.suid, &info);
+ metaGetInfo(pTsdb->pVnode->pMeta, info.suid, &info, NULL);
}
if (pMsgIter->sversion != info.skmVer) {
tsdbError("vgId:%d, req sver:%d, skmVer:%d suid:%" PRId64 " uid:%" PRId64, TD_VID(pTsdb->pVnode),
@@ -153,7 +153,7 @@ int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid
// check if table exists
SMetaInfo info;
- code = metaGetInfo(pTsdb->pVnode->pMeta, uid, &info);
+ code = metaGetInfo(pTsdb->pVnode->pMeta, uid, &info, NULL);
if (code) {
code = TSDB_CODE_TDB_TABLE_NOT_EXIST;
goto _err;
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 534fe89818..96cfa1752d 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -38,7 +38,7 @@ typedef struct {
typedef struct SBlockIndex {
int32_t ordinalIndex;
int64_t inFileOffset;
- STimeWindow window;
+ STimeWindow window; // todo replace it with overlap flag.
} SBlockIndex;
typedef struct STableBlockScanInfo {
@@ -551,7 +551,7 @@ static SSDataBlock* createResBlock(SQueryTableDataCond* pCond, int32_t capacity)
}
for (int32_t i = 0; i < pCond->numOfCols; ++i) {
- SColumnInfoData colInfo = {0, {0}};
+ SColumnInfoData colInfo = {0};
colInfo.info = pCond->colList[i];
blockDataAppendColInfo(pResBlock, &colInfo);
}
@@ -709,11 +709,13 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
tMapDataReset(&pScanInfo->mapData);
tsdbReadDataBlk(pReader->pFileReader, pBlockIdx, &pScanInfo->mapData);
+ taosArrayEnsureCap(pScanInfo->pBlockList, pScanInfo->mapData.nItem);
sizeInDisk += pScanInfo->mapData.nData;
+
+ SDataBlk block = {0};
for (int32_t j = 0; j < pScanInfo->mapData.nItem; ++j) {
- SDataBlk block = {0};
- tMapDataGetItemByIdx(&pScanInfo->mapData, j, &block, tGetDataBlk);
+ tGetDataBlk(pScanInfo->mapData.pData + pScanInfo->mapData.aOffset[j], &block);
// 1. time range check
if (block.minKey.ts > pReader->window.ekey || block.maxKey.ts < pReader->window.skey) {
@@ -728,8 +730,8 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
SBlockIndex bIndex = {.ordinalIndex = j, .inFileOffset = block.aSubBlock->offset};
bIndex.window = (STimeWindow){.skey = block.minKey.ts, .ekey = block.maxKey.ts};
- void* p = taosArrayPush(pScanInfo->pBlockList, &bIndex);
- if (p == NULL) {
+ void* p1 = taosArrayPush(pScanInfo->pBlockList, &bIndex);
+ if (p1 == NULL) {
tMapDataClear(&pScanInfo->mapData);
return TSDB_CODE_OUT_OF_MEMORY;
}
@@ -752,6 +754,7 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
numOfTables, pBlockNum->numOfBlocks, numOfQTable, pBlockNum->numOfLastFiles, sizeInDisk / 1000.0, el,
pReader->idStr);
+
pReader->cost.numOfBlocks += total;
pReader->cost.headFileLoadTime += el;
@@ -1455,6 +1458,7 @@ static int32_t setFileBlockActiveInBlockIter(SDataBlockIter* pBlockIter, int32_t
return TSDB_CODE_SUCCESS;
}
+// todo: this attribute could be acquired during extractin the global ordered block list.
static bool overlapWithNeighborBlock(SDataBlk* pBlock, SBlockIndex* pNeighborBlockIndex, int32_t order) {
// it is the last block in current file, no chance to overlap with neighbor blocks.
if (ASCENDING_TRAVERSE(order)) {
@@ -4346,7 +4350,7 @@ int32_t tsdbGetTableSchema(SVnode* pVnode, int64_t uid, STSchema** pSchema, int6
SMetaReader mr = {0};
metaReaderInit(&mr, pVnode->pMeta, 0);
- int32_t code = metaGetTableEntryByUid(&mr, uid);
+ int32_t code = metaGetTableEntryByUidCache(&mr, uid);
if (code != TSDB_CODE_SUCCESS) {
terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
metaReaderClear(&mr);
@@ -4358,7 +4362,7 @@ int32_t tsdbGetTableSchema(SVnode* pVnode, int64_t uid, STSchema** pSchema, int6
if (mr.me.type == TSDB_CHILD_TABLE) {
tDecoderClear(&mr.coder);
*suid = mr.me.ctbEntry.suid;
- code = metaGetTableEntryByUid(&mr, *suid);
+ code = metaGetTableEntryByUidCache(&mr, *suid);
if (code != TSDB_CODE_SUCCESS) {
terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
metaReaderClear(&mr);
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 5994285647..db86a9429d 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -101,6 +101,30 @@ void tMapDataGetItemByIdx(SMapData *pMapData, int32_t idx, void *pItem, int32_t
tGetItemFn(pMapData->pData + pMapData->aOffset[idx], pItem);
}
+int32_t tMapDataToArray(SMapData *pMapData, int32_t itemSize, int32_t (*tGetItemFn)(uint8_t *, void *),
+ SArray **ppArray) {
+ int32_t code = 0;
+
+ SArray *pArray = taosArrayInit(pMapData->nItem, itemSize);
+ if (pArray == NULL) {
+ code = TSDB_CODE_TDB_OUT_OF_MEMORY;
+ goto _exit;
+ }
+
+ for (int32_t i = 0; i < pMapData->nItem; i++) {
+ tMapDataGetItemByIdx(pMapData, i, taosArrayReserve(pArray, 1), tGetItemFn);
+ }
+
+_exit:
+ if (code) {
+ *ppArray = NULL;
+ if (pArray) taosArrayDestroy(pArray);
+ } else {
+ *ppArray = pArray;
+ }
+ return code;
+}
+
int32_t tPutMapData(uint8_t *p, SMapData *pMapData) {
int32_t n = 0;
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 2dcd681205..3a398d1551 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1076,6 +1076,9 @@ int32_t catalogRefreshTableMeta(SCatalog* pCtg, SRequestConnInfo* pConn, const S
SCtgTbMetaCtx ctx = {0};
ctx.pName = (SName*)pTableName;
ctx.flag = CTG_FLAG_FORCE_UPDATE | CTG_FLAG_MAKE_STB(isSTable);
+ if (IS_SYS_DBNAME(ctx.pName->dbname)) {
+ CTG_FLAG_SET_SYS_DB(ctx.flag);
+ }
CTG_API_LEAVE(ctgRefreshTbMeta(pCtg, pConn, &ctx, NULL, true));
}
diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index fa38eeba0c..19b7ee32ae 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -663,6 +663,7 @@ int32_t ctgDropDbCacheEnqueue(SCatalog *pCtg, const char *dbFName, int64_t dbId)
int32_t code = 0;
SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation));
op->opId = CTG_OP_DROP_DB_CACHE;
+ op->syncOp = true;
SCtgDropDBMsg *msg = taosMemoryMalloc(sizeof(SCtgDropDBMsg));
if (NULL == msg) {
@@ -1612,11 +1613,11 @@ int32_t ctgOpUpdateVgroup(SCtgCacheOperation *operation) {
dbCache = NULL;
- if (!IS_SYS_DBNAME(dbFName)) {
+ //if (!IS_SYS_DBNAME(dbFName)) {
tstrncpy(vgVersion.dbFName, dbFName, sizeof(vgVersion.dbFName));
CTG_ERR_JRET(ctgMetaRentUpdate(&msg->pCtg->dbRent, &vgVersion, vgVersion.dbId, sizeof(SDbVgVersion),
ctgDbVgVersionSortCompare, ctgDbVgVersionSearchCompare));
- }
+ //}
_return:
@@ -1641,7 +1642,7 @@ int32_t ctgOpDropDbCache(SCtgCacheOperation *operation) {
goto _return;
}
- if (dbCache->dbId != msg->dbId) {
+ if (msg->dbId && dbCache->dbId != msg->dbId) {
ctgInfo("dbId already updated, dbFName:%s, dbId:0x%" PRIx64 ", targetId:0x%" PRIx64, msg->dbFName, dbCache->dbId,
msg->dbId);
goto _return;
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index b442034860..b9d622a4c3 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -153,12 +153,12 @@ typedef struct {
SSchemaWrapper* qsw;
} SSchemaInfo;
-typedef struct {
+typedef struct SExchangeOpStopInfo {
int32_t operatorType;
int64_t refId;
} SExchangeOpStopInfo;
-typedef struct {
+typedef struct STaskStopInfo {
SRWLatch lock;
SArray* pStopInfo;
} STaskStopInfo;
@@ -181,6 +181,7 @@ struct SExecTaskInfo {
SSubplan* pSubplan;
struct SOperatorInfo* pRoot;
SLocalFetch localFetch;
+ SArray* pResultBlockList;// result block list
STaskStopInfo stopInfo;
};
@@ -252,21 +253,22 @@ typedef struct SLimitInfo {
} SLimitInfo;
typedef struct SExchangeInfo {
- SArray* pSources;
- SArray* pSourceDataInfo;
- tsem_t ready;
- void* pTransporter;
+ SArray* pSources;
+ SArray* pSourceDataInfo;
+ tsem_t ready;
+ void* pTransporter;
+
// SArray, result block list, used to keep the multi-block that
// passed by downstream operator
SArray* pResultBlockList;
- int32_t rspBlockIndex; // indicate the return block index in pResultBlockList
+ SArray* pRecycledBlocks;// build a pool for small data block to avoid to repeatly create and then destroy.
SSDataBlock* pDummyBlock; // dummy block, not keep data
bool seqLoadData; // sequential load data or not, false by default
int32_t current;
SLoadRemoteDataInfo loadInfo;
uint64_t self;
SLimitInfo limitInfo;
- int64_t openedTs; // start exec time stamp
+ int64_t openedTs; // start exec time stamp, todo: move to SLoadRemoteDataInfo
} SExchangeInfo;
typedef struct SScanInfo {
@@ -301,9 +303,9 @@ typedef struct {
} SAggOptrPushDownInfo;
typedef struct STableMetaCacheInfo {
- SLRUCache* pTableMetaEntryCache; // 100 by default
- uint64_t metaFetch;
- uint64_t cacheHit;
+ SLRUCache* pTableMetaEntryCache; // 100 by default
+ uint64_t metaFetch;
+ uint64_t cacheHit;
} STableMetaCacheInfo;
typedef struct STableScanBase {
diff --git a/source/libs/executor/src/cachescanoperator.c b/source/libs/executor/src/cachescanoperator.c
index 6b5f773fe3..873089023a 100644
--- a/source/libs/executor/src/cachescanoperator.c
+++ b/source/libs/executor/src/cachescanoperator.c
@@ -44,6 +44,8 @@ static void destroyCacheScanOperator(void* param);
static int32_t extractCacheScanSlotId(const SArray* pColMatchInfo, SExecTaskInfo* pTaskInfo, int32_t** pSlotIds);
static int32_t removeRedundantTsCol(SLastRowScanPhysiNode* pScanNode, SColMatchInfo* pColMatchInfo);
+#define SCAN_ROW_TYPE(_t) ((_t)? CACHESCAN_RETRIEVE_LAST : CACHESCAN_RETRIEVE_LAST_ROW)
+
SOperatorInfo* createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandle* readHandle,
SExecTaskInfo* pTaskInfo) {
int32_t code = TSDB_CODE_SUCCESS;
@@ -75,32 +77,36 @@ SOperatorInfo* createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SRe
STableListInfo* pTableList = pTaskInfo->pTableInfoList;
- initResultSizeInfo(&pOperator->resultInfo, 4096);
- blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+ int32_t totalTables = tableListGetSize(pTableList);
+ int32_t capacity = 0;
+
pInfo->pUidList = taosArrayInit(4, sizeof(int64_t));
- // partition by tbname, todo opt perf
- if (oneTableForEachGroup(pTableList) || (tableListGetSize(pTableList) == 1)) {
- pInfo->retrieveType =
- CACHESCAN_RETRIEVE_TYPE_ALL | (pScanNode->ignoreNull ? CACHESCAN_RETRIEVE_LAST : CACHESCAN_RETRIEVE_LAST_ROW);
+ // partition by tbname
+ if (oneTableForEachGroup(pTableList) || (totalTables == 1)) {
+ pInfo->retrieveType = CACHESCAN_RETRIEVE_TYPE_ALL | SCAN_ROW_TYPE(pScanNode->ignoreNull);
STableKeyInfo* pList = tableListGetInfo(pTableList, 0);
- size_t num = tableListGetSize(pTableList);
uint64_t suid = tableListGetSuid(pTableList);
- code = tsdbCacherowsReaderOpen(pInfo->readHandle.vnode, pInfo->retrieveType, pList, num,
+ code = tsdbCacherowsReaderOpen(pInfo->readHandle.vnode, pInfo->retrieveType, pList, totalTables,
taosArrayGetSize(pInfo->matchInfo.pList), suid, &pInfo->pLastrowReader);
if (code != TSDB_CODE_SUCCESS) {
goto _error;
}
+ capacity = TMIN(totalTables, 4096);
+
pInfo->pBufferredRes = createOneDataBlock(pInfo->pRes, false);
- blockDataEnsureCapacity(pInfo->pBufferredRes, pOperator->resultInfo.capacity);
+ blockDataEnsureCapacity(pInfo->pBufferredRes, capacity);
} else { // by tags
- pInfo->retrieveType = CACHESCAN_RETRIEVE_TYPE_SINGLE |
- (pScanNode->ignoreNull ? CACHESCAN_RETRIEVE_LAST : CACHESCAN_RETRIEVE_LAST_ROW);
+ pInfo->retrieveType = CACHESCAN_RETRIEVE_TYPE_SINGLE | SCAN_ROW_TYPE(pScanNode->ignoreNull);
+ capacity = 1; // only one row output
}
+ initResultSizeInfo(&pOperator->resultInfo, capacity);
+ blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+
if (pScanNode->scan.pScanPseudoCols != NULL) {
SExprSupp* p = &pInfo->pseudoExprSup;
p->pExprInfo = createExprInfo(pScanNode->scan.pScanPseudoCols, NULL, &p->numOfExprs);
diff --git a/source/libs/executor/src/exchangeoperator.c b/source/libs/executor/src/exchangeoperator.c
index b01a4b7871..d8c85c5ffb 100644
--- a/source/libs/executor/src/exchangeoperator.c
+++ b/source/libs/executor/src/exchangeoperator.c
@@ -181,10 +181,17 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
return NULL;
}
- size_t size = taosArrayGetSize(pExchangeInfo->pResultBlockList);
- if (size == 0 || pExchangeInfo->rspBlockIndex >= size) {
- pExchangeInfo->rspBlockIndex = 0;
- taosArrayClearEx(pExchangeInfo->pResultBlockList, freeBlock);
+ // we have buffered retrieved datablock, return it directly
+ SSDataBlock* p = NULL;
+ if (taosArrayGetSize(pExchangeInfo->pResultBlockList) > 0) {
+ p = taosArrayGetP(pExchangeInfo->pResultBlockList, 0);
+ taosArrayRemove(pExchangeInfo->pResultBlockList, 0);
+ }
+
+ if (p != NULL) {
+ taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+ return p;
+ } else {
if (pExchangeInfo->seqLoadData) {
seqLoadRemoteData(pOperator);
} else {
@@ -193,11 +200,13 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
if (taosArrayGetSize(pExchangeInfo->pResultBlockList) == 0) {
return NULL;
+ } else {
+ p = taosArrayGetP(pExchangeInfo->pResultBlockList, 0);
+ taosArrayRemove(pExchangeInfo->pResultBlockList, 0);
+ taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+ return p;
}
}
-
- // we have buffered retrieved datablock, return it directly
- return taosArrayGetP(pExchangeInfo->pResultBlockList, pExchangeInfo->rspBlockIndex++);
}
static SSDataBlock* doLoadRemoteData(SOperatorInfo* pOperator) {
@@ -295,7 +304,8 @@ SOperatorInfo* createExchangeOperatorInfo(void* pTransporter, SExchangePhysiNode
tsem_init(&pInfo->ready, 0, 0);
pInfo->pDummyBlock = createResDataBlock(pExNode->node.pOutputDataBlockDesc);
- pInfo->pResultBlockList = taosArrayInit(1, POINTER_BYTES);
+ pInfo->pResultBlockList = taosArrayInit(64, POINTER_BYTES);
+ pInfo->pRecycledBlocks = taosArrayInit(64, POINTER_BYTES);
SExchangeOpStopInfo stopInfo = {QUERY_NODE_PHYSICAL_PLAN_EXCHANGE, pInfo->self};
qAppendTaskStopInfo(pTaskInfo, &stopInfo);
@@ -342,10 +352,8 @@ void doDestroyExchangeOperatorInfo(void* param) {
taosArrayDestroy(pExInfo->pSources);
taosArrayDestroyEx(pExInfo->pSourceDataInfo, freeSourceDataInfo);
- if (pExInfo->pResultBlockList != NULL) {
- taosArrayDestroyEx(pExInfo->pResultBlockList, freeBlock);
- pExInfo->pResultBlockList = NULL;
- }
+ taosArrayDestroyEx(pExInfo->pResultBlockList, freeBlock);
+ taosArrayDestroyEx(pExInfo->pRecycledBlocks, freeBlock);
blockDataDestroy(pExInfo->pDummyBlock);
@@ -638,6 +646,7 @@ int32_t seqLoadRemoteData(SOperatorInfo* pOperator) {
SRetrieveTableRsp* pRsp = pDataInfo->pRsp;
SLoadRemoteDataInfo* pLoadInfo = &pExchangeInfo->loadInfo;
+
if (pRsp->numOfRows == 0) {
qDebug("%s vgId:%d, taskID:0x%" PRIx64 " execId:%d %d of total completed, rowsOfSource:%" PRIu64
", totalRows:%" PRIu64 " try next",
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index d1046ff02c..65937ae1bc 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -290,7 +290,7 @@ int32_t isQualifiedTable(STableKeyInfo* info, SNode* pTagCond, void* metaHandle,
SMetaReader mr = {0};
metaReaderInit(&mr, metaHandle, 0);
- code = metaGetTableEntryByUid(&mr, info->uid);
+ code = metaGetTableEntryByUidCache(&mr, info->uid);
if (TSDB_CODE_SUCCESS != code) {
metaReaderClear(&mr);
*pQualified = false;
@@ -405,7 +405,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, int64_t suid, SArray*
terrno = TSDB_CODE_OUT_OF_MEMORY;
goto end;
}
- ctx.index = 0;
+
ctx.cInfoList = taosArrayInit(4, sizeof(SColumnInfo));
if (ctx.cInfoList == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -421,7 +421,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, int64_t suid, SArray*
}
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
- SColumnInfoData colInfo = {0, {0}};
+ SColumnInfoData colInfo = {0};
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
blockDataAppendColInfo(pResBlock, &colInfo);
}
@@ -582,7 +582,7 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
}
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
- SColumnInfoData colInfo = {0, {0}};
+ SColumnInfoData colInfo = {0};
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
blockDataAppendColInfo(pResBlock, &colInfo);
}
@@ -964,67 +964,132 @@ static int32_t optimizeTbnameInCondImpl(void* metaHandle, int64_t suid, SArray*
return -1;
}
+static void genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
+ if (pTagCond == NULL) {
+ return;
+ }
+
+ char* payload = NULL;
+ int32_t len = 0;
+ nodesNodeToMsg(pTagCond, &payload, &len);
+
+ tMD5Init(pContext);
+ tMD5Update(pContext, (uint8_t*)payload, (uint32_t)len);
+ tMD5Final(pContext);
+
+ taosMemoryFree(payload);
+}
+
+static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* res, SNode* pTagCond, void* metaHandle) {
+ if (pTagCond == NULL) {
+ return TSDB_CODE_SUCCESS;
+ }
+
+ terrno = TDB_CODE_SUCCESS;
+ SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->suid, res, pTagCond);
+ if (terrno != TDB_CODE_SUCCESS) {
+ colDataDestroy(pColInfoData);
+ taosMemoryFreeClear(pColInfoData);
+ taosArrayDestroy(res);
+ qError("failed to getColInfoResult, code: %s", tstrerror(terrno));
+ return terrno;
+ }
+
+ int32_t i = 0;
+ int32_t len = taosArrayGetSize(res);
+
+ if (pColInfoData != NULL) {
+ bool* pResult = (bool*)pColInfoData->pData;
+ SArray* p = taosArrayInit(taosArrayGetSize(res), sizeof(uint64_t));
+
+ while (i < len && pColInfoData) {
+ int64_t* uid = taosArrayGet(res, i);
+ qDebug("tagfilter get uid:%" PRId64 ", res:%d", *uid, pResult[i]);
+
+ if (pResult[i]) {
+ taosArrayPush(p, uid);
+ }
+ i += 1;
+ }
+
+ taosArraySwap(res, p);
+ taosArrayDestroy(p);
+ }
+
+ colDataDestroy(pColInfoData);
+ taosMemoryFreeClear(pColInfoData);
+
+ return TSDB_CODE_SUCCESS;
+}
+
int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, SNode* pTagIndexCond,
STableListInfo* pListInfo) {
int32_t code = TSDB_CODE_SUCCESS;
+ size_t numOfTables = 0;
uint64_t tableUid = pScanNode->uid;
pListInfo->suid = pScanNode->suid;
SArray* res = taosArrayInit(8, sizeof(uint64_t));
- if (pScanNode->tableType == TSDB_SUPER_TABLE) {
- if (pTagIndexCond) {
- SIndexMetaArg metaArg = {
- .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
-
- // int64_t stt = taosGetTimestampUs();
- SIdxFltStatus status = SFLT_NOT_INDEX;
- code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
- if (code != 0 || status == SFLT_NOT_INDEX) {
- qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
- code = TDB_CODE_SUCCESS;
- }
- } else if (!pTagCond) {
- vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
- }
- } else { // Create one table group.
+ if (pScanNode->tableType != TSDB_SUPER_TABLE) {
if (metaIsTableExist(metaHandle, tableUid)) {
taosArrayPush(res, &tableUid);
}
- }
- if (pTagCond) {
- terrno = TDB_CODE_SUCCESS;
- SColumnInfoData* pColInfoData = getColInfoResult(metaHandle, pListInfo->suid, res, pTagCond);
- if (terrno != TDB_CODE_SUCCESS) {
- colDataDestroy(pColInfoData);
- taosMemoryFreeClear(pColInfoData);
- taosArrayDestroy(res);
- qError("failed to getColInfoResult, code: %s", tstrerror(terrno));
- return terrno;
+ code = doFilterByTagCond(pListInfo, res, pTagCond, metaHandle);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
+ } else {
+ // try to retrieve the result from meta cache
+ T_MD5_CTX context = {0};
+ genTagFilterDigest(pTagCond, &context);
+
+ bool acquired = false;
+ metaGetCachedTableUidList(metaHandle, pScanNode->suid, context.digest, tListLen(context.digest), res, &acquired);
+ if (acquired) {
+ qDebug("retrieve table uid list from cache, numOfTables:%d", (int32_t)taosArrayGetSize(res));
+ goto _end;
}
- int32_t i = 0;
- int32_t j = 0;
- int32_t len = taosArrayGetSize(res);
- while (i < taosArrayGetSize(res) && j < len && pColInfoData) {
- void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes);
+ if (!pTagCond) { // no tag condition exists, let's fetch all tables of this super table
+ ASSERT(pTagIndexCond == NULL);
+ vnodeGetCtbIdList(pVnode, pScanNode->suid, res);
+ } else {
+ // failed to find the result in the cache, let try to calculate the results
+ if (pTagIndexCond) {
+ SIndexMetaArg metaArg = {
+ .metaEx = metaHandle, .idx = tsdbGetIdx(metaHandle), .ivtIdx = tsdbGetIvtIdx(metaHandle), .suid = tableUid};
- int64_t* uid = taosArrayGet(res, i);
- qDebug("tagfilter get uid:%" PRId64 ", res:%d", *uid, *(bool*)var);
- if (*(bool*)var == false) {
- taosArrayRemove(res, i);
- j++;
- continue;
+ SIdxFltStatus status = SFLT_NOT_INDEX;
+ code = doFilterTag(pTagIndexCond, &metaArg, res, &status);
+ if (code != 0 || status == SFLT_NOT_INDEX) {
+ qError("failed to get tableIds from index, reason:%s, suid:%" PRIu64, tstrerror(code), tableUid);
+ code = TDB_CODE_SUCCESS;
+ }
}
- i++;
- j++;
}
- colDataDestroy(pColInfoData);
- taosMemoryFreeClear(pColInfoData);
+
+ code = doFilterByTagCond(pListInfo, res, pTagCond, metaHandle);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
+
+ // let's add the filter results into meta-cache
+ numOfTables = taosArrayGetSize(res);
+ size_t size = numOfTables * sizeof(uint64_t) + sizeof(int32_t);
+ char* pPayload = taosMemoryMalloc(size);
+ *(int32_t*)pPayload = numOfTables;
+
+ if (numOfTables > 0) {
+ memcpy(pPayload + sizeof(int32_t), taosArrayGet(res, 0), numOfTables * sizeof(uint64_t));
+ }
+
+ metaUidFilterCachePut(metaHandle, pScanNode->suid, context.digest, tListLen(context.digest), pPayload, size, 1);
}
- size_t numOfTables = taosArrayGetSize(res);
+_end:
+ numOfTables = taosArrayGetSize(res);
for (int i = 0; i < numOfTables; i++) {
STableKeyInfo info = {.uid = *(uint64_t*)taosArrayGet(res, i), .groupId = 0};
@@ -1034,7 +1099,7 @@ int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode,
return TSDB_CODE_OUT_OF_MEMORY;
}
- qDebug("tagfilter get uid:%" PRIu64 "", info.uid);
+ qTrace("tagfilter get uid:%" PRIu64 "", info.uid);
}
taosArrayDestroy(res);
@@ -1057,7 +1122,7 @@ size_t getTableTagsBufLen(const SNodeList* pGroups) {
int32_t getGroupIdFromTagsVal(void* pMeta, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId) {
SMetaReader mr = {0};
metaReaderInit(&mr, pMeta, 0);
- if (metaGetTableEntryByUid(&mr, uid) != 0) { // table not exist
+ if (metaGetTableEntryByUidCache(&mr, uid) != 0) { // table not exist
metaReaderClear(&mr);
return TSDB_CODE_PAR_TABLE_NOT_EXIST;
}
@@ -1770,7 +1835,7 @@ STableListInfo* tableListCreate() {
goto _error;
}
- pListInfo->map = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
+ pListInfo->map = taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
if (pListInfo->map == NULL) {
goto _error;
}
@@ -1914,13 +1979,15 @@ int32_t createScanTableListInfo(SScanPhysiNode* pScanNode, SNodeList* pGroupTags
return code;
}
+ int32_t numOfTables = taosArrayGetSize(pTableListInfo->pTableList);
ASSERT(pTableListInfo->numOfOuputGroups == 1);
int64_t st1 = taosGetTimestampUs();
pTaskInfo->cost.extractListTime = (st1 - st) / 1000.0;
- qDebug("extract queried table list completed, elapsed time:%.2f ms %s", pTaskInfo->cost.extractListTime, idStr);
+ qDebug("extract queried table list completed, %d tables, elapsed time:%.2f ms %s", numOfTables,
+ pTaskInfo->cost.extractListTime, idStr);
- if (taosArrayGetSize(pTableListInfo->pTableList) == 0) {
+ if (numOfTables == 0) {
qDebug("no table qualified for query, %s" PRIx64, idStr);
return TSDB_CODE_SUCCESS;
}
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index c1974ff30e..9b3bd1d808 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -493,7 +493,7 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds, bo
memcpy(&pTaskInfo->localFetch, pLocal, sizeof(*pLocal));
}
- taosArrayClearEx(pResList, freeBlock);
+ taosArrayClear(pResList);
int64_t curOwner = 0;
if ((curOwner = atomic_val_compare_exchange_64(&pTaskInfo->owner, 0, threadId)) != 0) {
@@ -531,8 +531,20 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds, bo
int64_t st = taosGetTimestampUs();
+ int32_t blockIndex = 0;
while ((pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot)) != NULL) {
- SSDataBlock* p = createOneDataBlock(pRes, true);
+ SSDataBlock* p = NULL;
+ if (blockIndex >= taosArrayGetSize(pTaskInfo->pResultBlockList)) {
+ SSDataBlock* p1 = createOneDataBlock(pRes, true);
+ taosArrayPush(pTaskInfo->pResultBlockList, &p1);
+ p = p1;
+ } else {
+ p = *(SSDataBlock**) taosArrayGet(pTaskInfo->pResultBlockList, blockIndex);
+ copyDataBlock(p, pRes);
+ }
+
+ blockIndex += 1;
+
current += p->info.rows;
ASSERT(p->info.rows > 0);
taosArrayPush(pResList, &p);
@@ -560,6 +572,18 @@ int32_t qExecTaskOpt(qTaskInfo_t tinfo, SArray* pResList, uint64_t* useconds, bo
return pTaskInfo->code;
}
+void qCleanExecTaskBlockBuf(qTaskInfo_t tinfo) {
+ SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)tinfo;
+ SArray* pList = pTaskInfo->pResultBlockList;
+ size_t num = taosArrayGetSize(pList);
+ for(int32_t i = 0; i < num; ++i) {
+ SSDataBlock** p = taosArrayGet(pTaskInfo->pResultBlockList, i);
+ blockDataDestroy(*p);
+ }
+
+ taosArrayClear(pTaskInfo->pResultBlockList);
+}
+
int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t* useconds) {
SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)tinfo;
int64_t threadId = taosGetSelfPthreadId();
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 1f0ccf02ce..5dbd728cce 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -82,12 +82,17 @@ static void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExpr, SSDataBlock*
static void releaseQueryBuf(size_t numOfTables);
-static void destroyFillOperatorInfo(void* param);
-static void destroyProjectOperatorInfo(void* param);
-static void destroySortOperatorInfo(void* param);
-static void destroyAggOperatorInfo(void* param);
-
-static void destroyIntervalOperatorInfo(void* param);
+static void destroyFillOperatorInfo(void* param);
+static void destroyAggOperatorInfo(void* param);
+static void initCtxOutputBuffer(SqlFunctionCtx* pCtx, int32_t size);
+static void doSetTableGroupOutputBuf(SOperatorInfo* pOperator, int32_t numOfOutput, uint64_t groupId);
+static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag);
+static int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t numOfOutput, size_t keyBufSize,
+ const char* pKey);
+static void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoData* p, bool keep,
+ int32_t status);
+static int32_t doSetInputDataBlock(SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t order, int32_t scanFlag,
+ bool createDummyCol);
void setOperatorCompleted(SOperatorInfo* pOperator) {
pOperator->status = OP_EXEC_DONE;
@@ -129,9 +134,6 @@ SOperatorFpSet createOperatorFpSet(__optr_open_fn_t openFn, __optr_fn_t nextFn,
static int32_t doCopyToSDataBlock(SExecTaskInfo* pTaskInfo, SSDataBlock* pBlock, SExprSupp* pSup, SDiskbasedBuf* pBuf,
SGroupResInfo* pGroupResInfo);
-static void initCtxOutputBuffer(SqlFunctionCtx* pCtx, int32_t size);
-static void doSetTableGroupOutputBuf(SOperatorInfo* pOperator, int32_t numOfOutput, uint64_t groupId);
-
SResultRow* getNewResultRow(SDiskbasedBuf* pResultBuf, int32_t* currentPageId, int32_t interBufSize) {
SFilePage* pData = NULL;
@@ -244,7 +246,7 @@ static int32_t addNewWindowResultBuf(SResultRow* pWindowRes, SDiskbasedBuf* pRes
// in the first scan, new space needed for results
int32_t pageId = -1;
- SIDList list = getDataBufPagesIdList(pResultBuf);
+ SArray* list = getDataBufPagesIdList(pResultBuf);
if (taosArrayGetSize(list) == 0) {
pData = getNewBufPage(pResultBuf, &pageId);
@@ -303,13 +305,13 @@ typedef struct {
} SFunctionCtxStatus;
static void functionCtxSave(SqlFunctionCtx* pCtx, SFunctionCtxStatus* pStatus) {
- pStatus->hasAgg = pCtx->input.colDataAggIsSet;
+ pStatus->hasAgg = pCtx->input.colDataSMAIsSet;
pStatus->numOfRows = pCtx->input.numOfRows;
pStatus->startOffset = pCtx->input.startRowIndex;
}
static void functionCtxRestore(SqlFunctionCtx* pCtx, SFunctionCtxStatus* pStatus) {
- pCtx->input.colDataAggIsSet = pStatus->hasAgg;
+ pCtx->input.colDataSMAIsSet = pStatus->hasAgg;
pCtx->input.numOfRows = pStatus->numOfRows;
pCtx->input.startRowIndex = pStatus->startOffset;
}
@@ -326,8 +328,8 @@ void doApplyFunctions(SExecTaskInfo* taskInfo, SqlFunctionCtx* pCtx, SColumnInfo
// not a whole block involved in query processing, statistics data can not be used
// NOTE: the original value of isSet have been changed here
- if (pCtx[k].input.colDataAggIsSet && forwardStep < numOfTotal) {
- pCtx[k].input.colDataAggIsSet = false;
+ if (pCtx[k].input.colDataSMAIsSet && forwardStep < numOfTotal) {
+ pCtx[k].input.colDataSMAIsSet = false;
}
if (fmIsWindowPseudoColumnFunc(pCtx[k].functionId)) {
@@ -362,9 +364,6 @@ void doApplyFunctions(SExecTaskInfo* taskInfo, SqlFunctionCtx* pCtx, SColumnInfo
}
}
-static int32_t doSetInputDataBlock(SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t order, int32_t scanFlag,
- bool createDummyCol);
-
static void doSetInputDataBlockInfo(SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t order) {
SqlFunctionCtx* pCtx = pExprSup->pCtx;
for (int32_t i = 0; i < pExprSup->numOfExprs; ++i) {
@@ -440,7 +439,7 @@ static int32_t doSetInputDataBlock(SExprSupp* pExprSup, SSDataBlock* pBlock, int
SInputColumnInfoData* pInput = &pCtx[i].input;
pInput->uid = pBlock->info.uid;
- pInput->colDataAggIsSet = false;
+ pInput->colDataSMAIsSet = false;
SExprInfo* pOneExpr = &pExprSup->pExprInfo[i];
for (int32_t j = 0; j < pOneExpr->base.numOfParams; ++j) {
@@ -756,7 +755,7 @@ void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExprInfo, SSDataBlock* pB
pInput->totalRows = numOfRows;
if (pBlock->pBlockAgg != NULL) {
- pInput->colDataAggIsSet = true;
+ pInput->colDataSMAIsSet = true;
for (int32_t j = 0; j < pExprInfo->base.numOfParams; ++j) {
SFunctParam* pFuncParam = &pExprInfo->base.pParam[j];
@@ -765,7 +764,7 @@ void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExprInfo, SSDataBlock* pB
int32_t slotId = pFuncParam->pCol->slotId;
pInput->pColumnDataAgg[j] = pBlock->pBlockAgg[slotId];
if (pInput->pColumnDataAgg[j] == NULL) {
- pInput->colDataAggIsSet = false;
+ pInput->colDataSMAIsSet = false;
}
// Here we set the column info data since the data type for each column data is required, but
@@ -776,7 +775,7 @@ void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExprInfo, SSDataBlock* pB
}
}
} else {
- pInput->colDataAggIsSet = false;
+ pInput->colDataSMAIsSet = false;
}
}
@@ -996,9 +995,6 @@ void setResultRowInitCtx(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t numO
}
}
-static void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoData* p, bool keep,
- int32_t status);
-
void doFilter(SSDataBlock* pBlock, SFilterInfo* pFilterInfo, SColMatchInfo* pColMatchInfo) {
if (pFilterInfo == NULL || pBlock->info.rows == 0) {
return;
@@ -1564,9 +1560,6 @@ int32_t appendDownstream(SOperatorInfo* p, SOperatorInfo** pDownstream, int32_t
return TSDB_CODE_SUCCESS;
}
-static int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t numOfOutput, size_t keyBufSize,
- const char* pKey);
-
int32_t getTableScanInfo(SOperatorInfo* pOperator, int32_t* order, int32_t* scanFlag) {
// todo add more information about exchange operation
int32_t type = pOperator->operatorType;
@@ -1725,11 +1718,16 @@ static int32_t doOpenAggregateOptr(SOperatorInfo* pOperator) {
}
+ // the downstream operator may return with error code, so let's check the code before generating results.
+ if (pTaskInfo->code != TSDB_CODE_SUCCESS) {
+ T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+ }
+
initGroupedResultInfo(&pAggInfo->groupResInfo, pAggInfo->aggSup.pResultRowHashTable, 0);
OPTR_SET_OPENED(pOperator);
pOperator->cost.openCost = (taosGetTimestampUs() - st) / 1000.0;
- return TSDB_CODE_SUCCESS;
+ return pTaskInfo->code;
}
static SSDataBlock* getAggregateResult(SOperatorInfo* pOperator) {
@@ -1768,7 +1766,6 @@ static SSDataBlock* getAggregateResult(SOperatorInfo* pOperator) {
return (rows == 0) ? NULL : pInfo->pRes;
}
-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;
@@ -2387,6 +2384,7 @@ static SExecTaskInfo* createExecTaskInfo(uint64_t queryId, uint64_t taskId, EOPT
pTaskInfo->execModel = model;
pTaskInfo->pTableInfoList = tableListCreate();
pTaskInfo->stopInfo.pStopInfo = taosArrayInit(4, sizeof(SExchangeOpStopInfo));
+ pTaskInfo->pResultBlockList = taosArrayInit(128, POINTER_BYTES);
char* p = taosMemoryCalloc(1, 128);
snprintf(p, 128, "TID:0x%" PRIx64 " QID:0x%" PRIx64, taskId, queryId);
@@ -2400,7 +2398,7 @@ SSchemaWrapper* extractQueriedColumnSchema(SScanPhysiNode* pScanNode);
int32_t extractTableSchemaInfo(SReadHandle* pHandle, SScanPhysiNode* pScanNode, SExecTaskInfo* pTaskInfo) {
SMetaReader mr = {0};
metaReaderInit(&mr, pHandle->meta, 0);
- int32_t code = metaGetTableEntryByUid(&mr, pScanNode->uid);
+ int32_t code = metaGetTableEntryByUidCache(&mr, pScanNode->uid);
if (code != TSDB_CODE_SUCCESS) {
qError("failed to get the table meta, uid:0x%" PRIx64 ", suid:0x%" PRIx64 ", %s", pScanNode->uid, pScanNode->suid,
GET_TASKID(pTaskInfo));
@@ -2419,7 +2417,7 @@ int32_t extractTableSchemaInfo(SReadHandle* pHandle, SScanPhysiNode* pScanNode,
tDecoderClear(&mr.coder);
tb_uid_t suid = mr.me.ctbEntry.suid;
- metaGetTableEntryByUid(&mr, suid);
+ metaGetTableEntryByUidCache(&mr, suid);
pSchemaInfo->sw = tCloneSSchemaWrapper(&mr.me.stbEntry.schemaRow);
pSchemaInfo->tversion = mr.me.stbEntry.schemaTag.version;
} else {
@@ -2988,6 +2986,11 @@ _complete:
return terrno;
}
+static void freeBlock(void* pParam) {
+ SSDataBlock* pBlock = *(SSDataBlock**)pParam;
+ blockDataDestroy(pBlock);
+}
+
void doDestroyTask(SExecTaskInfo* pTaskInfo) {
qDebug("%s execTask is freed", GET_TASKID(pTaskInfo));
@@ -3000,6 +3003,7 @@ void doDestroyTask(SExecTaskInfo* pTaskInfo) {
nodesDestroyNode((SNode*)pTaskInfo->pSubplan);
}
+ taosArrayDestroyEx(pTaskInfo->pResultBlockList, freeBlock);
taosArrayDestroy(pTaskInfo->stopInfo.pStopInfo);
taosMemoryFreeClear(pTaskInfo->sql);
taosMemoryFreeClear(pTaskInfo->id.str);
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index cde8346487..8fd37c3b14 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -274,10 +274,9 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
// return;
// }
- int32_t len = 0;
- STimeWindow w = TSWINDOW_INITIALIZER;
-
+ int32_t len = 0;
terrno = TSDB_CODE_SUCCESS;
+
int32_t num = 0;
for (int32_t j = 0; j < pBlock->info.rows; ++j) {
// Compare with the previous row of this column, and do not set the output buffer again if they are identical.
@@ -915,33 +914,39 @@ static SSDataBlock* buildStreamPartitionResult(SOperatorInfo* pOperator) {
}
pDest->info.rows++;
if (pInfo->tbnameCalSup.numOfExprs > 0 && i == 0) {
- SSDataBlock* pTmpBlock = blockCopyOneRow(pSrc, rowIndex);
- SSDataBlock* pResBlock = createDataBlock();
- pResBlock->info.rowSize = TSDB_TABLE_NAME_LEN;
- SColumnInfoData data = createColumnInfoData(TSDB_DATA_TYPE_VARCHAR, TSDB_TABLE_NAME_LEN, 0);
- taosArrayPush(pResBlock->pDataBlock, &data);
- blockDataEnsureCapacity(pResBlock, 1);
- projectApplyFunctions(pInfo->tbnameCalSup.pExprInfo, pResBlock, pTmpBlock, pInfo->tbnameCalSup.pCtx, 1, NULL);
- ASSERT(pResBlock->info.rows == 1);
- ASSERT(taosArrayGetSize(pResBlock->pDataBlock) == 1);
- SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, 0);
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_VARCHAR);
- void* pData = colDataGetVarData(pCol, 0);
- // TODO check tbname validity
- if (pData != (void*)-1) {
- memset(pDest->info.parTbName, 0, TSDB_TABLE_NAME_LEN);
- int32_t len = TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN - 1);
- memcpy(pDest->info.parTbName, varDataVal(pData), len);
- /*pDest->info.parTbName[len + 1] = 0;*/
+ void* tbname = NULL;
+ if (streamStateGetParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, &tbname) == 0) {
+ memcpy(pDest->info.parTbName, tbname, TSDB_TABLE_NAME_LEN);
+ tdbFree(tbname);
} else {
- pDest->info.parTbName[0] = 0;
+ SSDataBlock* pTmpBlock = blockCopyOneRow(pSrc, rowIndex);
+ SSDataBlock* pResBlock = createDataBlock();
+ pResBlock->info.rowSize = TSDB_TABLE_NAME_LEN;
+ SColumnInfoData data = createColumnInfoData(TSDB_DATA_TYPE_VARCHAR, TSDB_TABLE_NAME_LEN, 0);
+ taosArrayPush(pResBlock->pDataBlock, &data);
+ blockDataEnsureCapacity(pResBlock, 1);
+ projectApplyFunctions(pInfo->tbnameCalSup.pExprInfo, pResBlock, pTmpBlock, pInfo->tbnameCalSup.pCtx, 1, NULL);
+ ASSERT(pResBlock->info.rows == 1);
+ ASSERT(taosArrayGetSize(pResBlock->pDataBlock) == 1);
+ SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, 0);
+ ASSERT(pCol->info.type == TSDB_DATA_TYPE_VARCHAR);
+ void* pData = colDataGetVarData(pCol, 0);
+ // TODO check tbname validity
+ if (pData != (void*)-1) {
+ memset(pDest->info.parTbName, 0, TSDB_TABLE_NAME_LEN);
+ int32_t len = TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN - 1);
+ memcpy(pDest->info.parTbName, varDataVal(pData), len);
+ /*pDest->info.parTbName[len + 1] = 0;*/
+ } else {
+ pDest->info.parTbName[0] = 0;
+ }
+ if (pParInfo->groupId && pDest->info.parTbName[0]) {
+ streamStatePutParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, pDest->info.parTbName);
+ }
+ /*printf("\n\n set name %s\n\n", pDest->info.parTbName);*/
+ blockDataDestroy(pTmpBlock);
+ blockDataDestroy(pResBlock);
}
- if (pParInfo->groupId && pDest->info.parTbName[0]) {
- streamStatePutParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, pDest->info.parTbName);
- }
- /*printf("\n\n set name %s\n\n", pDest->info.parTbName);*/
- blockDataDestroy(pTmpBlock);
- blockDataDestroy(pResBlock);
}
}
taosArrayDestroy(pParInfo->rowIds);
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 8db450ad50..7988c555e9 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -163,8 +163,8 @@ static SResultRow* getTableGroupOutputBuf(SOperatorInfo* pOperator, uint64_t gro
STableScanInfo* pTableScanInfo = pOperator->info;
- SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pTableScanInfo->base.pdInfo.pAggSup->pResultRowHashTable, buf,
- GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
+ SResultRowPosition* p1 = (SResultRowPosition*)tSimpleHashGet(pTableScanInfo->base.pdInfo.pAggSup->pResultRowHashTable,
+ buf, GET_RES_WINDOW_KEY_LEN(sizeof(groupId)));
if (p1 == NULL) {
return NULL;
@@ -306,7 +306,7 @@ void applyLimitOffset(SLimitInfo* pLimitInfo, SSDataBlock* pBlock, SExecTaskInfo
static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableScanInfo, SSDataBlock* pBlock,
uint32_t* status) {
- SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+ SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SFileBlockLoadRecorder* pCost = &pTableScanInfo->readRecorder;
pCost->totalBlocks += 1;
@@ -484,7 +484,7 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int
// 1. check if it is existed in meta cache
if (pCache == NULL) {
metaReaderInit(&mr, pHandle->meta, 0);
- code = metaGetTableEntryByUid(&mr, pBlock->info.uid);
+ code = metaGetTableEntryByUidCache(&mr, pBlock->info.uid);
if (code != TSDB_CODE_SUCCESS) {
if (terrno == TSDB_CODE_PAR_TABLE_NOT_EXIST) {
qWarn("failed to get table meta, table may have been dropped, uid:0x%" PRIx64 ", code:%s, %s", pBlock->info.uid,
@@ -508,7 +508,7 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int
h = taosLRUCacheLookup(pCache->pTableMetaEntryCache, &pBlock->info.uid, sizeof(pBlock->info.uid));
if (h == NULL) {
metaReaderInit(&mr, pHandle->meta, 0);
- code = metaGetTableEntryByUid(&mr, pBlock->info.uid);
+ code = metaGetTableEntryByUidCache(&mr, pBlock->info.uid);
if (code != TSDB_CODE_SUCCESS) {
if (terrno == TSDB_CODE_PAR_TABLE_NOT_EXIST) {
qWarn("failed to get table meta, table may have been dropped, uid:0x%" PRIx64 ", code:%s, %s",
@@ -1312,6 +1312,7 @@ static int32_t generateDeleteResultBlock(SStreamScanInfo* pInfo, SSDataBlock* pS
memcpy(varDataVal(tbname), parTbname, TSDB_TABLE_NAME_LEN);
varDataSetLen(tbname, strlen(varDataVal(tbname)));
+ tdbFree(parTbname);
}
appendOneRowToStreamSpecialBlock(pDestBlock, srcStartTsCol + i, srcEndTsCol + i, srcUidData + i, &groupId,
tbname[0] == 0 ? NULL : tbname);
@@ -1510,10 +1511,14 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
if (pInfo->numOfPseudoExpr > 0) {
int32_t code = addTagPseudoColumnData(&pInfo->readHandle, pInfo->pPseudoExpr, pInfo->numOfPseudoExpr, pInfo->pRes,
pInfo->pRes->info.rows, GET_TASKID(pTaskInfo), NULL);
- if (code != TSDB_CODE_SUCCESS) {
+ // ignore the table not exists error, since this table may have been dropped during the scan procedure.
+ if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_PAR_TABLE_NOT_EXIST) {
blockDataFreeRes((SSDataBlock*)pBlock);
T_LONG_JMP(pTaskInfo->env, code);
}
+
+ // reset the error code.
+ terrno = 0;
}
if (filter) {
@@ -1928,6 +1933,7 @@ FETCH_NEXT_BLOCK:
if (pInfo->validBlockIndex >= totBlockNum) {
updateInfoDestoryColseWinSBF(pInfo->pUpdateInfo);
doClearBufferedBlocks(pInfo);
+ qDebug("stream scan return empty, consume block %d", totBlockNum);
return NULL;
}
@@ -2562,7 +2568,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
uint32_t status = 0;
loadDataBlock(pOperator, &pTableScanInfo->base, pBlock, &status);
-// code = loadDataBlockFromOneTable(pOperator, pTableScanInfo, pBlock, &status);
+ // code = loadDataBlockFromOneTable(pOperator, pTableScanInfo, pBlock, &status);
if (code != TSDB_CODE_SUCCESS) {
T_LONG_JMP(pTaskInfo->env, code);
}
@@ -2893,7 +2899,6 @@ SOperatorInfo* createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanN
goto _error;
}
-
initResultSizeInfo(&pOperator->resultInfo, 1024);
pInfo->pResBlock = createResDataBlock(pDescNode);
blockDataEnsureCapacity(pInfo->pResBlock, pOperator->resultInfo.capacity);
diff --git a/source/libs/executor/src/sortoperator.c b/source/libs/executor/src/sortoperator.c
index 6201dfc9cb..02cd0fe696 100644
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
@@ -551,6 +551,7 @@ typedef struct SMultiwayMergeOperatorInfo {
SSortHandle* pSortHandle;
SColMatchInfo matchInfo;
SSDataBlock* pInputBlock;
+ SSDataBlock* pIntermediateBlock; // to hold the intermediate result
int64_t startTs; // sort start time
bool groupSort;
bool hasGroupId;
@@ -651,12 +652,19 @@ SSDataBlock* getMultiwaySortedBlockData(SSortHandle* pHandle, SSDataBlock* pData
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
blockDataCleanup(pDataBlock);
- SSDataBlock* p = tsortGetSortedDataBlock(pHandle);
- if (p == NULL) {
- return NULL;
+ if (pInfo->pIntermediateBlock == NULL) {
+ pInfo->pIntermediateBlock = tsortGetSortedDataBlock(pHandle);
+ if (pInfo->pIntermediateBlock == NULL) {
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ return NULL;
+ }
+ blockDataEnsureCapacity(pInfo->pIntermediateBlock, capacity);
+ } else {
+ blockDataCleanup(pInfo->pIntermediateBlock);
}
- blockDataEnsureCapacity(p, capacity);
+ SSDataBlock* p = pInfo->pIntermediateBlock;
+
while (1) {
doGetSortedBlockData(pInfo, pHandle, capacity, p);
if (p->info.rows == 0) {
@@ -686,7 +694,6 @@ SSDataBlock* getMultiwaySortedBlockData(SSortHandle* pHandle, SSDataBlock* pData
pDataBlock->info.groupId = pInfo->groupId;
}
- blockDataDestroy(p);
qDebug("%s get sorted block, groupId:0x%" PRIx64 " rows:%d", GET_TASKID(pTaskInfo), pDataBlock->info.groupId,
pDataBlock->info.rows);
@@ -722,6 +729,7 @@ void destroyMultiwayMergeOperatorInfo(void* param) {
SMultiwayMergeOperatorInfo* pInfo = (SMultiwayMergeOperatorInfo*)param;
pInfo->binfo.pRes = blockDataDestroy(pInfo->binfo.pRes);
pInfo->pInputBlock = blockDataDestroy(pInfo->pInputBlock);
+ pInfo->pIntermediateBlock = blockDataDestroy(pInfo->pIntermediateBlock);
tsortDestroySortHandle(pInfo->pSortHandle);
taosArrayDestroy(pInfo->pSortInfo);
@@ -732,12 +740,13 @@ void destroyMultiwayMergeOperatorInfo(void* param) {
int32_t getMultiwayMergeExplainExecInfo(SOperatorInfo* pOptr, void** pOptrExplain, uint32_t* len) {
ASSERT(pOptr != NULL);
- SSortExecInfo* pInfo = taosMemoryCalloc(1, sizeof(SSortExecInfo));
+ SSortExecInfo* pSortExecInfo = taosMemoryCalloc(1, sizeof(SSortExecInfo));
- SMultiwayMergeOperatorInfo* pOperatorInfo = (SMultiwayMergeOperatorInfo*)pOptr->info;
+ SMultiwayMergeOperatorInfo* pInfo = (SMultiwayMergeOperatorInfo*)pOptr->info;
+
+ *pSortExecInfo = tsortGetSortExecInfo(pInfo->pSortHandle);
+ *pOptrExplain = pSortExecInfo;
- *pInfo = tsortGetSortExecInfo(pOperatorInfo->pSortHandle);
- *pOptrExplain = pInfo;
*len = sizeof(SSortExecInfo);
return TSDB_CODE_SUCCESS;
}
diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index c5e1f2c214..eea2549a42 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -441,6 +441,9 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
int32_t code = metaGetTableEntryByName(&smrChildTable, condTableName);
if (code != TSDB_CODE_SUCCESS) {
// terrno has been set by metaGetTableEntryByName, therefore, return directly
+ metaReaderClear(&smrChildTable);
+ blockDataDestroy(dataBlock);
+ pInfo->loadInfo.totalRows = 0;
return NULL;
}
@@ -456,12 +459,16 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
code = metaGetTableEntryByUid(&smrSuperTable, smrChildTable.me.ctbEntry.suid);
if (code != TSDB_CODE_SUCCESS) {
// terrno has been set by metaGetTableEntryByUid
+ metaReaderClear(&smrSuperTable);
+ metaReaderClear(&smrChildTable);
+ blockDataDestroy(dataBlock);
return NULL;
}
sysTableUserTagsFillOneTableTags(pInfo, &smrSuperTable, &smrChildTable, dbname, tableName, &numOfRows, dataBlock);
metaReaderClear(&smrSuperTable);
metaReaderClear(&smrChildTable);
+
if (numOfRows > 0) {
relocateAndFilterSysTagsScanResult(pInfo, numOfRows, dataBlock, pOperator->exprSupp.pFilterInfo);
numOfRows = 0;
diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c
index 9908f35818..7674b9e479 100644
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
@@ -762,12 +762,10 @@ void getCurWindowFromDiscBuf(SOperatorInfo* pOperator, TSKEY ts, uint64_t groupI
resetPrevAndNextWindow(pFillSup, pState);
SWinKey key = {.ts = ts, .groupId = groupId};
- // void* curVal = NULL;
int32_t curVLen = 0;
int32_t code = streamStateFillGet(pState, &key, (void**)&pFillSup->cur.pRowVal, &curVLen);
ASSERT(code == TSDB_CODE_SUCCESS);
pFillSup->cur.key = key.ts;
- // pFillSup->cur.pRowVal = curVal;
}
void getWindowFromDiscBuf(SOperatorInfo* pOperator, TSKEY ts, uint64_t groupId, SStreamFillSupporter* pFillSup) {
@@ -952,6 +950,19 @@ void setDeleteFillValueInfo(TSKEY start, TSKEY end, SStreamFillSupporter* pFillS
}
}
+void copyNotFillExpData(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo) {
+ for (int32_t i = pFillSup->numOfFillCols; i < pFillSup->numOfAllCols; ++i) {
+ SFillColInfo* pFillCol = pFillSup->pAllColInfo + i;
+ int32_t slotId = GET_DEST_SLOT_ID(pFillCol);
+ SResultCellData* pCell = getResultCell(pFillInfo->pResRow, slotId);
+ SResultCellData* pCurCell = getResultCell(&pFillSup->cur, slotId);
+ pCell->isNull = pCurCell->isNull;
+ if (!pCurCell->isNull) {
+ memcpy(pCell->pData, pCurCell->pData, pCell->bytes);
+ }
+ }
+}
+
void setFillValueInfo(SSDataBlock* pBlock, TSKEY ts, int32_t rowId, SStreamFillSupporter* pFillSup,
SStreamFillInfo* pFillInfo) {
pFillInfo->preRowKey = pFillSup->cur.key;
@@ -993,6 +1004,7 @@ void setFillValueInfo(SSDataBlock* pBlock, TSKEY ts, int32_t rowId, SStreamFillS
setFillKeyInfo(ts, nextWKey, &pFillSup->interval, pFillInfo);
pFillInfo->pos = FILL_POS_START;
}
+ copyNotFillExpData(pFillSup, pFillInfo);
} break;
case TSDB_FILL_PREV: {
if (hasNextWindow(pFillSup) && ((pFillSup->next.key != pFillInfo->nextRowKey) ||
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 1c31b550c6..e0a0b9442e 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -801,7 +801,7 @@ STupleHandle* tsortNextTuple(SSortHandle* pHandle) {
index = tMergeTreeGetChosenIndex(pHandle->pMergeTree);
pSource = pHandle->cmpParam.pSources[index];
- assert(pSource->src.pBlock != NULL);
+ ASSERT(pSource->src.pBlock != NULL);
pHandle->tupleHandle.rowIndex = pSource->src.rowIndex;
pHandle->tupleHandle.pBlock = pSource->src.pBlock;
@@ -831,14 +831,19 @@ uint64_t tsortGetGroupId(STupleHandle* pVHandle) { return pVHandle->pBlock->info
SSortExecInfo tsortGetSortExecInfo(SSortHandle* pHandle) {
SSortExecInfo info = {0};
- info.sortBuffer = pHandle->pageSize * pHandle->numOfPages;
- info.sortMethod = pHandle->inMemSort ? SORT_QSORT_T : SORT_SPILLED_MERGE_SORT_T;
- info.loops = pHandle->loops;
+ if (pHandle == NULL) {
+ info.sortMethod = SORT_QSORT_T; // by default
+ info.sortBuffer = 2 * 1048576; // 2mb by default
+ } else {
+ info.sortBuffer = pHandle->pageSize * pHandle->numOfPages;
+ info.sortMethod = pHandle->inMemSort ? SORT_QSORT_T : SORT_SPILLED_MERGE_SORT_T;
+ info.loops = pHandle->loops;
- if (pHandle->pBuf != NULL) {
- SDiskbasedBufStatis st = getDBufStatis(pHandle->pBuf);
- info.writeBytes = st.flushBytes;
- info.readBytes = st.loadBytes;
+ if (pHandle->pBuf != NULL) {
+ SDiskbasedBufStatis st = getDBufStatis(pHandle->pBuf);
+ info.writeBytes = st.flushBytes;
+ info.readBytes = st.loadBytes;
+ }
}
return info;
diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index fa241dc6ef..9d11d7b376 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -1,6 +1,7 @@
aux_source_directory(src FUNCTION_SRC)
+aux_source_directory(src/detail FUNCTION_SRC_DETAIL)
list(REMOVE_ITEM FUNCTION_SRC src/udfd.c)
-add_library(function STATIC ${FUNCTION_SRC})
+add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL})
target_include_directories(
function
PUBLIC
diff --git a/source/libs/function/inc/builtinsimpl.h b/source/libs/function/inc/builtinsimpl.h
index 89e9673b06..307a82e256 100644
--- a/source/libs/function/inc/builtinsimpl.h
+++ b/source/libs/function/inc/builtinsimpl.h
@@ -23,6 +23,32 @@ extern "C" {
#include "function.h"
#include "functionMgt.h"
+typedef struct SSumRes {
+ union {
+ int64_t isum;
+ uint64_t usum;
+ double dsum;
+ };
+ int16_t type;
+ int64_t prevTs;
+ bool isPrevTsSet;
+} SSumRes;
+
+typedef struct SMinmaxResInfo {
+ bool assign; // assign the first value or not
+ int64_t v;
+ STuplePos tuplePos;
+
+ STuplePos nullTuplePos;
+ bool nullTupleSaved;
+ int16_t type;
+} SMinmaxResInfo;
+int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc);
+
+STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, const STupleKey* pKey);
+int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
+const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos);
+
bool functionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
int32_t functionFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
int32_t functionFinalizeWithResultBuf(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, char* finalResult);
@@ -119,15 +145,10 @@ EFuncDataRequired lastDynDataReq(void* pRes, STimeWindow* pTimeWindow);
int32_t lastRowFunction(SqlFunctionCtx* pCtx);
bool getTopBotFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv);
-bool getTopBotMergeFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv);
bool topBotFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
int32_t topFunction(SqlFunctionCtx* pCtx);
-int32_t topFunctionMerge(SqlFunctionCtx* pCtx);
int32_t bottomFunction(SqlFunctionCtx* pCtx);
-int32_t bottomFunctionMerge(SqlFunctionCtx* pCtx);
int32_t topBotFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
-int32_t topBotPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
-int32_t topBotMergeFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
int32_t topCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
int32_t bottomCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
int32_t getTopBotInfoSize(int64_t numOfItems);
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 141cd04263..a2e653469f 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -41,34 +41,15 @@
#define HLL_BUCKET_MASK (HLL_BUCKETS - 1)
#define HLL_ALPHA_INF 0.721347520444481703680 // constant for 0.5/ln(2)
-typedef struct SSumRes {
- union {
- int64_t isum;
- uint64_t usum;
- double dsum;
- };
- int16_t type;
- int64_t prevTs; // used for csum only
- bool isPrevTsSet; // used for csum only
-
-} SSumRes;
-
-typedef struct SAvgRes {
- double result;
- SSumRes sum;
- int64_t count;
- int16_t type; // store the original input type, used in merge function
-} SAvgRes;
-
-typedef struct SMinmaxResInfo {
- bool assign; // assign the first value or not
- int64_t v;
- STuplePos tuplePos;
-
- STuplePos nullTuplePos;
- bool nullTupleSaved;
- int16_t type;
-} SMinmaxResInfo;
+//typedef struct SMinmaxResInfo {
+// bool assign; // assign the first value or not
+// int64_t v;
+// STuplePos tuplePos;
+//
+// STuplePos nullTuplePos;
+// bool nullTupleSaved;
+// int16_t type;
+//} SMinmaxResInfo;
typedef struct STopBotResItem {
SVariant v;
@@ -369,19 +350,19 @@ typedef struct SGroupKeyInfo {
} \
} while (0)
-#define LIST_AVG_N(sumT, T) \
- do { \
- T* plist = (T*)pCol->pData; \
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) { \
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) { \
- continue; \
- } \
- \
- numOfElem += 1; \
- pAvgRes->count -= 1; \
- sumT -= plist[i]; \
- } \
- } while (0)
+//#define LIST_AVG_N(sumT, T) \
+// do { \
+// T* plist = (T*)pCol->pData; \
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) { \
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) { \
+// continue; \
+// } \
+// \
+// numOfElem += 1; \
+// pAvgRes->count -= 1; \
+// sumT -= plist[i]; \
+// } \
+// } while (0)
#define LIST_STDDEV_SUB_N(sumT, T) \
do { \
@@ -514,13 +495,13 @@ static int32_t getNumOfElems(SqlFunctionCtx* pCtx) {
int32_t numOfElem = 0;
/*
- * 1. column data missing (schema modified) causes pInputCol->hasNull == true. pInput->colDataAggIsSet == true;
- * 2. for general non-primary key columns, pInputCol->hasNull may be true or false, pInput->colDataAggIsSet == true;
- * 3. for primary key column, pInputCol->hasNull always be false, pInput->colDataAggIsSet == false;
+ * 1. column data missing (schema modified) causes pInputCol->hasNull == true. pInput->colDataSMAIsSet == true;
+ * 2. for general non-primary key columns, pInputCol->hasNull may be true or false, pInput->colDataSMAIsSet == true;
+ * 3. for primary key column, pInputCol->hasNull always be false, pInput->colDataSMAIsSet == false;
*/
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pInputCol = pInput->pData[0];
- if (pInput->colDataAggIsSet && pInput->totalRows == pInput->numOfRows) {
+ if (pInput->colDataSMAIsSet && pInput->totalRows == pInput->numOfRows) {
numOfElem = pInput->numOfRows - pInput->pColumnDataAgg[0]->numOfNull;
ASSERT(numOfElem >= 0);
} else {
@@ -609,7 +590,7 @@ int32_t sumFunction(SqlFunctionCtx* pCtx) {
goto _sum_over;
}
- if (pInput->colDataAggIsSet) {
+ if (pInput->colDataSMAIsSet) {
numOfElem = pInput->numOfRows - pAgg->numOfNull;
ASSERT(numOfElem >= 0);
@@ -674,7 +655,7 @@ int32_t sumInvertFunction(SqlFunctionCtx* pCtx) {
SSumRes* pSumRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
- if (pInput->colDataAggIsSet) {
+ if (pInput->colDataSMAIsSet) {
numOfElem = pInput->numOfRows - pAgg->numOfNull;
ASSERT(numOfElem >= 0);
@@ -748,377 +729,374 @@ bool getSumFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
return true;
}
-int32_t getAvgInfoSize() { return (int32_t)sizeof(SAvgRes); }
-
-bool getAvgFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
- pEnv->calcMemSize = sizeof(SAvgRes);
- return true;
-}
-
-bool avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
- if (!functionSetup(pCtx, pResultInfo)) {
- return false;
- }
-
- SAvgRes* pRes = GET_ROWCELL_INTERBUF(pResultInfo);
- memset(pRes, 0, sizeof(SAvgRes));
- return true;
-}
-
-int32_t avgFunction(SqlFunctionCtx* pCtx) {
- int32_t numOfElem = 0;
-
- SInputColumnInfoData* pInput = &pCtx->input;
- SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
- int32_t type = pInput->pData[0]->info.type;
-
- SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
- pAvgRes->type = type;
-
- // computing based on the true data block
- SColumnInfoData* pCol = pInput->pData[0];
-
- int32_t start = pInput->startRowIndex;
- int32_t numOfRows = pInput->numOfRows;
-
- if (IS_NULL_TYPE(type)) {
- numOfElem = 0;
- goto _avg_over;
- }
-
- if (pInput->colDataAggIsSet) {
- numOfElem = numOfRows - pAgg->numOfNull;
- ASSERT(numOfElem >= 0);
-
- pAvgRes->count += numOfElem;
- if (IS_SIGNED_NUMERIC_TYPE(type)) {
- pAvgRes->sum.isum += pAgg->sum;
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- pAvgRes->sum.usum += pAgg->sum;
- } else if (IS_FLOAT_TYPE(type)) {
- pAvgRes->sum.dsum += GET_DOUBLE_VAL((const char*)&(pAgg->sum));
- }
- } else { // computing based on the true data block
- switch (type) {
- case TSDB_DATA_TYPE_TINYINT: {
- int8_t* plist = (int8_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.isum += plist[i];
- }
-
- break;
- }
-
- case TSDB_DATA_TYPE_SMALLINT: {
- int16_t* plist = (int16_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.isum += plist[i];
- }
- break;
- }
-
- case TSDB_DATA_TYPE_INT: {
- int32_t* plist = (int32_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.isum += plist[i];
- }
-
- break;
- }
-
- case TSDB_DATA_TYPE_BIGINT: {
- int64_t* plist = (int64_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.isum += plist[i];
- }
- break;
- }
-
- case TSDB_DATA_TYPE_UTINYINT: {
- uint8_t* plist = (uint8_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.usum += plist[i];
- }
-
- break;
- }
-
- case TSDB_DATA_TYPE_USMALLINT: {
- uint16_t* plist = (uint16_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.usum += plist[i];
- }
- break;
- }
-
- case TSDB_DATA_TYPE_UINT: {
- uint32_t* plist = (uint32_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.usum += plist[i];
- }
-
- break;
- }
-
- case TSDB_DATA_TYPE_UBIGINT: {
- uint64_t* plist = (uint64_t*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.usum += plist[i];
- }
- break;
- }
-
- case TSDB_DATA_TYPE_FLOAT: {
- float* plist = (float*)pCol->pData;
- // float val = 0;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.dsum += plist[i];
- }
- // pAvgRes->sum.dsum = val;
- break;
- }
-
- case TSDB_DATA_TYPE_DOUBLE: {
- double* plist = (double*)pCol->pData;
- for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
- if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- numOfElem += 1;
- pAvgRes->count += 1;
- pAvgRes->sum.dsum += plist[i];
- }
- break;
- }
-
- default:
- break;
- }
- }
-
-_avg_over:
- // data in the check operation are all null, not output
- SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
- return TSDB_CODE_SUCCESS;
-}
-
-static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
- pOutput->type = pInput->type;
- if (IS_SIGNED_NUMERIC_TYPE(pOutput->type)) {
- pOutput->sum.isum += pInput->sum.isum;
- } else if (IS_UNSIGNED_NUMERIC_TYPE(pOutput->type)) {
- pOutput->sum.usum += pInput->sum.usum;
- } else {
- pOutput->sum.dsum += pInput->sum.dsum;
- }
-
- pOutput->count += pInput->count;
-
- return;
-}
-
-int32_t avgFunctionMerge(SqlFunctionCtx* pCtx) {
- SInputColumnInfoData* pInput = &pCtx->input;
- SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
-
- SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
-
- int32_t start = pInput->startRowIndex;
-
- for (int32_t i = start; i < start + pInput->numOfRows; ++i) {
- char* data = colDataGetData(pCol, i);
- SAvgRes* pInputInfo = (SAvgRes*)varDataVal(data);
- avgTransferInfo(pInputInfo, pInfo);
- }
-
- SET_VAL(GET_RES_INFO(pCtx), 1, 1);
-
- return TSDB_CODE_SUCCESS;
-}
-
-int32_t avgInvertFunction(SqlFunctionCtx* pCtx) {
- int32_t numOfElem = 0;
-
- // Only the pre-computing information loaded and actual data does not loaded
- SInputColumnInfoData* pInput = &pCtx->input;
- int32_t type = pInput->pData[0]->info.type;
-
- SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
-
- // computing based on the true data block
- SColumnInfoData* pCol = pInput->pData[0];
-
- int32_t start = pInput->startRowIndex;
- int32_t numOfRows = pInput->numOfRows;
-
- switch (type) {
- case TSDB_DATA_TYPE_TINYINT: {
- LIST_AVG_N(pAvgRes->sum.isum, int8_t);
- break;
- }
- case TSDB_DATA_TYPE_SMALLINT: {
- LIST_AVG_N(pAvgRes->sum.isum, int16_t);
- break;
- }
- case TSDB_DATA_TYPE_INT: {
- LIST_AVG_N(pAvgRes->sum.isum, int32_t);
- break;
- }
- case TSDB_DATA_TYPE_BIGINT: {
- LIST_AVG_N(pAvgRes->sum.isum, int64_t);
- break;
- }
- case TSDB_DATA_TYPE_UTINYINT: {
- LIST_AVG_N(pAvgRes->sum.usum, uint8_t);
- break;
- }
- case TSDB_DATA_TYPE_USMALLINT: {
- LIST_AVG_N(pAvgRes->sum.usum, uint16_t);
- break;
- }
- case TSDB_DATA_TYPE_UINT: {
- LIST_AVG_N(pAvgRes->sum.usum, uint32_t);
- break;
- }
- case TSDB_DATA_TYPE_UBIGINT: {
- LIST_AVG_N(pAvgRes->sum.usum, uint64_t);
- break;
- }
- case TSDB_DATA_TYPE_FLOAT: {
- LIST_AVG_N(pAvgRes->sum.dsum, float);
- break;
- }
- case TSDB_DATA_TYPE_DOUBLE: {
- LIST_AVG_N(pAvgRes->sum.dsum, double);
- break;
- }
- default:
- break;
- }
-
- // data in the check operation are all null, not output
- SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
- return TSDB_CODE_SUCCESS;
-}
-
-int32_t avgCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) {
- SResultRowEntryInfo* pDResInfo = GET_RES_INFO(pDestCtx);
- SAvgRes* pDBuf = GET_ROWCELL_INTERBUF(pDResInfo);
-
- SResultRowEntryInfo* pSResInfo = GET_RES_INFO(pSourceCtx);
- SAvgRes* pSBuf = GET_ROWCELL_INTERBUF(pSResInfo);
- int16_t type = pDBuf->type == TSDB_DATA_TYPE_NULL ? pSBuf->type : pDBuf->type;
-
- if (IS_SIGNED_NUMERIC_TYPE(type)) {
- pDBuf->sum.isum += pSBuf->sum.isum;
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- pDBuf->sum.usum += pSBuf->sum.usum;
- } else {
- pDBuf->sum.dsum += pSBuf->sum.dsum;
- }
- pDBuf->count += pSBuf->count;
-
- return TSDB_CODE_SUCCESS;
-}
-
-int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
- SInputColumnInfoData* pInput = &pCtx->input;
-
- SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
- int32_t type = pAvgRes->type;
-
- if (pAvgRes->count == 0) {
- // [ASAN] runtime error: division by zero
- GET_RES_INFO(pCtx)->numOfRes = 0;
- } else if (IS_SIGNED_NUMERIC_TYPE(type)) {
- pAvgRes->result = pAvgRes->sum.isum / ((double)pAvgRes->count);
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- pAvgRes->result = pAvgRes->sum.usum / ((double)pAvgRes->count);
- } else {
- pAvgRes->result = pAvgRes->sum.dsum / ((double)pAvgRes->count);
- }
-
- // check for overflow
- if (isinf(pAvgRes->result) || isnan(pAvgRes->result)) {
- GET_RES_INFO(pCtx)->numOfRes = 0;
- }
-
- return functionFinalize(pCtx, pBlock);
-}
-
-int32_t avgPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
- SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
- SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
- int32_t resultBytes = getAvgInfoSize();
- char* res = taosMemoryCalloc(resultBytes + VARSTR_HEADER_SIZE, sizeof(char));
-
- memcpy(varDataVal(res), pInfo, resultBytes);
- varDataSetLen(res, resultBytes);
-
- int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
- SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
-
- colDataAppend(pCol, pBlock->info.rows, res, false);
-
- taosMemoryFree(res);
- return pResInfo->numOfRes;
-}
+//int32_t getAvgInfoSize() { return (int32_t)sizeof(SAvgRes); }
+//
+//bool getAvgFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
+// pEnv->calcMemSize = sizeof(SAvgRes);
+// return true;
+//}
+//
+//bool avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
+// if (!functionSetup(pCtx, pResultInfo)) {
+// return false;
+// }
+//
+// SAvgRes* pRes = GET_ROWCELL_INTERBUF(pResultInfo);
+// memset(pRes, 0, sizeof(SAvgRes));
+// return true;
+//}
+
+//int32_t avgFunction(SqlFunctionCtx* pCtx) {
+// int32_t numOfElem = 0;
+//
+// SInputColumnInfoData* pInput = &pCtx->input;
+// SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
+// int32_t type = pInput->pData[0]->info.type;
+//
+// SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+// pAvgRes->type = type;
+//
+// // computing based on the true data block
+// SColumnInfoData* pCol = pInput->pData[0];
+//
+// int32_t start = pInput->startRowIndex;
+// int32_t numOfRows = pInput->numOfRows;
+//
+// if (IS_NULL_TYPE(type)) {
+// numOfElem = 0;
+// goto _avg_over;
+// }
+//
+// if (pInput->colDataSMAIsSet) {
+// numOfElem = numOfRows - pAgg->numOfNull;
+// ASSERT(numOfElem >= 0);
+//
+// pAvgRes->count += numOfElem;
+// if (IS_SIGNED_NUMERIC_TYPE(type)) {
+// pAvgRes->sum.isum += pAgg->sum;
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+// pAvgRes->sum.usum += pAgg->sum;
+// } else if (IS_FLOAT_TYPE(type)) {
+// pAvgRes->sum.dsum += GET_DOUBLE_VAL((const char*)&(pAgg->sum));
+// }
+// } else { // computing based on the true data block
+// switch (type) {
+// case TSDB_DATA_TYPE_TINYINT: {
+// int8_t* plist = (int8_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.isum += plist[i];
+// }
+//
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_SMALLINT: {
+// int16_t* plist = (int16_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.isum += plist[i];
+// }
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_INT: {
+// int32_t* plist = (int32_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.isum += plist[i];
+// }
+//
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_BIGINT: {
+// int64_t* plist = (int64_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.isum += plist[i];
+// }
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_UTINYINT: {
+// uint8_t* plist = (uint8_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.usum += plist[i];
+// }
+//
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_USMALLINT: {
+// uint16_t* plist = (uint16_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.usum += plist[i];
+// }
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_UINT: {
+// uint32_t* plist = (uint32_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.usum += plist[i];
+// }
+//
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_UBIGINT: {
+// uint64_t* plist = (uint64_t*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.usum += plist[i];
+// }
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_FLOAT: {
+// float* plist = (float*)pCol->pData;
+//// float val = 0;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.dsum += plist[i];
+// }
+//// pAvgRes->sum.dsum = val;
+// break;
+// }
+//
+// case TSDB_DATA_TYPE_DOUBLE: {
+// double* plist = (double*)pCol->pData;
+// for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) {
+// if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// numOfElem += 1;
+// pAvgRes->count += 1;
+// pAvgRes->sum.dsum += plist[i];
+// }
+// break;
+// }
+//
+// default:
+// break;
+// }
+// }
+//
+//_avg_over:
+// // data in the check operation are all null, not output
+// SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+// return TSDB_CODE_SUCCESS;
+//}
+
+//static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
+// pOutput->type = pInput->type;
+// if (IS_SIGNED_NUMERIC_TYPE(pOutput->type)) {
+// pOutput->sum.isum += pInput->sum.isum;
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(pOutput->type)) {
+// pOutput->sum.usum += pInput->sum.usum;
+// } else {
+// pOutput->sum.dsum += pInput->sum.dsum;
+// }
+//
+// pOutput->count += pInput->count;
+//
+// return;
+//}
+//
+//int32_t avgFunctionMerge(SqlFunctionCtx* pCtx) {
+// SInputColumnInfoData* pInput = &pCtx->input;
+// SColumnInfoData* pCol = pInput->pData[0];
+// ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+//
+// SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+//
+// int32_t start = pInput->startRowIndex;
+//
+// for (int32_t i = start; i < start + pInput->numOfRows; ++i) {
+// char* data = colDataGetData(pCol, i);
+// SAvgRes* pInputInfo = (SAvgRes*)varDataVal(data);
+// avgTransferInfo(pInputInfo, pInfo);
+// }
+//
+// SET_VAL(GET_RES_INFO(pCtx), 1, 1);
+//
+// return TSDB_CODE_SUCCESS;
+//}
+//
+//int32_t avgInvertFunction(SqlFunctionCtx* pCtx) {
+// int32_t numOfElem = 0;
+//
+// // Only the pre-computing information loaded and actual data does not loaded
+// SInputColumnInfoData* pInput = &pCtx->input;
+// int32_t type = pInput->pData[0]->info.type;
+//
+// SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+//
+// // computing based on the true data block
+// SColumnInfoData* pCol = pInput->pData[0];
+//
+// int32_t start = pInput->startRowIndex;
+// int32_t numOfRows = pInput->numOfRows;
+//
+// switch (type) {
+// case TSDB_DATA_TYPE_TINYINT: {
+// LIST_AVG_N(pAvgRes->sum.isum, int8_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_SMALLINT: {
+// LIST_AVG_N(pAvgRes->sum.isum, int16_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_INT: {
+// LIST_AVG_N(pAvgRes->sum.isum, int32_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_BIGINT: {
+// LIST_AVG_N(pAvgRes->sum.isum, int64_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_UTINYINT: {
+// LIST_AVG_N(pAvgRes->sum.usum, uint8_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_USMALLINT: {
+// LIST_AVG_N(pAvgRes->sum.usum, uint16_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_UINT: {
+// LIST_AVG_N(pAvgRes->sum.usum, uint32_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_UBIGINT: {
+// LIST_AVG_N(pAvgRes->sum.usum, uint64_t);
+// break;
+// }
+// case TSDB_DATA_TYPE_FLOAT: {
+// LIST_AVG_N(pAvgRes->sum.dsum, float);
+// break;
+// }
+// case TSDB_DATA_TYPE_DOUBLE: {
+// LIST_AVG_N(pAvgRes->sum.dsum, double);
+// break;
+// }
+// default:
+// break;
+// }
+//
+// // data in the check operation are all null, not output
+// SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+// return TSDB_CODE_SUCCESS;
+//}
+//
+//int32_t avgCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) {
+// SResultRowEntryInfo* pDResInfo = GET_RES_INFO(pDestCtx);
+// SAvgRes* pDBuf = GET_ROWCELL_INTERBUF(pDResInfo);
+//
+// SResultRowEntryInfo* pSResInfo = GET_RES_INFO(pSourceCtx);
+// SAvgRes* pSBuf = GET_ROWCELL_INTERBUF(pSResInfo);
+// int16_t type = pDBuf->type == TSDB_DATA_TYPE_NULL ? pSBuf->type : pDBuf->type;
+//
+// if (IS_SIGNED_NUMERIC_TYPE(type)) {
+// pDBuf->sum.isum += pSBuf->sum.isum;
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+// pDBuf->sum.usum += pSBuf->sum.usum;
+// } else {
+// pDBuf->sum.dsum += pSBuf->sum.dsum;
+// }
+// pDBuf->count += pSBuf->count;
+//
+// return TSDB_CODE_SUCCESS;
+//}
+//
+//int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+// SInputColumnInfoData* pInput = &pCtx->input;
+//
+// SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+// int32_t type = pAvgRes->type;
+//
+// if (IS_SIGNED_NUMERIC_TYPE(type)) {
+// pAvgRes->result = pAvgRes->sum.isum / ((double)pAvgRes->count);
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+// pAvgRes->result = pAvgRes->sum.usum / ((double)pAvgRes->count);
+// } else {
+// pAvgRes->result = pAvgRes->sum.dsum / ((double)pAvgRes->count);
+// }
+//
+// // check for overflow
+// if (isinf(pAvgRes->result) || isnan(pAvgRes->result)) {
+// GET_RES_INFO(pCtx)->numOfRes = 0;
+// }
+//
+// return functionFinalize(pCtx, pBlock);
+//}
+//
+//int32_t avgPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+// SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+// SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+// int32_t resultBytes = getAvgInfoSize();
+// char* res = taosMemoryCalloc(resultBytes + VARSTR_HEADER_SIZE, sizeof(char));
+//
+// memcpy(varDataVal(res), pInfo, resultBytes);
+// varDataSetLen(res, resultBytes);
+//
+// int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
+// SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
+//
+// colDataAppend(pCol, pBlock->info.rows, res, false);
+//
+// taosMemoryFree(res);
+// return pResInfo->numOfRes;
+//}
EFuncDataRequired statisDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow) {
return FUNC_DATA_REQUIRED_SMA_LOAD;
@@ -1143,533 +1121,529 @@ bool getMinmaxFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
return true;
}
-static STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock,
- const STupleKey* pKey);
-static int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
-static const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos);
+//static STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock,
+// const STupleKey* pKey);
+//static int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
+//static const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos);
-static int32_t findRowIndex(int32_t start, int32_t num, SColumnInfoData* pCol, const char* tval) {
- // the data is loaded, not only the block SMA value
- for (int32_t i = start; i < num + start; ++i) {
- char* p = colDataGetData(pCol, i);
- if (memcmp((void*)tval, p, pCol->info.bytes) == 0) {
- return i;
- }
- }
+//static int32_t findRowIndex(int32_t start, int32_t num, SColumnInfoData* pCol, const char* tval) {
+// // the data is loaded, not only the block SMA value
+// for (int32_t i = start; i < num + start; ++i) {
+// char* p = colDataGetData(pCol, i);
+// if (memcmp((void*)tval, p, pCol->info.bytes) == 0) {
+// return i;
+// }
+// }
+//
+// // if reach here means real data of block SMA is not set in pCtx->input.
+// return -1;
+//}
- // if reach here means real data of block SMA is not set in pCtx->input.
- return -1;
-}
-
-int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
- int32_t numOfElems = 0;
-
- SInputColumnInfoData* pInput = &pCtx->input;
- SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
-
- SColumnInfoData* pCol = pInput->pData[0];
- int32_t type = pCol->info.type;
-
- SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
- SMinmaxResInfo* pBuf = GET_ROWCELL_INTERBUF(pResInfo);
- pBuf->type = type;
-
- if (IS_NULL_TYPE(type)) {
- numOfElems = 0;
- goto _min_max_over;
- }
-
- // data in current data block are qualified to the query
- if (pInput->colDataAggIsSet) {
- numOfElems = pInput->numOfRows - pAgg->numOfNull;
- ASSERT(pInput->numOfRows == pInput->totalRows && numOfElems >= 0);
- if (numOfElems == 0) {
- return numOfElems;
- }
-
- void* tval = NULL;
- int16_t index = 0;
-
- if (isMinFunc) {
- tval = &pInput->pColumnDataAgg[0]->min;
- } else {
- tval = &pInput->pColumnDataAgg[0]->max;
- }
-
- if (!pBuf->assign) {
- if (type == TSDB_DATA_TYPE_FLOAT) {
- *(float*)&pBuf->v = GET_DOUBLE_VAL(tval);
- } else {
- pBuf->v = *(int64_t*)tval;
- }
- if (pCtx->subsidiaries.num > 0) {
- index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
- if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
- }
- }
- } else {
- if (IS_SIGNED_NUMERIC_TYPE(type)) {
- int64_t prev = 0;
- GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
-
- int64_t val = GET_INT64_VAL(tval);
- if ((prev < val) ^ isMinFunc) {
- *(int64_t*)&pBuf->v = val;
- if (pCtx->subsidiaries.num > 0) {
- index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
- if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
- }
- }
- }
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- uint64_t prev = 0;
- GET_TYPED_DATA(prev, uint64_t, type, &pBuf->v);
-
- uint64_t val = GET_UINT64_VAL(tval);
- if ((prev < val) ^ isMinFunc) {
- *(uint64_t*)&pBuf->v = val;
- if (pCtx->subsidiaries.num > 0) {
- index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
- if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
- }
- }
- }
- } else if (type == TSDB_DATA_TYPE_DOUBLE) {
- double prev = 0;
- GET_TYPED_DATA(prev, double, type, &pBuf->v);
-
- double val = GET_DOUBLE_VAL(tval);
- if ((prev < val) ^ isMinFunc) {
- *(double*)&pBuf->v = val;
- if (pCtx->subsidiaries.num > 0) {
- index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
- if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
- }
- }
- }
- } else if (type == TSDB_DATA_TYPE_FLOAT) {
- float prev = 0;
- GET_TYPED_DATA(prev, float, type, &pBuf->v);
-
- float val = GET_DOUBLE_VAL(tval);
- if ((prev < val) ^ isMinFunc) {
- *(float*)&pBuf->v = val;
- }
-
- if (pCtx->subsidiaries.num > 0) {
- index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
- if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
- }
- }
- }
- }
-
- pBuf->assign = true;
- return numOfElems;
- }
-
- int32_t start = pInput->startRowIndex;
- int32_t numOfRows = pInput->numOfRows;
-
- if (IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_BOOL) {
- if (type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_BOOL) {
- int8_t* pData = (int8_t*)pCol->pData;
- int8_t* val = (int8_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_SMALLINT) {
- int16_t* pData = (int16_t*)pCol->pData;
- int16_t* val = (int16_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_INT) {
- int32_t* pData = (int32_t*)pCol->pData;
- int32_t* val = (int32_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_BIGINT) {
- int64_t* pData = (int64_t*)pCol->pData;
- int64_t* val = (int64_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- }
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- if (type == TSDB_DATA_TYPE_UTINYINT) {
- uint8_t* pData = (uint8_t*)pCol->pData;
- uint8_t* val = (uint8_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_USMALLINT) {
- uint16_t* pData = (uint16_t*)pCol->pData;
- uint16_t* val = (uint16_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_UINT) {
- uint32_t* pData = (uint32_t*)pCol->pData;
- uint32_t* val = (uint32_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_UBIGINT) {
- uint64_t* pData = (uint64_t*)pCol->pData;
- uint64_t* val = (uint64_t*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- }
- } else if (type == TSDB_DATA_TYPE_DOUBLE) {
- double* pData = (double*)pCol->pData;
- double* val = (double*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
- // ignore the equivalent data value
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- } else if (type == TSDB_DATA_TYPE_FLOAT) {
- float* pData = (float*)pCol->pData;
- float* val = (float*)&pBuf->v;
-
- for (int32_t i = start; i < start + numOfRows; ++i) {
- if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
- continue;
- }
-
- if (!pBuf->assign) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
- }
- pBuf->assign = true;
- } else {
-#if 0
- if ((*val) == pData[i]) {
- continue;
- }
-
- if ((*val < pData[i]) ^ isMinFunc) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
-#endif
- // NOTE: An faster version to avoid one additional comparison with FPU.
- if (isMinFunc) { // min
- if (*val > pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- } else { // max
- if (*val < pData[i]) {
- *val = pData[i];
- if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
- }
- }
- }
- }
-
- numOfElems += 1;
- }
- }
-
-_min_max_over:
- if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pBuf->nullTupleSaved) {
- pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL);
- pBuf->nullTupleSaved = true;
- }
- return numOfElems;
-}
+//int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
+// int32_t numOfElems = 0;
+//
+// SInputColumnInfoData* pInput = &pCtx->input;
+// SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
+//
+// SColumnInfoData* pCol = pInput->pData[0];
+// int32_t type = pCol->info.type;
+//
+// SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+// SMinmaxResInfo* pBuf = GET_ROWCELL_INTERBUF(pResInfo);
+// pBuf->type = type;
+//
+// if (IS_NULL_TYPE(type)) {
+// numOfElems = 0;
+// goto _min_max_over;
+// }
+//
+// // data in current data block are qualified to the query
+// if (pInput->colDataSMAIsSet) {
+// numOfElems = pInput->numOfRows - pAgg->numOfNull;
+// ASSERT(pInput->numOfRows == pInput->totalRows && numOfElems >= 0);
+// if (numOfElems == 0) {
+// return numOfElems;
+// }
+//
+// void* tval = NULL;
+// int16_t index = 0;
+//
+// if (isMinFunc) {
+// tval = &pInput->pColumnDataAgg[0]->min;
+// } else {
+// tval = &pInput->pColumnDataAgg[0]->max;
+// }
+//
+// if (!pBuf->assign) {
+// pBuf->v = *(int64_t*)tval;
+// if (pCtx->subsidiaries.num > 0) {
+// index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+// if (index >= 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+// }
+// }
+// } else {
+// if (IS_SIGNED_NUMERIC_TYPE(type)) {
+// int64_t prev = 0;
+// GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
+//
+// int64_t val = GET_INT64_VAL(tval);
+// if ((prev < val) ^ isMinFunc) {
+// *(int64_t*)&pBuf->v = val;
+// if (pCtx->subsidiaries.num > 0) {
+// index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+// if (index >= 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+// }
+// }
+// }
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+// uint64_t prev = 0;
+// GET_TYPED_DATA(prev, uint64_t, type, &pBuf->v);
+//
+// uint64_t val = GET_UINT64_VAL(tval);
+// if ((prev < val) ^ isMinFunc) {
+// *(uint64_t*)&pBuf->v = val;
+// if (pCtx->subsidiaries.num > 0) {
+// index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+// if (index >= 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+// }
+// }
+// }
+// } else if (type == TSDB_DATA_TYPE_DOUBLE) {
+// double prev = 0;
+// GET_TYPED_DATA(prev, double, type, &pBuf->v);
+//
+// double val = GET_DOUBLE_VAL(tval);
+// if ((prev < val) ^ isMinFunc) {
+// *(double*)&pBuf->v = val;
+// if (pCtx->subsidiaries.num > 0) {
+// index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+// if (index >= 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+// }
+// }
+// }
+// } else if (type == TSDB_DATA_TYPE_FLOAT) {
+// float prev = 0;
+// GET_TYPED_DATA(prev, float, type, &pBuf->v);
+//
+// float val = GET_DOUBLE_VAL(tval);
+// if ((prev < val) ^ isMinFunc) {
+// *(float*)&pBuf->v = val;
+// }
+//
+// if (pCtx->subsidiaries.num > 0) {
+// index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+// if (index >= 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+// }
+// }
+// }
+// }
+//
+// pBuf->assign = true;
+// return numOfElems;
+// }
+//
+// int32_t start = pInput->startRowIndex;
+// int32_t numOfRows = pInput->numOfRows;
+//
+// if (IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_BOOL) {
+// if (type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_BOOL) {
+// int8_t* pData = (int8_t*)pCol->pData;
+// int8_t* val = (int8_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_SMALLINT) {
+// int16_t* pData = (int16_t*)pCol->pData;
+// int16_t* val = (int16_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_INT) {
+// int32_t* pData = (int32_t*)pCol->pData;
+// int32_t* val = (int32_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_BIGINT) {
+// int64_t* pData = (int64_t*)pCol->pData;
+// int64_t* val = (int64_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// }
+// } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+// if (type == TSDB_DATA_TYPE_UTINYINT) {
+// uint8_t* pData = (uint8_t*)pCol->pData;
+// uint8_t* val = (uint8_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_USMALLINT) {
+// uint16_t* pData = (uint16_t*)pCol->pData;
+// uint16_t* val = (uint16_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_UINT) {
+// uint32_t* pData = (uint32_t*)pCol->pData;
+// uint32_t* val = (uint32_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_UBIGINT) {
+// uint64_t* pData = (uint64_t*)pCol->pData;
+// uint64_t* val = (uint64_t*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// }
+// } else if (type == TSDB_DATA_TYPE_DOUBLE) {
+// double* pData = (double*)pCol->pData;
+// double* val = (double*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+// // ignore the equivalent data value
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// } else if (type == TSDB_DATA_TYPE_FLOAT) {
+// float* pData = (float*)pCol->pData;
+// float* val = (float*)&pBuf->v;
+//
+// for (int32_t i = start; i < start + numOfRows; ++i) {
+// if ((pCol->hasNull) && colDataIsNull_f(pCol->nullbitmap, i)) {
+// continue;
+// }
+//
+// if (!pBuf->assign) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+// }
+// pBuf->assign = true;
+// } else {
+//#if 0
+// if ((*val) == pData[i]) {
+// continue;
+// }
+//
+// if ((*val < pData[i]) ^ isMinFunc) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+//#endif
+// // NOTE: An faster version to avoid one additional comparison with FPU.
+// if (isMinFunc) { // min
+// if (*val > pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// } else { // max
+// if (*val < pData[i]) {
+// *val = pData[i];
+// if (pCtx->subsidiaries.num > 0) {
+// updateTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+// }
+// }
+// }
+// }
+//
+// numOfElems += 1;
+// }
+// }
+//
+//_min_max_over:
+// if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pBuf->nullTupleSaved) {
+// pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL);
+// pBuf->nullTupleSaved = true;
+// }
+// return numOfElems;
+//}
int32_t minFunction(SqlFunctionCtx* pCtx) {
int32_t numOfElems = doMinMaxHelper(pCtx, 1);
@@ -2499,7 +2473,7 @@ int32_t percentileFunction(SqlFunctionCtx* pCtx) {
// the first stage, only acquire the min/max value
if (pInfo->stage == 0) {
- if (pCtx->input.colDataAggIsSet) {
+ if (pCtx->input.colDataSMAIsSet) {
double tmin = 0.0, tmax = 0.0;
if (IS_SIGNED_NUMERIC_TYPE(type)) {
tmin = (double)GET_INT64_VAL(&pAgg->min);
@@ -2963,14 +2937,14 @@ int32_t firstFunction(SqlFunctionCtx* pCtx) {
pInfo->bytes = pInputCol->info.bytes;
// All null data column, return directly.
- if (pInput->colDataAggIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
+ if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
ASSERT(pInputCol->hasNull == true);
// save selectivity value for column consisted of all null values
firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
return 0;
}
- SColumnDataAgg* pColAgg = (pInput->colDataAggIsSet) ? pInput->pColumnDataAgg[0] : NULL;
+ SColumnDataAgg* pColAgg = (pInput->colDataSMAIsSet) ? pInput->pColumnDataAgg[0] : NULL;
TSKEY startKey = getRowPTs(pInput->pPTS, 0);
TSKEY endKey = getRowPTs(pInput->pPTS, pInput->totalRows - 1);
@@ -3067,14 +3041,14 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
pInfo->bytes = bytes;
// All null data column, return directly.
- if (pInput->colDataAggIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
+ if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
ASSERT(pInputCol->hasNull == true);
// save selectivity value for column consisted of all null values
firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
return 0;
}
- SColumnDataAgg* pColAgg = (pInput->colDataAggIsSet) ? pInput->pColumnDataAgg[0] : NULL;
+ SColumnDataAgg* pColAgg = (pInput->colDataSMAIsSet) ? pInput->pColumnDataAgg[0] : NULL;
TSKEY startKey = getRowPTs(pInput->pPTS, 0);
TSKEY endKey = getRowPTs(pInput->pPTS, pInput->totalRows - 1);
@@ -3138,10 +3112,9 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
int32_t round = pInput->numOfRows >> 2;
int32_t reminder = pInput->numOfRows & 0x03;
- int32_t tick = 0;
- for (int32_t i = pInput->startRowIndex; tick < round; i += 4, tick += 1) {
- int64_t cts = pts[i];
- int32_t chosen = i;
+ for (int32_t i = pInput->startRowIndex, tick = 0; tick < round; i += 4, tick += 1) {
+ int64_t cts = pts[i];
+ int32_t chosen = i;
if (cts < pts[i + 1]) {
cts = pts[i + 1];
@@ -3165,18 +3138,18 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
}
}
- for (int32_t i = pInput->startRowIndex + round * 4; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
- if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) {
- char* data = colDataGetData(pInputCol, i);
- doSaveCurrentVal(pCtx, i, pts[i], type, data);
- pResInfo->numOfRes = 1;
- }
- }
- } else {
- for (int32_t i = pInput->startRowIndex; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
- if (pInputCol->hasNull && colDataIsNull(pInputCol, pInput->totalRows, i, pColAgg)) {
- continue;
+ for (int32_t i = pInput->startRowIndex + round * 4; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
+ if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) {
+ char* data = colDataGetData(pInputCol, i);
+ doSaveCurrentVal(pCtx, i, pts[i], type, data);
+ pResInfo->numOfRes = 1;
+ }
}
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
+ if (colDataIsNull(pInputCol, pInput->totalRows, i, pColAgg)) {
+ continue;
+ }
numOfElems++;
@@ -3376,7 +3349,8 @@ int32_t lastRowFunction(SqlFunctionCtx* pCtx) {
int64_t* pts = (int64_t*)pInput->pPTS->pData;
for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
- char* data = colDataGetData(pInputCol, i);
+ bool isNull = colDataIsNull(pInputCol, pInput->numOfRows, i, NULL);
+ char* data = isNull ? NULL : colDataGetData(pInputCol, i);
TSKEY cts = pts[i];
numOfElems++;
@@ -3894,7 +3868,7 @@ static int32_t doUpdateTupleData(SSerializeDataHandle* pHandle, const void* pBuf
return TSDB_CODE_SUCCESS;
}
-static int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos) {
+int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos) {
char* buf = serializeTupleData(pSrcBlock, rowIndex, &pCtx->subsidiaries, pCtx->subsidiaries.buf);
doUpdateTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, pPos);
return TSDB_CODE_SUCCESS;
@@ -3914,7 +3888,7 @@ static char* doLoadTupleData(SSerializeDataHandle* pHandle, const STuplePos* pPo
}
}
-static const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos) {
+const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos) {
return doLoadTupleData(&pCtx->saveHandle, pPos);
}
@@ -4035,7 +4009,7 @@ int32_t spreadFunction(SqlFunctionCtx* pCtx) {
SSpreadInfo* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
- if (pInput->colDataAggIsSet) {
+ if (pInput->colDataSMAIsSet) {
numOfElems = pInput->numOfRows - pAgg->numOfNull;
if (numOfElems == 0) {
goto _spread_over;
@@ -4210,7 +4184,7 @@ int32_t elapsedFunction(SqlFunctionCtx* pCtx) {
goto _elapsed_over;
}
- if (pInput->colDataAggIsSet) {
+ if (pInput->colDataSMAIsSet) {
if (pInfo->min == TSKEY_MAX) {
pInfo->min = GET_INT64_VAL(&pAgg->min);
pInfo->max = GET_INT64_VAL(&pAgg->max);
diff --git a/source/libs/function/src/detail/tavgfunction.c b/source/libs/function/src/detail/tavgfunction.c
new file mode 100644
index 0000000000..7d018a8dc7
--- /dev/null
+++ b/source/libs/function/src/detail/tavgfunction.c
@@ -0,0 +1,751 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * 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 .
+ */
+
+#include "builtinsimpl.h"
+#include "function.h"
+#include "tdatablock.h"
+#include "tfunctionInt.h"
+#include "tglobal.h"
+
+#define SET_VAL(_info, numOfElem, res) \
+ do { \
+ if ((numOfElem) <= 0) { \
+ break; \
+ } \
+ (_info)->numOfRes = (res); \
+ } while (0)
+
+#define LIST_AVG_N(sumT, T) \
+ do { \
+ T* plist = (T*)pCol->pData; \
+ for (int32_t i = start; i < numOfRows + pInput->startRowIndex; ++i) { \
+ if (colDataIsNull_f(pCol->nullbitmap, i)) { \
+ continue; \
+ } \
+ \
+ numOfElem += 1; \
+ pAvgRes->count -= 1; \
+ sumT -= plist[i]; \
+ } \
+ } while (0)
+
+typedef struct SAvgRes {
+ double result;
+ SSumRes sum;
+ int64_t count;
+ int16_t type; // store the original input type, used in merge function
+} SAvgRes;
+
+static void floatVectorSumAVX(const float* plist, int32_t numOfRows, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(float);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ const float* p = plist;
+
+ __m256 val;
+ __m256 sum = _mm256_setzero_ps();
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ val = _mm256_loadu_ps(p);
+ sum = _mm256_add_ps(sum, val);
+ p += width;
+ }
+
+ // let sum up the final results
+ const float* q = (const float*)∑
+ pRes->sum.dsum += q[0] + q[1] + q[2] + q[3] + q[4] + q[5] + q[6] + q[7];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.dsum += plist[j + startIndex];
+ }
+#endif
+}
+
+static void doubleVectorSumAVX(const double* plist, int32_t numOfRows, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(int64_t);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ const double* p = plist;
+
+ __m256d val;
+ __m256d sum = _mm256_setzero_pd();
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ val = _mm256_loadu_pd(p);
+ sum = _mm256_add_pd(sum, val);
+ p += width;
+ }
+
+ // let sum up the final results
+ const double* q = (const double*)∑
+ pRes->sum.dsum += q[0] + q[1] + q[2] + q[3];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.dsum += plist[j + startIndex];
+ }
+#endif
+}
+
+static void i8VectorSumAVX2(const int8_t* plist, int32_t numOfRows, int32_t type, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX2__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(int64_t);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ __m256i sum = _mm256_setzero_si256();
+
+ if (type == TSDB_DATA_TYPE_TINYINT) {
+ const int8_t* p = plist;
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepi8_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ } else {
+ const uint8_t* p = (const uint8_t*)plist;
+
+ for(int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepu8_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ }
+
+ // let sum up the final results
+ const int64_t* q = (const int64_t*)∑
+ pRes->sum.isum += q[0] + q[1] + q[2] + q[3];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.isum += plist[j + startIndex];
+ }
+#endif
+}
+
+static void i16VectorSumAVX2(const int16_t* plist, int32_t numOfRows, int32_t type, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX2__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(int64_t);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ __m256i sum = _mm256_setzero_si256();
+
+ if (type == TSDB_DATA_TYPE_SMALLINT) {
+ const int16_t* p = plist;
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepi16_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ } else {
+ const uint8_t* p = (const uint8_t*)plist;
+
+ for(int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepu16_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ }
+
+ // let sum up the final results
+ const int64_t* q = (const int64_t*)∑
+ pRes->sum.isum += q[0] + q[1] + q[2] + q[3];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.isum += plist[j + startIndex];
+ }
+#endif
+}
+
+static void i32VectorSumAVX2(const int32_t* plist, int32_t numOfRows, int32_t type, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX2__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(int64_t);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ __m256i sum = _mm256_setzero_si256();
+
+ if (type == TSDB_DATA_TYPE_INT) {
+ const int32_t* p = plist;
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepi32_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ } else {
+ const uint32_t* p = (const uint32_t*)plist;
+
+ for(int32_t i = 0; i < rounds; ++i) {
+ __m128i val = _mm_lddqu_si128((__m128i*)p);
+ __m256i extVal = _mm256_cvtepu32_epi64(val); // only four items will be converted into __m256i
+ sum = _mm256_add_epi64(sum, extVal);
+ p += width;
+ }
+ }
+
+ // let sum up the final results
+ const int64_t* q = (const int64_t*)∑
+ pRes->sum.isum += q[0] + q[1] + q[2] + q[3];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.isum += plist[j + startIndex];
+ }
+#endif
+}
+
+static void i64VectorSumAVX2(const int64_t* plist, int32_t numOfRows, SAvgRes* pRes) {
+ const int32_t bitWidth = 256;
+
+#if __AVX2__
+ // find the start position that are aligned to 32bytes address in memory
+ int32_t width = (bitWidth>>3u) / sizeof(int64_t);
+
+ int32_t remainder = numOfRows % width;
+ int32_t rounds = numOfRows / width;
+
+ __m256i sum = _mm256_setzero_si256();
+
+ const int64_t* p = plist;
+
+ for (int32_t i = 0; i < rounds; ++i) {
+ __m256i val = _mm256_lddqu_si256((__m256i*)p);
+ sum = _mm256_add_epi64(sum, val);
+ p += width;
+ }
+
+ // let sum up the final results
+ const int64_t* q = (const int64_t*)∑
+ pRes->sum.isum += q[0] + q[1] + q[2] + q[3];
+
+ int32_t startIndex = rounds * width;
+ for (int32_t j = 0; j < remainder; ++j) {
+ pRes->sum.isum += plist[j + startIndex];
+ }
+#endif
+}
+
+int32_t getAvgInfoSize() { return (int32_t)sizeof(SAvgRes); }
+
+bool getAvgFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
+ pEnv->calcMemSize = sizeof(SAvgRes);
+ return true;
+}
+
+bool avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
+ if (!functionSetup(pCtx, pResultInfo)) {
+ return false;
+ }
+
+ SAvgRes* pRes = GET_ROWCELL_INTERBUF(pResultInfo);
+ memset(pRes, 0, sizeof(SAvgRes));
+ return true;
+}
+
+static int32_t calculateAvgBySMAInfo(SAvgRes* pRes, int32_t numOfRows, int32_t type, const SColumnDataAgg* pAgg) {
+ int32_t numOfElem = numOfRows - pAgg->numOfNull;
+ ASSERT(numOfElem >= 0);
+
+ pRes->count += numOfElem;
+ if (IS_SIGNED_NUMERIC_TYPE(type)) {
+ pRes->sum.isum += pAgg->sum;
+ } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+ pRes->sum.usum += pAgg->sum;
+ } else if (IS_FLOAT_TYPE(type)) {
+ pRes->sum.dsum += GET_DOUBLE_VAL((const char*)&(pAgg->sum));
+ }
+
+ return numOfElem;
+}
+
+static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputColumnInfoData *pInput, SAvgRes* pRes) {
+ int32_t start = pInput->startRowIndex;
+ int32_t numOfRows = pInput->numOfRows;
+ int32_t numOfElems = 0;
+
+ switch (type) {
+ case TSDB_DATA_TYPE_TINYINT: {
+ int8_t* plist = (int8_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.isum += plist[i];
+ }
+
+ break;
+ }
+
+ case TSDB_DATA_TYPE_SMALLINT: {
+ int16_t* plist = (int16_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.isum += plist[i];
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_INT: {
+ int32_t* plist = (int32_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.isum += plist[i];
+ }
+
+ break;
+ }
+
+ case TSDB_DATA_TYPE_BIGINT: {
+ int64_t* plist = (int64_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.isum += plist[i];
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UTINYINT: {
+ uint8_t* plist = (uint8_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.usum += plist[i];
+ }
+
+ break;
+ }
+
+ case TSDB_DATA_TYPE_USMALLINT: {
+ uint16_t* plist = (uint16_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.usum += plist[i];
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UINT: {
+ uint32_t* plist = (uint32_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.usum += plist[i];
+ }
+
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UBIGINT: {
+ uint64_t* plist = (uint64_t*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.usum += plist[i];
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_FLOAT: {
+ float* plist = (float*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.dsum += plist[i];
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_DOUBLE: {
+ double* plist = (double*)pCol->pData;
+ for (int32_t i = start; i < numOfRows + start; ++i) {
+ if (colDataIsNull_f(pCol->nullbitmap, i)) {
+ continue;
+ }
+
+ numOfElems += 1;
+ pRes->count += 1;
+ pRes->sum.dsum += plist[i];
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ return numOfElems;
+}
+
+int32_t avgFunction(SqlFunctionCtx* pCtx) {
+ int32_t numOfElem = 0;
+ const int32_t THRESHOLD_SIZE = 8;
+
+ SInputColumnInfoData* pInput = &pCtx->input;
+ SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
+ int32_t type = pInput->pData[0]->info.type;
+
+ SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+ pAvgRes->type = type;
+
+ // computing based on the true data block
+ SColumnInfoData* pCol = pInput->pData[0];
+
+ int32_t start = pInput->startRowIndex;
+ int32_t numOfRows = pInput->numOfRows;
+
+ if (IS_NULL_TYPE(type)) {
+ goto _over;
+ }
+
+ if (pInput->colDataSMAIsSet) { // try to use SMA if available
+ numOfElem = calculateAvgBySMAInfo(pAvgRes, numOfRows, type, pAgg);
+ } else if (!pCol->hasNull) { // try to employ the simd instructions to speed up the loop
+ numOfElem = pInput->numOfRows;
+ pAvgRes->count += pInput->numOfRows;
+
+ bool simdAvailable = tsAVXEnable && tsSIMDEnable && (numOfRows > THRESHOLD_SIZE);
+
+ switch(type) {
+ case TSDB_DATA_TYPE_UTINYINT:
+ case TSDB_DATA_TYPE_TINYINT: {
+ const int8_t* plist = (const int8_t*) pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ i8VectorSumAVX2(plist, numOfRows, type, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.usum += plist[i];
+ }
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_USMALLINT:
+ case TSDB_DATA_TYPE_SMALLINT: {
+ const int16_t* plist = (const int16_t*)pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ i16VectorSumAVX2(plist, numOfRows, type, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.isum += plist[i];
+ }
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UINT:
+ case TSDB_DATA_TYPE_INT: {
+ const int32_t* plist = (const int32_t*) pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ i32VectorSumAVX2(plist, numOfRows, type, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.isum += plist[i];
+ }
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UBIGINT:
+ case TSDB_DATA_TYPE_BIGINT: {
+ const int64_t* plist = (const int64_t*) pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ i64VectorSumAVX2(plist, numOfRows, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.isum += plist[i];
+ }
+ }
+ break;
+ }
+
+ case TSDB_DATA_TYPE_FLOAT: {
+ const float* plist = (const float*) pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ floatVectorSumAVX(plist, numOfRows, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.dsum += plist[i];
+ }
+ }
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ const double* plist = (const double*)pCol->pData;
+
+ // 1. If the CPU supports AVX, let's employ AVX instructions to speedup this loop
+ if (simdAvailable) {
+ doubleVectorSumAVX(plist, numOfRows, pAvgRes);
+ } else {
+ for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
+ pAvgRes->sum.dsum += plist[i];
+ }
+ }
+ break;
+ }
+ default:
+ ASSERT(0);
+ }
+ } else {
+ numOfElem = doAddNumericVector(pCol, type, pInput, pAvgRes);
+ }
+
+_over:
+ // data in the check operation are all null, not output
+ SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+ return TSDB_CODE_SUCCESS;
+}
+
+static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
+ pOutput->type = pInput->type;
+ if (IS_SIGNED_NUMERIC_TYPE(pOutput->type)) {
+ pOutput->sum.isum += pInput->sum.isum;
+ } else if (IS_UNSIGNED_NUMERIC_TYPE(pOutput->type)) {
+ pOutput->sum.usum += pInput->sum.usum;
+ } else {
+ pOutput->sum.dsum += pInput->sum.dsum;
+ }
+
+ pOutput->count += pInput->count;
+}
+
+int32_t avgFunctionMerge(SqlFunctionCtx* pCtx) {
+ SInputColumnInfoData* pInput = &pCtx->input;
+ SColumnInfoData* pCol = pInput->pData[0];
+ ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+
+ SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+
+ int32_t start = pInput->startRowIndex;
+
+ for (int32_t i = start; i < start + pInput->numOfRows; ++i) {
+ char* data = colDataGetData(pCol, i);
+ SAvgRes* pInputInfo = (SAvgRes*)varDataVal(data);
+ avgTransferInfo(pInputInfo, pInfo);
+ }
+
+ SET_VAL(GET_RES_INFO(pCtx), 1, 1);
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t avgInvertFunction(SqlFunctionCtx* pCtx) {
+ int32_t numOfElem = 0;
+
+ // Only the pre-computing information loaded and actual data does not loaded
+ SInputColumnInfoData* pInput = &pCtx->input;
+ SAvgRes* pAvgRes = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+
+ // computing based on the true data block
+ SColumnInfoData* pCol = pInput->pData[0];
+
+ int32_t start = pInput->startRowIndex;
+ int32_t numOfRows = pInput->numOfRows;
+
+ switch (pCol->info.type) {
+ case TSDB_DATA_TYPE_TINYINT: {
+ LIST_AVG_N(pAvgRes->sum.isum, int8_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_SMALLINT: {
+ LIST_AVG_N(pAvgRes->sum.isum, int16_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_INT: {
+ LIST_AVG_N(pAvgRes->sum.isum, int32_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_BIGINT: {
+ LIST_AVG_N(pAvgRes->sum.isum, int64_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_UTINYINT: {
+ LIST_AVG_N(pAvgRes->sum.usum, uint8_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_USMALLINT: {
+ LIST_AVG_N(pAvgRes->sum.usum, uint16_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_UINT: {
+ LIST_AVG_N(pAvgRes->sum.usum, uint32_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_UBIGINT: {
+ LIST_AVG_N(pAvgRes->sum.usum, uint64_t);
+ break;
+ }
+ case TSDB_DATA_TYPE_FLOAT: {
+ LIST_AVG_N(pAvgRes->sum.dsum, float);
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ LIST_AVG_N(pAvgRes->sum.dsum, double);
+ break;
+ }
+ default:
+ break;
+ }
+
+ // data in the check operation are all null, not output
+ SET_VAL(GET_RES_INFO(pCtx), numOfElem, 1);
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t avgCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) {
+ SResultRowEntryInfo* pDResInfo = GET_RES_INFO(pDestCtx);
+ SAvgRes* pDBuf = GET_ROWCELL_INTERBUF(pDResInfo);
+
+ SResultRowEntryInfo* pSResInfo = GET_RES_INFO(pSourceCtx);
+ SAvgRes* pSBuf = GET_ROWCELL_INTERBUF(pSResInfo);
+ int16_t type = pDBuf->type == TSDB_DATA_TYPE_NULL ? pSBuf->type : pDBuf->type;
+
+ if (IS_SIGNED_NUMERIC_TYPE(type)) {
+ pDBuf->sum.isum += pSBuf->sum.isum;
+ } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+ pDBuf->sum.usum += pSBuf->sum.usum;
+ } else {
+ pDBuf->sum.dsum += pSBuf->sum.dsum;
+ }
+ pDBuf->count += pSBuf->count;
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
+
+ SAvgRes* pRes = GET_ROWCELL_INTERBUF(pEntryInfo);
+ int32_t type = pRes->type;
+
+ if (pRes->count > 0) {
+ if (IS_SIGNED_NUMERIC_TYPE(type)) {
+ pRes->result = pRes->sum.isum / ((double)pRes->count);
+ } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+ pRes->result = pRes->sum.usum / ((double)pRes->count);
+ } else {
+ pRes->result = pRes->sum.dsum / ((double)pRes->count);
+ }
+ }
+
+ if (pRes->count == 0 || isinf(pRes->result) || isnan(pRes->result)) {
+ pEntryInfo->numOfRes = 0;
+ } else {
+ pEntryInfo->numOfRes = 1;
+ }
+
+ return functionFinalize(pCtx, pBlock);
+}
+
+int32_t avgPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+ SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
+ int32_t resultBytes = getAvgInfoSize();
+ char* res = taosMemoryCalloc(resultBytes + VARSTR_HEADER_SIZE, sizeof(char));
+
+ memcpy(varDataVal(res), pInfo, resultBytes);
+ varDataSetLen(res, resultBytes);
+
+ int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
+ SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
+
+ colDataAppend(pCol, pBlock->info.rows, res, false);
+
+ taosMemoryFree(res);
+ return pResInfo->numOfRes;
+}
\ No newline at end of file
diff --git a/source/libs/function/src/detail/tminmax.c b/source/libs/function/src/detail/tminmax.c
new file mode 100644
index 0000000000..b2cb36cba0
--- /dev/null
+++ b/source/libs/function/src/detail/tminmax.c
@@ -0,0 +1,891 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * 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 .
+ */
+
+#include "builtinsimpl.h"
+#include "function.h"
+#include "tdatablock.h"
+#include "tfunctionInt.h"
+#include "tglobal.h"
+
+#define __COMPARE_ACQUIRED_MAX(i, end, bm, _data, ctx, val, pos) \
+ for (; i < (end); ++i) { \
+ if (colDataIsNull_f(bm, i)) { \
+ continue; \
+ } \
+ \
+ if ((val) < (_data)[i]) { \
+ (val) = (_data)[i]; \
+ if ((ctx)->subsidiaries.num > 0) { \
+ updateTupleData((ctx), i, (ctx)->pSrcBlock, pos); \
+ } \
+ } \
+ }
+
+#define __COMPARE_ACQUIRED_MIN(i, end, bm, _data, ctx, val, pos) \
+ for (; i < (end); ++i) { \
+ if (colDataIsNull_f(bm, i)) { \
+ continue; \
+ } \
+ \
+ if ((val) > (_data)[i]) { \
+ (val) = (_data)[i]; \
+ if ((ctx)->subsidiaries.num > 0) { \
+ updateTupleData((ctx), i, (ctx)->pSrcBlock, pos); \
+ } \
+ } \
+ }
+
+#define __COMPARE_EXTRACT_MIN(start, end, val, _data) \
+ for (int32_t i = (start); i < (end); ++i) { \
+ if ((val) > (_data)[i]) { \
+ (val) = (_data)[i]; \
+ } \
+ }
+
+#define __COMPARE_EXTRACT_MAX(start, end, val, _data) \
+ for (int32_t i = (start); i < (end); ++i) { \
+ if ((val) < (_data)[i]) { \
+ (val) = (_data)[i]; \
+ } \
+ }
+
+static void calculateRounds(int32_t numOfRows, int32_t bytes, int32_t* remainder, int32_t* rounds, int32_t* width) {
+ const int32_t bitWidth = 256;
+
+ *width = (bitWidth>>3u) / bytes;
+ *remainder = numOfRows % (*width);
+ *rounds = numOfRows / (*width);
+}
+
+#define EXTRACT_MAX_VAL(_first, _sec, _width, _remain, _v) \
+ (_v) = TMAX((_first)[0], (_first)[1]); \
+ for (int32_t k = 1; k < (_width); ++k) { \
+ (_v) = TMAX((_v), (_first)[k]); \
+ } \
+ \
+ for (int32_t j = 0; j < (_remain); ++j) { \
+ if ((_v) < (_sec)[j]) { \
+ (_v) = (_sec)[j]; \
+ } \
+ }
+
+#define EXTRACT_MIN_VAL(_first, _sec, _width, _remain, _v) \
+ (_v) = TMIN((_first)[0], (_first)[1]); \
+ for (int32_t k = 1; k < (_width); ++k) { \
+ (_v) = TMIN((_v), (_first)[k]); \
+ } \
+ \
+ for (int32_t j = 0; j < (_remain); ++j) { \
+ if ((_v) > (_sec)[j]) { \
+ (_v) = (_sec)[j]; \
+ } \
+ }
+
+
+static int8_t i8VectorCmpAVX2(const void* pData, int32_t numOfRows, bool isMinFunc, bool signVal) {
+ int8_t v = 0;
+ const int8_t* p = pData;
+
+ int32_t width, remain, rounds;
+ calculateRounds(numOfRows, sizeof(int8_t), &remain, &rounds, &width);
+
+#if __AVX2__
+ __m256i next;
+ __m256i initVal = _mm256_lddqu_si256((__m256i*)p);
+ p += width;
+
+ if (!isMinFunc) { // max function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epi8(initVal, next);
+ p += width;
+ }
+
+ const int8_t* q = (const int8_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ } else { // unsigned value
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epu8(initVal, next);
+ p += width;
+ }
+
+ const uint8_t* q = (const uint8_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ }
+
+ } else { // min function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epi8(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const int8_t* q = (const int8_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ } else {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epu8(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const uint8_t* q = (const uint8_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ }
+ }
+#endif
+
+ return v;
+}
+
+static int16_t i16VectorCmpAVX2(const int16_t* pData, int32_t numOfRows, bool isMinFunc, bool signVal) {
+ int16_t v = 0;
+ const int16_t* p = pData;
+
+ int32_t width, remain, rounds;
+ calculateRounds(numOfRows, sizeof(int16_t), &remain, &rounds, &width);
+
+#if __AVX2__
+ __m256i next;
+ __m256i initVal = _mm256_lddqu_si256((__m256i*)p);
+ p += width;
+
+ if (!isMinFunc) { // max function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epi16(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const int16_t* q = (const int16_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ } else {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epu16(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const uint16_t* q = (const uint16_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ }
+
+ } else { // min function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epi16(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const int16_t* q = (const int16_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ } else {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epi16(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const uint16_t* q = (const uint16_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ }
+ }
+#endif
+
+ return v;
+}
+
+static int32_t i32VectorCmpAVX2(const int32_t* pData, int32_t numOfRows, bool isMinFunc, bool signVal) {
+ int32_t v = 0;
+ const int32_t* p = pData;
+
+ int32_t width, remain, rounds;
+ calculateRounds(numOfRows, sizeof(int32_t), &remain, &rounds, &width);
+
+#if __AVX2__
+ __m256i next;
+ __m256i initVal = _mm256_lddqu_si256((__m256i*)p);
+ p += width;
+
+ if (!isMinFunc) { // max function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epi32(initVal, next);
+ p += width;
+ }
+
+ // let compare the final results
+ const int32_t* q = (const int32_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ } else { // unsigned value
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_max_epi32(initVal, next);
+ p += width;
+ }
+
+ // let compare the final results
+ const uint32_t* q = (const uint32_t*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ }
+ } else { // min function
+ if (signVal) {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epi32(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const int32_t* q = (const int32_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ } else {
+ for (int32_t i = 0; i < rounds; ++i) {
+ next = _mm256_lddqu_si256((__m256i*)p);
+ initVal = _mm256_min_epu32(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const uint32_t* q = (const uint32_t*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ }
+ }
+#endif
+
+ return v;
+}
+
+static float floatVectorCmpAVX(const float* pData, int32_t numOfRows, bool isMinFunc) {
+ float v = 0;
+ const float* p = pData;
+
+ int32_t width, remain, rounds;
+ calculateRounds(numOfRows, sizeof(float), &remain, &rounds, &width);
+
+#if __AVX__
+
+ __m256 next;
+ __m256 initVal = _mm256_loadu_ps(p);
+ p += width;
+
+ if (!isMinFunc) { // max function
+ for (int32_t i = 1; i < rounds; ++i) {
+ next = _mm256_loadu_ps(p);
+ initVal = _mm256_max_ps(initVal, next);
+ p += width;
+ }
+
+ const float* q = (const float*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ } else { // min function
+ for (int32_t i = 1; i < rounds; ++i) {
+ next = _mm256_loadu_ps(p);
+ initVal = _mm256_min_ps(initVal, next);
+ p += width;
+ }
+
+ const float* q = (const float*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ }
+#endif
+
+ return v;
+}
+
+static double doubleVectorCmpAVX(const double* pData, int32_t numOfRows, bool isMinFunc) {
+ double v = 0;
+ const double* p = pData;
+
+ int32_t width, remain, rounds;
+ calculateRounds(numOfRows, sizeof(double), &remain, &rounds, &width);
+
+#if __AVX__
+
+ __m256d next;
+ __m256d initVal = _mm256_loadu_pd(p);
+ p += width;
+
+ if (!isMinFunc) { // max function
+ for (int32_t i = 1; i < rounds; ++i) {
+ next = _mm256_loadu_pd(p);
+ initVal = _mm256_max_pd(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const double* q = (const double*)&initVal;
+ EXTRACT_MAX_VAL(q, p, width, remain, v)
+ } else { // min function
+ for (int32_t i = 1; i < rounds; ++i) {
+ next = _mm256_loadu_pd(p);
+ initVal = _mm256_min_pd(initVal, next);
+ p += width;
+ }
+
+ // let sum up the final results
+ const double* q = (const double*)&initVal;
+ EXTRACT_MIN_VAL(q, p, width, remain, v)
+ }
+#endif
+
+ return v;
+}
+
+static int32_t findFirstValPosition(const SColumnInfoData* pCol, int32_t start, int32_t numOfRows) {
+ int32_t i = start;
+
+ while (i < (start + numOfRows) && (colDataIsNull_f(pCol->nullbitmap, i) == true)) {
+ i += 1;
+ }
+
+ return i;
+}
+
+static void handleInt8Col(const void* data, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc,
+ bool signVal) {
+ // AVX2 version to speedup the loop
+ if (tsAVX2Enable && tsSIMDEnable) {
+ pBuf->v = i8VectorCmpAVX2(data, numOfRows, isMinFunc, signVal);
+ } else {
+ if (!pBuf->assign) {
+ pBuf->v = ((int8_t*)data)[0];
+ }
+
+ if (signVal) {
+ const int8_t* p = (const int8_t*)data;
+ int8_t* v = (int8_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ } else {
+ const uint8_t* p = (const uint8_t*)data;
+ uint8_t* v = (uint8_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ }
+ }
+
+ pBuf->assign = true;
+}
+
+static void handleInt16Col(const void* data, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc,
+ bool signVal) {
+ // AVX2 version to speedup the loop
+ if (tsAVX2Enable && tsSIMDEnable) {
+ pBuf->v = i16VectorCmpAVX2(data, numOfRows, isMinFunc, signVal);
+ } else {
+ if (!pBuf->assign) {
+ pBuf->v = ((int16_t*)data)[0];
+ }
+
+ if (signVal) {
+ const int16_t* p = (const int16_t*)data;
+ int16_t* v = (int16_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ } else {
+ const uint16_t* p = (const uint16_t*)data;
+ uint16_t* v = (uint16_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ }
+ }
+
+ pBuf->assign = true;
+}
+
+static void handleInt32Col(const void* data, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc,
+ bool signVal) {
+ // AVX2 version to speedup the loop
+ if (tsAVX2Enable && tsSIMDEnable) {
+ pBuf->v = i32VectorCmpAVX2(data, numOfRows, isMinFunc, signVal);
+ } else {
+ if (!pBuf->assign) {
+ pBuf->v = ((int32_t*)data)[0];
+ }
+
+ if (signVal) {
+ const int32_t* p = (const int32_t*)data;
+ int32_t* v = (int32_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ } else {
+ const uint32_t* p = (const uint32_t*)data;
+ uint32_t* v = (uint32_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ }
+ }
+
+ pBuf->assign = true;
+}
+
+static void handleInt64Col(const void* data, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc,
+ bool signVal) {
+ if (!pBuf->assign) {
+ pBuf->v = ((int64_t*)data)[0];
+ }
+
+ if (signVal) {
+ const int64_t* p = (const int64_t*)data;
+ int64_t* v = &pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ } else {
+ const uint64_t* p = (const uint64_t*)data;
+ uint64_t* v = (uint64_t*)&pBuf->v;
+
+ if (isMinFunc) {
+ __COMPARE_EXTRACT_MIN(start, start + numOfRows, *v, p);
+ } else {
+ __COMPARE_EXTRACT_MAX(start, start + numOfRows, *v, p);
+ }
+ }
+}
+
+static void handleFloatCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc) {
+ float* pData = (float*)pCol->pData;
+ float* val = (float*)&pBuf->v;
+
+ // AVX version to speedup the loop
+ if (tsAVXEnable && tsSIMDEnable) {
+ *val = floatVectorCmpAVX(pData, numOfRows, isMinFunc);
+ } else {
+ if (!pBuf->assign) {
+ *val = pData[0];
+ }
+
+ if (isMinFunc) { // min
+ for (int32_t i = start; i < start + numOfRows; ++i) {
+ if (*val > pData[i]) {
+ *val = pData[i];
+ }
+ }
+ } else { // max
+ for (int32_t i = start; i < start + numOfRows; ++i) {
+ if (*val < pData[i]) {
+ *val = pData[i];
+ }
+ }
+ }
+ }
+
+ pBuf->assign = true;
+}
+
+static void handleDoubleCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc) {
+ double* pData = (double*)pCol->pData;
+ double* val = (double*)&pBuf->v;
+
+ // AVX version to speedup the loop
+ if (tsAVXEnable && tsSIMDEnable) {
+ *val = (double)doubleVectorCmpAVX(pData, numOfRows, isMinFunc);
+ } else {
+ if (!pBuf->assign) {
+ *val = pData[0];
+ }
+
+ if (isMinFunc) { // min
+ for (int32_t i = start; i < start + numOfRows; ++i) {
+ if (*val > pData[i]) {
+ *val = pData[i];
+ }
+ }
+ } else { // max
+ for (int32_t i = start; i < start + numOfRows; ++i) {
+ if (*val < pData[i]) {
+ *val = pData[i];
+ }
+ }
+ }
+ }
+
+ pBuf->assign = true;
+}
+
+static int32_t findRowIndex(int32_t start, int32_t num, SColumnInfoData* pCol, const char* tval) {
+ // the data is loaded, not only the block SMA value
+ for (int32_t i = start; i < num + start; ++i) {
+ char* p = colDataGetData(pCol, i);
+ if (memcmp((void*)tval, p, pCol->info.bytes) == 0) {
+ return i;
+ }
+ }
+
+ // if reach here means real data of block SMA is not set in pCtx->input.
+ return -1;
+}
+
+static void doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunctionCtx* pCtx, SMinmaxResInfo* pBuf,
+ bool isMinFunc) {
+ if (isMinFunc) {
+ switch (pCol->info.type) {
+ case TSDB_DATA_TYPE_BOOL:
+ case TSDB_DATA_TYPE_TINYINT: {
+ const int8_t* pData = (const int8_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(int8_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_SMALLINT: {
+ const int16_t* pData = (const int16_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(int16_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_INT: {
+ const int32_t* pData = (const int32_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(int32_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_BIGINT: {
+ const int64_t* pData = (const int64_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, (pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UTINYINT: {
+ const uint8_t* pData = (const uint8_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(uint8_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_USMALLINT: {
+ const uint16_t* pData = (const uint16_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(uint16_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UINT: {
+ const uint32_t* pData = (const uint32_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(uint32_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UBIGINT: {
+ const uint64_t* pData = (const uint64_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(uint64_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_FLOAT: {
+ const float* pData = (const float*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(float*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_DOUBLE: {
+ const double* pData = (const double*)pCol->pData;
+ __COMPARE_ACQUIRED_MIN(i, end, pCol->nullbitmap, pData, pCtx, *(double*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+ }
+ } else {
+ switch (pCol->info.type) {
+ case TSDB_DATA_TYPE_BOOL:
+ case TSDB_DATA_TYPE_TINYINT: {
+ const int8_t* pData = (const int8_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(int8_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_SMALLINT: {
+ const int16_t* pData = (const int16_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(int16_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_INT: {
+ const int32_t* pData = (const int32_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(int32_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_BIGINT: {
+ const int64_t* pData = (const int64_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, (pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UTINYINT: {
+ const uint8_t* pData = (const uint8_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(uint8_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_USMALLINT: {
+ const uint16_t* pData = (const uint16_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(uint16_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UINT: {
+ const uint32_t* pData = (const uint32_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(uint32_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_UBIGINT: {
+ const uint64_t* pData = (const uint64_t*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(uint64_t*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_FLOAT: {
+ const float* pData = (const float*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(float*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+
+ case TSDB_DATA_TYPE_DOUBLE: {
+ const double* pData = (const double*)pCol->pData;
+ __COMPARE_ACQUIRED_MAX(i, end, pCol->nullbitmap, pData, pCtx, *(double*)&(pBuf->v), &pBuf->tuplePos)
+ break;
+ }
+ }
+ }
+}
+
+int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
+ int32_t numOfElems = 0;
+
+ SInputColumnInfoData* pInput = &pCtx->input;
+ SColumnDataAgg* pAgg = pInput->pColumnDataAgg[0];
+
+ SColumnInfoData* pCol = pInput->pData[0];
+ int32_t type = pCol->info.type;
+
+ SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+ SMinmaxResInfo* pBuf = GET_ROWCELL_INTERBUF(pResInfo);
+ pBuf->type = type;
+
+ if (IS_NULL_TYPE(type)) {
+ numOfElems = 0;
+ goto _over;
+ }
+
+ // data in current data block are qualified to the query
+ if (pInput->colDataSMAIsSet) {
+ numOfElems = pInput->numOfRows - pAgg->numOfNull;
+ ASSERT(pInput->numOfRows == pInput->totalRows && numOfElems >= 0);
+
+ if (numOfElems == 0) {
+ goto _over;
+ }
+
+ void* tval = NULL;
+ int16_t index = 0;
+
+ if (isMinFunc) {
+ tval = &pInput->pColumnDataAgg[0]->min;
+ } else {
+ tval = &pInput->pColumnDataAgg[0]->max;
+ }
+
+ if (!pBuf->assign) {
+ pBuf->v = *(int64_t*)tval;
+ if (pCtx->subsidiaries.num > 0) {
+ index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+ if (index >= 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+ }
+ }
+ } else {
+ if (IS_SIGNED_NUMERIC_TYPE(type)) {
+ int64_t prev = 0;
+ GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
+
+ int64_t val = GET_INT64_VAL(tval);
+ if ((prev < val) ^ isMinFunc) {
+ *(int64_t*)&pBuf->v = val;
+ if (pCtx->subsidiaries.num > 0) {
+ index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+ if (index >= 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+ }
+ }
+ }
+ } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+ uint64_t prev = 0;
+ GET_TYPED_DATA(prev, uint64_t, type, &pBuf->v);
+
+ uint64_t val = GET_UINT64_VAL(tval);
+ if ((prev < val) ^ isMinFunc) {
+ *(uint64_t*)&pBuf->v = val;
+ if (pCtx->subsidiaries.num > 0) {
+ index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+ if (index >= 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+ }
+ }
+ }
+ } else if (type == TSDB_DATA_TYPE_DOUBLE) {
+ double prev = 0;
+ GET_TYPED_DATA(prev, double, type, &pBuf->v);
+
+ double val = GET_DOUBLE_VAL(tval);
+ if ((prev < val) ^ isMinFunc) {
+ *(double*)&pBuf->v = val;
+ if (pCtx->subsidiaries.num > 0) {
+ index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+ if (index >= 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+ }
+ }
+ }
+ } else if (type == TSDB_DATA_TYPE_FLOAT) {
+ float prev = 0;
+ GET_TYPED_DATA(prev, float, type, &pBuf->v);
+
+ float val = GET_DOUBLE_VAL(tval);
+ if ((prev < val) ^ isMinFunc) {
+ *(float*)&pBuf->v = val;
+ }
+
+ if (pCtx->subsidiaries.num > 0) {
+ index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
+ if (index >= 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL);
+ }
+ }
+ }
+ }
+
+ pBuf->assign = true;
+ return numOfElems;
+ }
+
+ int32_t start = pInput->startRowIndex;
+ int32_t numOfRows = pInput->numOfRows;
+ int32_t end = start + numOfRows;
+
+ if (pCol->hasNull || numOfRows < 32 || pCtx->subsidiaries.num > 0) {
+ int32_t i = findFirstValPosition(pCol, start, numOfRows);
+
+ if ((i < end) && (!pBuf->assign)) {
+ memcpy(&pBuf->v, pCol->pData + (pCol->info.bytes * i), pCol->info.bytes);
+
+ if (pCtx->subsidiaries.num > 0) {
+ pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL);
+ }
+ pBuf->assign = true;
+ numOfElems = 1;
+ }
+
+ if (i >= end) {
+ ASSERT(numOfElems == 0);
+ goto _over;
+ }
+
+ doExtractVal(pCol, i, end, pCtx, pBuf, isMinFunc);
+ } else {
+ numOfElems = numOfRows;
+
+ switch (pCol->info.type) {
+ case TSDB_DATA_TYPE_BOOL:
+ case TSDB_DATA_TYPE_TINYINT: {
+ handleInt8Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, true);
+ break;
+ }
+ case TSDB_DATA_TYPE_SMALLINT: {
+ handleInt16Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, true);
+ break;
+ }
+ case TSDB_DATA_TYPE_INT: {
+ handleInt32Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, true);
+ break;
+ }
+ case TSDB_DATA_TYPE_BIGINT: {
+ handleInt64Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, true);
+ break;
+ }
+ case TSDB_DATA_TYPE_UTINYINT: {
+ handleInt8Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, false);
+ break;
+ }
+ case TSDB_DATA_TYPE_USMALLINT: {
+ handleInt16Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, false);
+ break;
+ }
+ case TSDB_DATA_TYPE_UINT: {
+ handleInt32Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, false);
+ break;
+ }
+ case TSDB_DATA_TYPE_UBIGINT: {
+ handleInt64Col(pCol->pData, start, numOfRows, pBuf, isMinFunc, false);
+ break;
+ }
+ case TSDB_DATA_TYPE_FLOAT: {
+ handleFloatCol(pCol, start, numOfRows, pBuf, isMinFunc);
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ handleDoubleCol(pCol, start, numOfRows, pBuf, isMinFunc);
+ break;
+ }
+ }
+
+ pBuf->assign = true;
+ }
+
+_over:
+ if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pBuf->nullTupleSaved) {
+ pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL);
+ pBuf->nullTupleSaved = true;
+ }
+
+ return numOfElems;
+}
\ No newline at end of file
diff --git a/source/libs/function/src/tpercentile.c b/source/libs/function/src/tpercentile.c
index 0924106476..e5727f1472 100644
--- a/source/libs/function/src/tpercentile.c
+++ b/source/libs/function/src/tpercentile.c
@@ -494,7 +494,7 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
resetSlotInfo(pMemBucket);
int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times - 1);
- SIDList list = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+ SArray* list = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
ASSERT(list != NULL && list->size > 0);
for (int32_t f = 0; f < list->size; ++f) {
diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c
index f5682b69bf..d87df2d0f3 100644
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
@@ -27,6 +27,7 @@
#include "tglobal.h"
#include "tmsg.h"
#include "trpc.h"
+#include "tmisce.h"
// clang-foramt on
typedef struct SUdfdContext {
diff --git a/source/libs/index/src/indexFilter.c b/source/libs/index/src/indexFilter.c
index 075408f1b3..2a2865a955 100644
--- a/source/libs/index/src/indexFilter.c
+++ b/source/libs/index/src/indexFilter.c
@@ -699,8 +699,8 @@ static int32_t sifExecLogic(SLogicConditionNode *node, SIFCtx *ctx, SIFParam *ou
} else {
for (int32_t m = 0; m < node->pParameterList->length; m++) {
output->status = sifMergeCond(node->condType, output->status, params[m].status);
- taosArrayDestroy(params[m].result);
- params[m].result = NULL;
+ // taosArrayDestroy(params[m].result);
+ // params[m].result = NULL;
}
}
_return:
@@ -857,9 +857,15 @@ static int32_t sifGetFltHint(SNode *pNode, SIdxFltStatus *status) {
SIF_ERR_RET(TSDB_CODE_QRY_APP_ERROR);
}
*status = res->status;
-
sifFreeParam(res);
taosHashRemove(ctx.pRes, (void *)&pNode, POINTER_BYTES);
+
+ void *iter = taosHashIterate(ctx.pRes, NULL);
+ while (iter != NULL) {
+ SIFParam *data = (SIFParam *)iter;
+ sifFreeParam(data);
+ iter = taosHashIterate(ctx.pRes, iter);
+ }
taosHashCleanup(ctx.pRes);
return code;
}
diff --git a/source/libs/parser/test/mockCatalogService.cpp b/source/libs/parser/test/mockCatalogService.cpp
index 95f7af435d..be2e4b90b9 100644
--- a/source/libs/parser/test/mockCatalogService.cpp
+++ b/source/libs/parser/test/mockCatalogService.cpp
@@ -20,9 +20,9 @@
#include