Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 74c2ec8e 编写于 作者: H Hongze Cheng
浏览文件
操作

Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tdb-merge

上级 1c0d55b2 8cc9efd2
展开全部 显示空白变更内容
内联 并排
Showing with 136305 addition and 43068 deletion

要显示的变更太多。

To preserve performance only 1000 of 1000+ files are displayed.
文本差异 电子邮件补丁
.gitignore
浏览文件 @ 74c2ec8e
...@@ -24,7 +24,6 @@ mac/ ...@@ -24,7 +24,6 @@ mac/
*.orig *.orig
src/connector/nodejs/node_modules/ src/connector/nodejs/node_modules/
src/connector/nodejs/out/ src/connector/nodejs/out/
tests/test/
tests/taoshebei/ tests/taoshebei/
tests/taoscsv/ tests/taoscsv/
tests/taosdalipu/ tests/taosdalipu/
...@@ -88,7 +87,7 @@ tests/comparisonTest/opentsdb/opentsdbtest/.settings/ ...@@ -88,7 +87,7 @@ tests/comparisonTest/opentsdb/opentsdbtest/.settings/
tests/examples/JDBC/JDBCDemo/.classpath tests/examples/JDBC/JDBCDemo/.classpath
tests/examples/JDBC/JDBCDemo/.project tests/examples/JDBC/JDBCDemo/.project
tests/examples/JDBC/JDBCDemo/.settings/ tests/examples/JDBC/JDBCDemo/.settings/
source/libs/parser/inc/new_sql.* source/libs/parser/inc/sql.*
# Emacs # Emacs
# -*- mode: gitignore; -*- # -*- mode: gitignore; -*-
......
.gitmodules
浏览文件 @ 74c2ec8e
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
[submodule "deps/TSZ"] [submodule "deps/TSZ"]
path = deps/TSZ path = deps/TSZ
url = https://github.com/taosdata/TSZ.git url = https://github.com/taosdata/TSZ.git
[submodule "tests"]
path = tests
url = https://github.com/taosdata/tests
branch = 3.0
[submodule "examples/rust"] [submodule "examples/rust"]
path = examples/rust path = examples/rust
url = https://github.com/songtianyi/tdengine-rust-bindings.git url = https://github.com/songtianyi/tdengine-rust-bindings.git
[submodule "tools/taos-tools"]
path = tools/taos-tools
url = https://github.com/taosdata/taos-tools
2.0/src/query/inc/qExecutor.h
浏览文件 @ 74c2ec8e
...@@ -589,7 +589,7 @@ SOperatorInfo* createTableSeqScanOperatorInfo(void* pTsdbQueryHandle, SQueryRunt ...@@ -589,7 +589,7 @@ SOperatorInfo* createTableSeqScanOperatorInfo(void* pTsdbQueryHandle, SQueryRunt
SOperatorInfo* createAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput); SOperatorInfo* createAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createProjectOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput); SOperatorInfo* createProjectOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream); SOperatorInfo* createLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream);
SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput); SOperatorInfo* createIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createAllTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput); SOperatorInfo* createAllTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput); SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createFillOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput, bool multigroupResult); SOperatorInfo* createFillOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput, bool multigroupResult);
......
2.0/src/query/src/qExecutor.c
浏览文件 @ 74c2ec8e
...@@ -2166,7 +2166,7 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf ...@@ -2166,7 +2166,7 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
} }
case OP_TimeWindow: { case OP_TimeWindow: {
pRuntimeEnv->proot = pRuntimeEnv->proot =
createTimeIntervalOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput); createIntervalOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType; int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
if (opType != OP_DummyInput && opType != OP_Join) { if (opType != OP_DummyInput && opType != OP_Join) {
setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot); setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
...@@ -6756,7 +6756,7 @@ SOperatorInfo* createLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI ...@@ -6756,7 +6756,7 @@ SOperatorInfo* createLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI
return pOperator; return pOperator;
} }
SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) { SOperatorInfo* createIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
STableIntervalOperatorInfo* pInfo = calloc(1, sizeof(STableIntervalOperatorInfo)); STableIntervalOperatorInfo* pInfo = calloc(1, sizeof(STableIntervalOperatorInfo));
pInfo->pCtx = createSQLFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->rowCellInfoOffset); pInfo->pCtx = createSQLFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->rowCellInfoOffset);
......
CMakeLists.txt
浏览文件 @ 74c2ec8e
...@@ -8,10 +8,11 @@ project( ...@@ -8,10 +8,11 @@ project(
set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib") set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
include(${CMAKE_SUPPORT_DIR}/cmake.options)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3") include(${CMAKE_SUPPORT_DIR}/cmake.platform)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3") include(${CMAKE_SUPPORT_DIR}/cmake.define)
include(${CMAKE_SUPPORT_DIR}/cmake.options)
include(${CMAKE_SUPPORT_DIR}/cmake.version)
# contrib # contrib
add_subdirectory(contrib) add_subdirectory(contrib)
...@@ -25,6 +26,7 @@ if(${BUILD_TEST}) ...@@ -25,6 +26,7 @@ if(${BUILD_TEST})
include(CTest) include(CTest)
enable_testing() enable_testing()
endif(${BUILD_TEST}) endif(${BUILD_TEST})
add_subdirectory(source) add_subdirectory(source)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(tests) add_subdirectory(tests)
......
Jenkinsfile2
浏览文件 @ 74c2ec8e
...@@ -35,6 +35,7 @@ def abort_previous(){ ...@@ -35,6 +35,7 @@ def abort_previous(){
def pre_test(){ def pre_test(){
sh'hostname' sh'hostname'
sh ''' sh '''
date
sudo rmtaos || echo "taosd has not installed" sudo rmtaos || echo "taosd has not installed"
''' '''
sh ''' sh '''
...@@ -60,6 +61,7 @@ def pre_test(){ ...@@ -60,6 +61,7 @@ def pre_test(){
sh ''' sh '''
cd ${WKC} cd ${WKC}
git checkout 3.0 git checkout 3.0
[ -d contrib/bdb ] && cd contrib/bdb && git clean -fxd && cd ../..
''' '''
} }
else{ else{
...@@ -74,37 +76,9 @@ def pre_test(){ ...@@ -74,37 +76,9 @@ def pre_test(){
git pull >/dev/null git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
git submodule update --init --recursive --remote git submodule update --init --recursive
'''
script {
if (env.CHANGE_TARGET == 'master') {
sh '''
cd ${WKCT}
git checkout master
'''
}
else if(env.CHANGE_TARGET == '2.0'){
sh '''
cd ${WKCT}
git checkout 2.0
'''
}
else if(env.CHANGE_TARGET == '3.0'){
sh '''
cd ${WKCT}
git checkout 3.0
'''
}
else{
sh '''
cd ${WKCT}
git checkout develop
''' '''
}
}
sh''' sh'''
cd ${WKCT}
git pull >/dev/null
cd ${WKC} cd ${WKC}
export TZ=Asia/Harbin export TZ=Asia/Harbin
date date
...@@ -123,11 +97,10 @@ pipeline { ...@@ -123,11 +97,10 @@ pipeline {
environment{ environment{
WK = '/var/lib/jenkins/workspace/TDinternal' WK = '/var/lib/jenkins/workspace/TDinternal'
WKC= '/var/lib/jenkins/workspace/TDengine' WKC= '/var/lib/jenkins/workspace/TDengine'
WKCT= '/var/lib/jenkins/workspace/TDengine/tests'
} }
stages { stages {
stage('pre_build'){ stage('pre_build'){
agent{label 'slave3_0'} agent{label " slave3_0 || slave15 || slave16 || slave17 "}
options { skipDefaultCheckout() } options { skipDefaultCheckout() }
when { when {
changeRequest() changeRequest()
......
cmake/cmake.define 0 → 100644
浏览文件 @ 74c2ec8e
cmake_minimum_required(VERSION 3.16)
IF ("${BUILD_TOOLS}" STREQUAL "")
IF (TD_LINUX)
IF (TD_ARM_32)
SET(BUILD_TOOLS "false")
ELSEIF (TD_ARM_64)
SET(BUILD_TOOLS "false")
ELSE ()
SET(BUILD_TOOLS "false")
ENDIF ()
ELSEIF (TD_DARWIN)
SET(BUILD_TOOLS "false")
ELSE ()
SET(BUILD_TOOLS "false")
ENDIF ()
ENDIF ()
IF ("${BUILD_TOOLS}" MATCHES "false")
MESSAGE("${Yellow} Will _not_ build taos_tools! ${ColourReset}")
SET(TD_TAOS_TOOLS FALSE)
ELSE ()
MESSAGE("")
MESSAGE("${Green} Will build taos_tools! ${ColourReset}")
MESSAGE("")
SET(TD_TAOS_TOOLS TRUE)
ENDIF ()
IF (TD_WINDOWS)
MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
SET(COMMON_FLAGS "/nologo /WX /wd4018 /wd4999 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
ENDIF ()
ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -g3")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -g3")
MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
ADD_DEFINITIONS("-D_TD_ARM_")
ELSE ()
ADD_DEFINITIONS("-msse4.2 -mfma")
ENDIF ()
ENDIF ()
cmake/cmake.options
浏览文件 @ 74c2ec8e
# ========================================================= # =========================================================
# Deps options # Deps options
# ========================================================= # =========================================================
IF(${TD_WINDOWS})
MESSAGE("build pthread Win32")
option(
BUILD_PTHREAD
"If build pthread on Windows"
ON
)
MESSAGE("build gnu regex for Windows")
option(
BUILD_GNUREGEX
"If build gnu regex on Windows"
ON
)
MESSAGE("build iconv Win32")
option(
BUILD_WITH_ICONV
"If build iconv on Windows"
ON
)
ENDIF ()
IF(${TD_LINUX} MATCHES TRUE)
option( option(
BUILD_TEST BUILD_TEST
"If build unit tests using googletest" "If build unit tests using googletest"
ON ON
) )
ENDIF ()
option( option(
BUILD_WITH_LEVELDB BUILD_WITH_LEVELDB
"If build with leveldb" "If build with leveldb"
...@@ -25,11 +55,16 @@ option( ...@@ -25,11 +55,16 @@ option(
OFF OFF
) )
option( IF(${TD_WINDOWS})
MESSAGE("Not build BDB on Windows")
ELSE ()
option(
BUILD_WITH_BDB BUILD_WITH_BDB
"If build with BerkleyDB" "If build with BerkleyDB"
ON ON
) )
ENDIF ()
option( option(
BUILD_WITH_LUCENE BUILD_WITH_LUCENE
...@@ -68,12 +103,16 @@ option( ...@@ -68,12 +103,16 @@ option(
OFF OFF
) )
IF(${TD_LINUX} MATCHES TRUE)
option( option(
BUILD_DEPENDENCY_TESTS BUILD_DEPENDENCY_TESTS
"If build dependency tests" "If build dependency tests"
ON ON
) )
ENDIF ()
option( option(
BUILD_DOCS BUILD_DOCS
"If use doxygen build documents" "If use doxygen build documents"
......
cmake/cmake.platform 0 → 100644
浏览文件 @ 74c2ec8e
cmake_minimum_required(VERSION 3.16)
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}.")
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
IF (${CXX_COMPILER_IS_GNU})
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
ELSE ()
ADD_DEFINITIONS("-Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unknown-warning-option")
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -undefined dynamic_lookup")
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
ENDIF ()
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
SET(TD_LINUX TRUE)
SET(OSTYPE "Linux")
ADD_DEFINITIONS("-DLINUX")
IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
SET(TD_LINUX_64 TRUE)
ELSE ()
SET(TD_LINUX_32 TRUE)
ENDIF ()
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(TD_DARWIN TRUE)
SET(OSTYPE "macOS")
ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare -Wno-return-type")
MESSAGE("Current system processor is ${CMAKE_SYSTEM_PROCESSOR}.")
IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
MESSAGE("Current system arch is arm64")
SET(TD_DARWIN_64 TRUE)
ADD_DEFINITIONS("-D_TD_DARWIN_64")
ENDIF ()
ADD_DEFINITIONS("-DHAVE_UNISTD_H")
ENDIF ()
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
SET(TD_WINDOWS TRUE)
SET(OSTYPE "Windows")
ADD_DEFINITIONS("-DWINDOWS")
IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
SET(TD_WINDOWS_64 TRUE)
ADD_DEFINITIONS("-D_TD_WINDOWS_64")
ELSE ()
SET(TD_WINDOWS_32 TRUE)
ADD_DEFINITIONS("-D_TD_WINDOWS_32")
ENDIF ()
ENDIF()
MESSAGE("C Compiler ID: ${CMAKE_C_COMPILER_ID}")
MESSAGE("CXX Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
cmake/cmake.version 0 → 100644
浏览文件 @ 74c2ec8e
IF (DEFINED VERNUMBER)
SET(TD_VER_NUMBER ${VERNUMBER})
ELSE ()
SET(TD_VER_NUMBER "3.0.0.0")
ENDIF ()
IF (DEFINED VERCOMPATIBLE)
SET(TD_VER_COMPATIBLE ${VERCOMPATIBLE})
ELSE ()
SET(TD_VER_COMPATIBLE "3.0.0.0")
ENDIF ()
find_program(HAVE_GIT NAMES git)
IF (DEFINED GITINFO)
SET(TD_VER_GIT ${GITINFO})
ELSEIF (HAVE_GIT)
execute_process(COMMAND git log -1 --format=%H WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMITID)
#message(STATUS "git log result:${GIT_COMMITID}")
IF (GIT_COMMITID)
string (REGEX REPLACE "[\n\t\r]" "" GIT_COMMITID ${GIT_COMMITID})
SET(TD_VER_GIT ${GIT_COMMITID})
ELSE ()
message(STATUS "not a git repository")
SET(TD_VER_GIT "no git commit id")
ENDIF ()
ELSE ()
message(STATUS "no git cmd")
SET(TD_VER_GIT "no git commit id")
ENDIF ()
IF (DEFINED VERDATE)
SET(TD_VER_DATE ${VERDATE})
ELSE ()
STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S")
ENDIF ()
IF (DEFINED VERTYPE)
SET(TD_VER_VERTYPE ${VERTYPE})
ELSE ()
SET(TD_VER_VERTYPE "stable")
ENDIF ()
IF (DEFINED CPUTYPE)
SET(TD_VER_CPUTYPE ${CPUTYPE})
ELSE ()
IF (TD_WINDOWS_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_LINUX_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_ARM_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_MIPS_32)
SET(TD_VER_CPUTYPE "x86")
ELSE ()
SET(TD_VER_CPUTYPE "x64")
ENDIF ()
ENDIF ()
IF (DEFINED OSTYPE)
SET(TD_VER_OSTYPE ${OSTYPE})
ELSE ()
SET(TD_VER_OSTYPE "Linux")
ENDIF ()
MESSAGE(STATUS "============= compile version parameter information start ============= ")
MESSAGE(STATUS "ver number:" ${TD_VER_NUMBER})
MESSAGE(STATUS "compatible ver number:" ${TD_VER_COMPATIBLE})
MESSAGE(STATUS "communit commit id:" ${TD_VER_GIT})
MESSAGE(STATUS "build date:" ${TD_VER_DATE})
MESSAGE(STATUS "ver type:" ${TD_VER_VERTYPE})
MESSAGE(STATUS "ver cpu:" ${TD_VER_CPUTYPE})
MESSAGE(STATUS "os type:" ${TD_VER_OSTYPE})
MESSAGE(STATUS "============= compile version parameter information end ============= ")
STRING(REPLACE "." "_" TD_LIB_VER_NUMBER ${TD_VER_NUMBER})
cmake/gnuregex_CMakeLists.txt.in 0 → 100644
浏览文件 @ 74c2ec8e
# gnuregex
ExternalProject_Add(gnuregex
URL https://launchpad.net/gnuregex/trunk/2.9/+download/libgnurx-src-2.9.zip
DOWNLOAD_NAME libgnurx-src.zip
SOURCE_DIR "${CMAKE_CONTRIB_DIR}/gnuregex"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
cmake/iconv_CMakeLists.txt.in 0 → 100644
浏览文件 @ 74c2ec8e
# iconv
ExternalProject_Add(iconv
GIT_REPOSITORY https://github.com/win-iconv/win-iconv.git
GIT_TAG v0.0.8
SOURCE_DIR "${CMAKE_CONTRIB_DIR}/iconv"
BINARY_DIR ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
\ No newline at end of file
cmake/pthread_CMakeLists.txt.in 0 → 100644
浏览文件 @ 74c2ec8e
# pthread
ExternalProject_Add(pthread
GIT_REPOSITORY https://github.com/GerHobbelt/pthread-win32
GIT_TAG v3.0.3.1
SOURCE_DIR "${CMAKE_CONTRIB_DIR}/pthread-win32"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
contrib/CMakeLists.txt
浏览文件 @ 74c2ec8e
...@@ -9,6 +9,16 @@ endfunction(cat IN_FILE OUT_FILE) ...@@ -9,6 +9,16 @@ endfunction(cat IN_FILE OUT_FILE)
set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in") set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in")
configure_file("${CMAKE_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) configure_file("${CMAKE_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
# pthread
if(${BUILD_PTHREAD})
cat("${CMAKE_SUPPORT_DIR}/pthread_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif()
# gnu regex
if(${BUILD_GNUREGEX})
cat("${CMAKE_SUPPORT_DIR}/gnuregex_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif()
# googletest # googletest
if(${BUILD_TEST}) if(${BUILD_TEST})
cat("${CMAKE_SUPPORT_DIR}/gtest_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${CMAKE_SUPPORT_DIR}/gtest_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
...@@ -73,6 +83,11 @@ if(${BUILD_WITH_NURAFT}) ...@@ -73,6 +83,11 @@ if(${BUILD_WITH_NURAFT})
cat("${CMAKE_SUPPORT_DIR}/nuraft_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${CMAKE_SUPPORT_DIR}/nuraft_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif(${BUILD_WITH_NURAFT}) endif(${BUILD_WITH_NURAFT})
# iconv
if(${BUILD_WITH_ICONV})
cat("${CMAKE_SUPPORT_DIR}/iconv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif(${BUILD_WITH_ICONV})
# download dependencies # download dependencies
configure_file(${CONTRIB_TMP_FILE} "${CMAKE_CONTRIB_DIR}/deps-download/CMakeLists.txt") configure_file(${CONTRIB_TMP_FILE} "${CMAKE_CONTRIB_DIR}/deps-download/CMakeLists.txt")
execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
...@@ -117,6 +132,11 @@ target_include_directories( ...@@ -117,6 +132,11 @@ target_include_directories(
# zlib # zlib
set(CMAKE_PROJECT_INCLUDE_BEFORE "${CMAKE_SUPPORT_DIR}/EnableCMP0048.txt.in") set(CMAKE_PROJECT_INCLUDE_BEFORE "${CMAKE_SUPPORT_DIR}/EnableCMP0048.txt.in")
add_subdirectory(zlib) add_subdirectory(zlib)
target_include_directories(
zlibstatic
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
)
target_include_directories( target_include_directories(
zlib zlib
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
...@@ -193,6 +213,11 @@ endif(${BUILD_WITH_TRAFT}) ...@@ -193,6 +213,11 @@ endif(${BUILD_WITH_TRAFT})
# LIBUV # LIBUV
if(${BUILD_WITH_UV}) if(${BUILD_WITH_UV})
if (${TD_WINDOWS})
file(READ "libuv/include/uv.h" CONTENTS)
string(REGEX REPLACE "/([\r]*)\nstruct uv_tcp_s {" "/\\1\ntypedef BOOL (PASCAL *LPFN_CONNECTEX) (SOCKET s, const struct sockaddr* name, int namelen, PVOID lpSendBuffer, DWORD dwSendDataLength,LPDWORD lpdwBytesSent, LPOVERLAPPED lpOverlapped);\\1\nstruct uv_tcp_s {" CONTENTS_NEW "${CONTENTS}")
file(WRITE "libuv/include/uv.h" "${CONTENTS_NEW}")
endif ()
add_subdirectory(libuv) add_subdirectory(libuv)
endif(${BUILD_WITH_UV}) endif(${BUILD_WITH_UV})
...@@ -223,7 +248,16 @@ if(${BUILD_WITH_SQLITE}) ...@@ -223,7 +248,16 @@ if(${BUILD_WITH_SQLITE})
) )
endif(${BUILD_WITH_SQLITE}) endif(${BUILD_WITH_SQLITE})
# pthread
if(${BUILD_PTHREAD})
add_definitions(-DPTW32_STATIC_LIB)
add_subdirectory(pthread)
endif(${BUILD_PTHREAD})
# iconv
if(${BUILD_WITH_ICONV})
add_subdirectory(iconv)
endif(${BUILD_WITH_ICONV})
# ================================================================================================ # ================================================================================================
# Build test # Build test
......
contrib/test/craft/raftMain.c
浏览文件 @ 74c2ec8e
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <raft.h> #include <raft.h>
#include <raft/uv.h> #include <raft/uv.h>
#include "raftServer.h" #include "raftServer.h"
#include "common.h" #include "tcommon.h"
const char *exe_name; const char *exe_name;
...@@ -377,7 +377,7 @@ void printConf(SRaftServerConfig *pConf) { ...@@ -377,7 +377,7 @@ void printConf(SRaftServerConfig *pConf) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
srand(time(NULL)); taosSeedRand(time(NULL));
int32_t ret; int32_t ret;
exe_name = argv[0]; exe_name = argv[0];
......
contrib/test/craft/raftServer.c
浏览文件 @ 74c2ec8e
#include <stdlib.h> #include <stdlib.h>
#include "common.h" #include "tcommon.h"
#include "raftServer.h" #include "raftServer.h"
char *keys; char *keys;
......
contrib/test/craft/raftServer.h
浏览文件 @ 74c2ec8e
...@@ -11,7 +11,7 @@ extern "C" { ...@@ -11,7 +11,7 @@ extern "C" {
#include <string.h> #include <string.h>
#include "raft.h" #include "raft.h"
#include "raft/uv.h" #include "raft/uv.h"
#include "common.h" #include "tcommon.h"
// simulate a db store, just for test // simulate a db store, just for test
......
contrib/test/craft/simulate_vnode.c
浏览文件 @ 74c2ec8e
...@@ -132,7 +132,7 @@ static void proposeValue(struct raft *r) { ...@@ -132,7 +132,7 @@ static void proposeValue(struct raft *r) {
buf.base = raft_malloc(buf.len); buf.base = raft_malloc(buf.len);
// mock ts value // mock ts value
int vid = rand() % VNODE_COUNT; int vid = taosRand() % VNODE_COUNT;
snprintf(buf.base, buf.len, "%d:value_%ld", vid, time(NULL)); snprintf(buf.base, buf.len, "%d:value_%ld", vid, time(NULL));
printf("propose value: %s \n", (char*)buf.base); printf("propose value: %s \n", (char*)buf.base);
...@@ -174,7 +174,7 @@ void usage() { ...@@ -174,7 +174,7 @@ void usage() {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
srand(time(NULL)); taosSeedRand(time(NULL));
exe_name = argv[0]; exe_name = argv[0];
if (argc < 2) { if (argc < 2) {
......
example/CMakeLists.txt
浏览文件 @ 74c2ec8e
...@@ -2,11 +2,7 @@ aux_source_directory(src TMQ_DEMO_SRC) ...@@ -2,11 +2,7 @@ aux_source_directory(src TMQ_DEMO_SRC)
add_executable(tmq ${TMQ_DEMO_SRC}) add_executable(tmq ${TMQ_DEMO_SRC})
target_link_libraries( target_link_libraries(
tmq tmq taos
PUBLIC taos
#PUBLIC util
#PUBLIC common
#PUBLIC os
) )
target_include_directories( target_include_directories(
tmq tmq
......
example/src/tmq.c
浏览文件 @ 74c2ec8e
...@@ -66,7 +66,7 @@ int32_t init_env() { ...@@ -66,7 +66,7 @@ int32_t init_env() {
} }
int32_t create_topic() { int32_t create_topic() {
printf("create topic"); printf("create topic\n");
TAOS_RES* pRes; TAOS_RES* pRes;
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
if (pConn == NULL) { if (pConn == NULL) {
...@@ -91,6 +91,10 @@ int32_t create_topic() { ...@@ -91,6 +91,10 @@ int32_t create_topic() {
return 0; return 0;
} }
void tmq_commit_cb_print(tmq_t* tmq, tmq_resp_err_t resp, tmq_topic_vgroup_list_t* offsets, void* param) {
printf("commit %d\n", resp);
}
tmq_t* build_consumer() { tmq_t* build_consumer() {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); assert(pConn != NULL);
...@@ -103,6 +107,7 @@ tmq_t* build_consumer() { ...@@ -103,6 +107,7 @@ tmq_t* build_consumer() {
tmq_conf_t* conf = tmq_conf_new(); tmq_conf_t* conf = tmq_conf_new();
tmq_conf_set(conf, "group.id", "tg2"); tmq_conf_set(conf, "group.id", "tg2");
tmq_conf_set_offset_commit_cb(conf, tmq_commit_cb_print);
tmq_t* tmq = tmq_consumer_new(pConn, conf, NULL, 0); tmq_t* tmq = tmq_consumer_new(pConn, conf, NULL, 0);
return tmq; return tmq;
} }
...@@ -144,7 +149,7 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -144,7 +149,7 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
} }
void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) { void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
static const int MIN_COMMIT_COUNT = 1000; static const int MIN_COMMIT_COUNT = 1;
int msg_count = 0; int msg_count = 0;
tmq_resp_err_t err; tmq_resp_err_t err;
...@@ -155,7 +160,7 @@ void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -155,7 +160,7 @@ void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
} }
while (running) { while (running) {
tmq_message_t* tmqmessage = tmq_consumer_poll(tmq, 500); tmq_message_t* tmqmessage = tmq_consumer_poll(tmq, 1000);
if (tmqmessage) { if (tmqmessage) {
msg_process(tmqmessage); msg_process(tmqmessage);
tmq_message_destroy(tmqmessage); tmq_message_destroy(tmqmessage);
...@@ -214,6 +219,6 @@ int main(int argc, char* argv[]) { ...@@ -214,6 +219,6 @@ int main(int argc, char* argv[]) {
tmq_t* tmq = build_consumer(); tmq_t* tmq = build_consumer();
tmq_list_t* topic_list = build_topic_list(); tmq_list_t* topic_list = build_topic_list();
/*perf_loop(tmq, topic_list);*/ /*perf_loop(tmq, topic_list);*/
basic_consume_loop(tmq, topic_list); /*basic_consume_loop(tmq, topic_list);*/
/*sync_consume_loop(tmq, topic_list);*/ sync_consume_loop(tmq, topic_list);
} }
examples/c/schemaless.c
浏览文件 @ 74c2ec8e
...@@ -19,7 +19,7 @@ void shuffle(char**lines, size_t n) ...@@ -19,7 +19,7 @@ void shuffle(char**lines, size_t n)
size_t i; size_t i;
for (i = 0; i < n - 1; i++) for (i = 0; i < n - 1; i++)
{ {
size_t j = i + rand() / (RAND_MAX / (n - i) + 1); size_t j = i + taosRand() / (RAND_MAX / (n - i) + 1);
char* t = lines[j]; char* t = lines[j];
lines[j] = lines[i]; lines[j] = lines[i];
lines[i] = t; lines[i] = t;
......
include/client/taos.h
浏览文件 @ 74c2ec8e
...@@ -39,18 +39,19 @@ typedef void **TAOS_ROW; ...@@ -39,18 +39,19 @@ typedef void **TAOS_ROW;
#define TSDB_DATA_TYPE_BIGINT 5 // 8 bytes #define TSDB_DATA_TYPE_BIGINT 5 // 8 bytes
#define TSDB_DATA_TYPE_FLOAT 6 // 4 bytes #define TSDB_DATA_TYPE_FLOAT 6 // 4 bytes
#define TSDB_DATA_TYPE_DOUBLE 7 // 8 bytes #define TSDB_DATA_TYPE_DOUBLE 7 // 8 bytes
#define TSDB_DATA_TYPE_BINARY 8 // string, alias for varchar #define TSDB_DATA_TYPE_VARCHAR 8 // string, alias for varchar
#define TSDB_DATA_TYPE_TIMESTAMP 9 // 8 bytes #define TSDB_DATA_TYPE_TIMESTAMP 9 // 8 bytes
#define TSDB_DATA_TYPE_NCHAR 10 // unicode string #define TSDB_DATA_TYPE_NCHAR 10 // unicode string
#define TSDB_DATA_TYPE_UTINYINT 11 // 1 byte #define TSDB_DATA_TYPE_UTINYINT 11 // 1 byte
#define TSDB_DATA_TYPE_USMALLINT 12 // 2 bytes #define TSDB_DATA_TYPE_USMALLINT 12 // 2 bytes
#define TSDB_DATA_TYPE_UINT 13 // 4 bytes #define TSDB_DATA_TYPE_UINT 13 // 4 bytes
#define TSDB_DATA_TYPE_UBIGINT 14 // 8 bytes #define TSDB_DATA_TYPE_UBIGINT 14 // 8 bytes
#define TSDB_DATA_TYPE_VARCHAR 15 // string #define TSDB_DATA_TYPE_JSON 15 // json string
#define TSDB_DATA_TYPE_VARBINARY 16 // binary #define TSDB_DATA_TYPE_VARBINARY 16 // binary
#define TSDB_DATA_TYPE_JSON 17 // json #define TSDB_DATA_TYPE_DECIMAL 17 // decimal
#define TSDB_DATA_TYPE_DECIMAL 18 // decimal #define TSDB_DATA_TYPE_BLOB 18 // binary
#define TSDB_DATA_TYPE_BLOB 19 // binary #define TSDB_DATA_TYPE_MEDIUMBLOB 19
#define TSDB_DATA_TYPE_BINARY TSDB_DATA_TYPE_VARCHAR // string
typedef enum { typedef enum {
TSDB_OPTION_LOCALE, TSDB_OPTION_LOCALE,
...@@ -198,8 +199,8 @@ DLL_EXPORT TAOS_RES *taos_schemaless_insert(TAOS *taos, char *lines[], int numLi ...@@ -198,8 +199,8 @@ DLL_EXPORT TAOS_RES *taos_schemaless_insert(TAOS *taos, char *lines[], int numLi
/* --------------------------TMQ INTERFACE------------------------------- */ /* --------------------------TMQ INTERFACE------------------------------- */
enum tmq_resp_err_t { enum tmq_resp_err_t {
TMQ_RESP_ERR__FAIL = -1,
TMQ_RESP_ERR__SUCCESS = 0, TMQ_RESP_ERR__SUCCESS = 0,
TMQ_RESP_ERR__FAIL = 1,
}; };
typedef enum tmq_resp_err_t tmq_resp_err_t; typedef enum tmq_resp_err_t tmq_resp_err_t;
...@@ -224,10 +225,8 @@ DLL_EXPORT const char *tmq_err2str(tmq_resp_err_t); ...@@ -224,10 +225,8 @@ DLL_EXPORT const char *tmq_err2str(tmq_resp_err_t);
/* ------------------------TMQ CONSUMER INTERFACE------------------------ */ /* ------------------------TMQ CONSUMER INTERFACE------------------------ */
DLL_EXPORT tmq_resp_err_t tmq_subscribe(tmq_t *tmq, tmq_list_t *topic_list); DLL_EXPORT tmq_resp_err_t tmq_subscribe(tmq_t *tmq, tmq_list_t *topic_list);
#if 0 DLL_EXPORT tmq_resp_err_t tmq_unsubscribe(tmq_t *tmq);
DLL_EXPORT tmq_resp_err_t tmq_unsubscribe(tmq_t* tmq); DLL_EXPORT tmq_resp_err_t tmq_subscription(tmq_t *tmq, tmq_list_t **topics);
DLL_EXPORT tmq_resp_err_t tmq_subscription(tmq_t* tmq, tmq_topic_vgroup_list_t** topics);
#endif
DLL_EXPORT tmq_message_t *tmq_consumer_poll(tmq_t *tmq, int64_t blocking_time); DLL_EXPORT tmq_message_t *tmq_consumer_poll(tmq_t *tmq, int64_t blocking_time);
DLL_EXPORT tmq_resp_err_t tmq_consumer_close(tmq_t *tmq); DLL_EXPORT tmq_resp_err_t tmq_consumer_close(tmq_t *tmq);
#if 0 #if 0
...@@ -238,6 +237,7 @@ DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t * ...@@ -238,6 +237,7 @@ DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t *
#if 0 #if 0
DLL_EXPORT tmq_resp_err_t tmq_commit_message(tmq_t* tmq, const tmq_message_t* tmqmessage, int32_t async); DLL_EXPORT tmq_resp_err_t tmq_commit_message(tmq_t* tmq, const tmq_message_t* tmqmessage, int32_t async);
#endif #endif
DLL_EXPORT tmq_resp_err_t tmq_seek(tmq_t *tmq, const tmq_topic_vgroup_t *offset);
/* ----------------------TMQ CONFIGURATION INTERFACE---------------------- */ /* ----------------------TMQ CONFIGURATION INTERFACE---------------------- */
enum tmq_conf_res_t { enum tmq_conf_res_t {
...@@ -257,6 +257,16 @@ DLL_EXPORT void tmq_conf_set_offset_commit_cb(tmq_conf_t *conf, tmq_co ...@@ -257,6 +257,16 @@ DLL_EXPORT void tmq_conf_set_offset_commit_cb(tmq_conf_t *conf, tmq_co
void tmqShowMsg(tmq_message_t *tmq_message); void tmqShowMsg(tmq_message_t *tmq_message);
int32_t tmqGetSkipLogNum(tmq_message_t *tmq_message); int32_t tmqGetSkipLogNum(tmq_message_t *tmq_message);
/* -------------------------TMQ MSG HANDLE INTERFACE---------------------- */
DLL_EXPORT TAOS_ROW tmq_get_row(tmq_message_t *message);
DLL_EXPORT char *tmq_get_topic_name(tmq_message_t *message);
/* ---------------------- OTHER ---------------------------- */
typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB *tsub, TAOS_RES *res, void *param, int code);
DLL_EXPORT int taos_stmt_affected_rows(TAOS_STMT *stmt);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
include/common/taosdef.h
浏览文件 @ 74c2ec8e
...@@ -16,44 +16,28 @@ ...@@ -16,44 +16,28 @@
#ifndef _TD_COMMON_TAOS_DEF_H_ #ifndef _TD_COMMON_TAOS_DEF_H_
#define _TD_COMMON_TAOS_DEF_H_ #define _TD_COMMON_TAOS_DEF_H_
#include "taos.h"
#include "tdef.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "taos.h"
#include "tdef.h"
typedef int64_t tb_uid_t; typedef int64_t tb_uid_t;
#define TSWINDOW_INITIALIZER ((STimeWindow){INT64_MIN, INT64_MAX}) #define TSWINDOW_INITIALIZER ((STimeWindow){INT64_MIN, INT64_MAX})
#define TSWINDOW_DESC_INITIALIZER ((STimeWindow){INT64_MAX, INT64_MIN}) #define TSWINDOW_DESC_INITIALIZER ((STimeWindow){INT64_MAX, INT64_MIN})
#define IS_TSWINDOW_SPECIFIED(win) (((win).skey != INT64_MIN) || ((win).ekey != INT64_MAX)) #define IS_TSWINDOW_SPECIFIED(win) (((win).skey != INT64_MIN) || ((win).ekey != INT64_MAX))
typedef enum {
TAOS_QTYPE_RPC = 1,
TAOS_QTYPE_FWD = 2,
TAOS_QTYPE_WAL = 3,
TAOS_QTYPE_CQ = 4,
TAOS_QTYPE_QUERY = 5
} EQType;
typedef enum { typedef enum {
TSDB_SUPER_TABLE = 1, // super table TSDB_SUPER_TABLE = 1, // super table
TSDB_CHILD_TABLE = 2, // table created from super table TSDB_CHILD_TABLE = 2, // table created from super table
TSDB_NORMAL_TABLE = 3, // ordinary table TSDB_NORMAL_TABLE = 3, // ordinary table
TSDB_STREAM_TABLE = 4, // table created from stream computing TSDB_STREAM_TABLE = 4, // table created by stream processing
TSDB_TEMP_TABLE = 5, // temp table created by nest query TSDB_TEMP_TABLE = 5, // temp table created by nest query
TSDB_TABLE_MAX = 6 TSDB_TABLE_MAX = 6
} ETableType; } ETableType;
typedef enum {
TSDB_MOD_MNODE = 1,
TSDB_MOD_HTTP = 2,
TSDB_MOD_MONITOR = 3,
TSDB_MOD_MQTT = 4,
TSDB_MOD_MAX = 5
} EModuleType;
typedef enum { typedef enum {
TSDB_CHECK_ITEM_NETWORK, TSDB_CHECK_ITEM_NETWORK,
TSDB_CHECK_ITEM_MEM, TSDB_CHECK_ITEM_MEM,
...@@ -66,10 +50,32 @@ typedef enum { ...@@ -66,10 +50,32 @@ typedef enum {
TSDB_CHECK_ITEM_MAX TSDB_CHECK_ITEM_MAX
} ECheckItemType; } ECheckItemType;
typedef enum { TD_ROW_DISCARD_UPDATE = 0, TD_ROW_OVERWRITE_UPDATE = 1, TD_ROW_PARTIAL_UPDATE = 2 } TDUpdateConfig; typedef enum {
TD_ROW_DISCARD_UPDATE = 0,
TD_ROW_OVERWRITE_UPDATE = 1,
TD_ROW_PARTIAL_UPDATE = 2,
} TDUpdateConfig;
typedef enum {
TSDB_STATIS_OK = 0, // statis part exist and load successfully
TSDB_STATIS_NONE = 1, // statis part not exist
} ETsdbStatisStatus;
typedef enum {
TSDB_SMA_STAT_OK = 0, // ready to provide service
TSDB_SMA_STAT_EXPIRED = 1, // not ready or expired
} ETsdbSmaStat;
typedef enum {
TSDB_SMA_TYPE_BLOCK = 0, // Block-wise SMA
TSDB_SMA_TYPE_TIME_RANGE = 1, // Time-range-wise SMA
TSDB_SMA_TYPE_ROLLUP = 2, // Rollup SMA
} ETsdbSmaType;
extern char *qtypeStr[]; extern char *qtypeStr[];
#define TSDB_PORT_HTTP 11
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
include/common/common.h → include/common/tcommon.h
浏览文件 @ 74c2ec8e
...@@ -13,44 +13,34 @@ ...@@ -13,44 +13,34 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_COMMON_H #ifndef _TD_COMMON_DEF_H_
#define TDENGINE_COMMON_H #define _TD_COMMON_DEF_H_
#include "taosdef.h"
#include "tarray.h"
#include "tmsg.h"
#include "tvariant.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "taosdef.h" enum {
#include "tarray.h" TMQ_CONF__RESET_OFFSET__LATEST = -1,
#include "tmsg.h" TMQ_CONF__RESET_OFFSET__EARLIEAST = -2,
#include "tvariant.h" TMQ_CONF__RESET_OFFSET__NONE = -3,
// typedef struct STimeWindow { };
// TSKEY skey;
// TSKEY ekey; enum {
// } STimeWindow; TMQ_MSG_TYPE__DUMMY = 0,
TMQ_MSG_TYPE__POLL_RSP,
// typedef struct { TMQ_MSG_TYPE__EP_RSP,
// int32_t dataLen; };
// char name[TSDB_TABLE_FNAME_LEN];
// char *data;
// } STagData;
// typedef struct SSchema {
// uint8_t type;
// char name[TSDB_COL_NAME_LEN];
// int16_t colId;
// int16_t bytes;
// } SSchema;
#define TMQ_REQ_TYPE_COMMIT_ONLY 0
#define TMQ_REQ_TYPE_CONSUME_ONLY 1
#define TMQ_REQ_TYPE_CONSUME_AND_COMMIT 2
typedef struct { typedef struct {
uint32_t numOfTables; uint32_t numOfTables;
SArray *pGroupList; SArray* pGroupList;
SHashObj *map; // speedup acquire the tableQueryInfo by table uid SHashObj* map; // speedup acquire the tableQueryInfo by table uid
} STableGroupInfo; } STableGroupInfo;
typedef struct SColumnDataAgg { typedef struct SColumnDataAgg {
...@@ -66,27 +56,28 @@ typedef struct SColumnDataAgg { ...@@ -66,27 +56,28 @@ typedef struct SColumnDataAgg {
typedef struct SDataBlockInfo { typedef struct SDataBlockInfo {
STimeWindow window; STimeWindow window;
int32_t rows; int32_t rows;
int32_t numOfCols; int32_t rowSize;
int64_t uid; int16_t numOfCols;
int16_t hasVarCol;
union {int64_t uid; int64_t blockId;};
} SDataBlockInfo; } SDataBlockInfo;
typedef struct SConstantItem { //typedef struct SConstantItem {
SColumnInfo info; // SColumnInfo info;
int32_t startRow; // run-length-encoding to save the space for multiple rows // int32_t startRow; // run-length-encoding to save the space for multiple rows
int32_t endRow; // int32_t endRow;
SVariant value; // SVariant value;
} SConstantItem; //} SConstantItem;
// info.numOfCols = taosArrayGetSize(pDataBlock) + taosArrayGetSize(pConstantList); // info.numOfCols = taosArrayGetSize(pDataBlock) + taosArrayGetSize(pConstantList);
typedef struct SSDataBlock { typedef struct SSDataBlock {
SColumnDataAgg *pBlockAgg; SColumnDataAgg *pBlockAgg;
SArray *pDataBlock; // SArray<SColumnInfoData> SArray *pDataBlock; // SArray<SColumnInfoData>
SArray *pConstantList; // SArray<SConstantItem>, it is a constant/tags value of the corresponding result value.
SDataBlockInfo info; SDataBlockInfo info;
} SSDataBlock; } SSDataBlock;
typedef struct SVarColAttr { typedef struct SVarColAttr {
int32_t *offset; // start position for each entry in the list int32_t* offset; // start position for each entry in the list
uint32_t length; // used buffer size that contain the valid data uint32_t length; // used buffer size that contain the valid data
uint32_t allocLen; // allocated buffer size uint32_t allocLen; // allocated buffer size
} SVarColAttr; } SVarColAttr;
...@@ -95,61 +86,29 @@ typedef struct SVarColAttr { ...@@ -95,61 +86,29 @@ typedef struct SVarColAttr {
// pBlockAgg->numOfNull == 0, no data are null. // pBlockAgg->numOfNull == 0, no data are null.
typedef struct SColumnInfoData { typedef struct SColumnInfoData {
SColumnInfo info; // TODO filter info needs to be removed SColumnInfo info; // TODO filter info needs to be removed
bool hasNull;// if current column data has null value. bool hasNull; // if current column data has null value.
char *pData; // the corresponding block data in memory char* pData; // the corresponding block data in memory
union { union {
char *nullbitmap; // bitmap, one bit for each item in the list char* nullbitmap; // bitmap, one bit for each item in the list
SVarColAttr varmeta; SVarColAttr varmeta;
}; };
} SColumnInfoData; } SColumnInfoData;
static FORCE_INLINE int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) { void* blockDataDestroy(SSDataBlock* pBlock);
int64_t tbUid = pBlock->info.uid; int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock);
int32_t numOfCols = pBlock->info.numOfCols; void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock);
int32_t rows = pBlock->info.rows;
int32_t sz = taosArrayGetSize(pBlock->pDataBlock);
int32_t tlen = 0; static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) {
tlen += taosEncodeFixedI64(buf, tbUid); if (pBlock == NULL) {
tlen += taosEncodeFixedI32(buf, numOfCols); return;
tlen += taosEncodeFixedI32(buf, rows);
tlen += taosEncodeFixedI32(buf, sz);
for (int32_t i = 0; i < sz; i++) {
SColumnInfoData* pColData = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, i);
tlen += taosEncodeFixedI16(buf, pColData->info.colId);
tlen += taosEncodeFixedI16(buf, pColData->info.type);
tlen += taosEncodeFixedI16(buf, pColData->info.bytes);
int32_t colSz = rows * pColData->info.bytes;
tlen += taosEncodeBinary(buf, pColData->pData, colSz);
}
return tlen;
}
static FORCE_INLINE void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock) {
int32_t sz;
buf = taosDecodeFixedI64(buf, &pBlock->info.uid);
buf = taosDecodeFixedI32(buf, &pBlock->info.numOfCols);
buf = taosDecodeFixedI32(buf, &pBlock->info.rows);
buf = taosDecodeFixedI32(buf, &sz);
pBlock->pDataBlock = taosArrayInit(sz, sizeof(SColumnInfoData));
for (int32_t i = 0; i < sz; i++) {
SColumnInfoData data = {0};
buf = taosDecodeFixedI16(buf, &data.info.colId);
buf = taosDecodeFixedI16(buf, &data.info.type);
buf = taosDecodeFixedI16(buf, &data.info.bytes);
int32_t colSz = pBlock->info.rows * data.info.bytes;
buf = taosDecodeBinary(buf, (void**)&data.pData, colSz);
taosArrayPush(pBlock->pDataBlock, &data);
} }
return (void*)buf; blockDataDestroy(pBlock);
} }
static FORCE_INLINE int32_t tEncodeSMqConsumeRsp(void** buf, const SMqConsumeRsp* pRsp) { static FORCE_INLINE int32_t tEncodeSMqPollRsp(void** buf, const SMqPollRsp* pRsp) {
int32_t tlen = 0; int32_t tlen = 0;
int32_t sz = 0; int32_t sz = 0;
tlen += taosEncodeFixedI64(buf, pRsp->consumerId); tlen += taosEncodeFixedI64(buf, pRsp->consumerId);
tlen += taosEncodeFixedI64(buf, pRsp->committedOffset);
tlen += taosEncodeFixedI64(buf, pRsp->reqOffset); tlen += taosEncodeFixedI64(buf, pRsp->reqOffset);
tlen += taosEncodeFixedI64(buf, pRsp->rspOffset); tlen += taosEncodeFixedI64(buf, pRsp->rspOffset);
tlen += taosEncodeFixedI32(buf, pRsp->skipLogNum); tlen += taosEncodeFixedI32(buf, pRsp->skipLogNum);
...@@ -167,10 +126,9 @@ static FORCE_INLINE int32_t tEncodeSMqConsumeRsp(void** buf, const SMqConsumeRsp ...@@ -167,10 +126,9 @@ static FORCE_INLINE int32_t tEncodeSMqConsumeRsp(void** buf, const SMqConsumeRsp
return tlen; return tlen;
} }
static FORCE_INLINE void* tDecodeSMqConsumeRsp(void* buf, SMqConsumeRsp* pRsp) { static FORCE_INLINE void* tDecodeSMqPollRsp(void* buf, SMqPollRsp* pRsp) {
int32_t sz; int32_t sz;
buf = taosDecodeFixedI64(buf, &pRsp->consumerId); buf = taosDecodeFixedI64(buf, &pRsp->consumerId);
buf = taosDecodeFixedI64(buf, &pRsp->committedOffset);
buf = taosDecodeFixedI64(buf, &pRsp->reqOffset); buf = taosDecodeFixedI64(buf, &pRsp->reqOffset);
buf = taosDecodeFixedI64(buf, &pRsp->rspOffset); buf = taosDecodeFixedI64(buf, &pRsp->rspOffset);
buf = taosDecodeFixedI32(buf, &pRsp->skipLogNum); buf = taosDecodeFixedI32(buf, &pRsp->skipLogNum);
...@@ -189,24 +147,7 @@ static FORCE_INLINE void* tDecodeSMqConsumeRsp(void* buf, SMqConsumeRsp* pRsp) { ...@@ -189,24 +147,7 @@ static FORCE_INLINE void* tDecodeSMqConsumeRsp(void* buf, SMqConsumeRsp* pRsp) {
return buf; return buf;
} }
static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) { static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqPollRsp* pRsp) {
if (pBlock == NULL) {
return;
}
// int32_t numOfOutput = pBlock->info.numOfCols;
int32_t sz = taosArrayGetSize(pBlock->pDataBlock);
for (int32_t i = 0; i < sz; ++i) {
SColumnInfoData* pColInfoData = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, i);
tfree(pColInfoData->pData);
}
taosArrayDestroy(pBlock->pDataBlock);
tfree(pBlock->pBlockAgg);
// tfree(pBlock);
}
static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqConsumeRsp* pRsp) {
if (pRsp->schemas) { if (pRsp->schemas) {
if (pRsp->schemas->nCols) { if (pRsp->schemas->nCols) {
tfree(pRsp->schemas->pSchema); tfree(pRsp->schemas->pSchema);
...@@ -215,19 +156,27 @@ static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqConsumeRsp* pRsp) { ...@@ -215,19 +156,27 @@ static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqConsumeRsp* pRsp) {
} }
taosArrayDestroyEx(pRsp->pBlockData, (void (*)(void*))tDeleteSSDataBlock); taosArrayDestroyEx(pRsp->pBlockData, (void (*)(void*))tDeleteSSDataBlock);
pRsp->pBlockData = NULL; pRsp->pBlockData = NULL;
// for (int i = 0; i < taosArrayGetSize(pRsp->pBlockData); i++) {
// SSDataBlock* pDataBlock = (SSDataBlock*)taosArrayGet(pRsp->pBlockData, i);
// tDeleteSSDataBlock(pDataBlock);
//}
} }
//====================================================================================================================== //======================================================================================================================
// the following structure shared by parser and executor // the following structure shared by parser and executor
typedef struct SColumn { typedef struct SColumn {
union {
uint64_t uid; uint64_t uid;
int64_t dataBlockId;
};
union {
int16_t colId;
int16_t slotId;
};
char name[TSDB_COL_NAME_LEN]; char name[TSDB_COL_NAME_LEN];
int8_t flag; // column type: normal column, tag, or user-input column (integer/float/string) int8_t flag; // column type: normal column, tag, or user-input column (integer/float/string)
SColumnInfo info; int16_t type;
int32_t bytes;
uint8_t precision;
uint8_t scale;
} SColumn; } SColumn;
typedef struct SLimit { typedef struct SLimit {
...@@ -245,21 +194,32 @@ typedef struct SGroupbyExpr { ...@@ -245,21 +194,32 @@ typedef struct SGroupbyExpr {
bool groupbyTag; // group by tag or column bool groupbyTag; // group by tag or column
} SGroupbyExpr; } SGroupbyExpr;
typedef struct SFunctParam {
int32_t type;
SColumn *pCol;
SVariant param;
} SFunctParam;
// the structure for sql function in select clause // the structure for sql function in select clause
typedef struct SSqlExpr { typedef struct SResSchame {
char token[TSDB_COL_NAME_LEN]; // original token int8_t type;
SSchema resSchema; int32_t colId;
int32_t bytes;
int32_t precision;
int32_t scale;
char name[TSDB_COL_NAME_LEN];
} SResSchema;
int32_t numOfCols; // TODO move away to executor.h
SColumn* pColumns; // data columns that are required by query typedef struct SExprBasicInfo {
int32_t interBytes; // inter result buffer size SResSchema resSchema;
int16_t numOfParams; // argument value of each function int16_t numOfParams; // argument value of each function
SVariant param[3]; // parameters are not more than 3 SFunctParam *pParam;
} SSqlExpr; } SExprBasicInfo;
typedef struct SExprInfo { typedef struct SExprInfo {
struct SSqlExpr base; struct SExprBasicInfo base;
struct tExprNode* pExpr; struct tExprNode *pExpr;
} SExprInfo; } SExprInfo;
typedef struct SStateWindow { typedef struct SStateWindow {
...@@ -280,4 +240,4 @@ typedef struct SSessionWindow { ...@@ -280,4 +240,4 @@ typedef struct SSessionWindow {
} }
#endif #endif
#endif // TDENGINE_COMMON_H #endif /*_TD_COMMON_DEF_H_*/
include/common/tep.h → include/common/tdatablock.h
浏览文件 @ 74c2ec8e
#ifndef TDENGINE_TEP_H /*
#define TDENGINE_TEP_H * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_COMMON_EP_H_
#define _TD_COMMON_EP_H_
#include "tcommon.h"
#include "tmsg.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "os.h"
#include "tmsg.h"
#include "common.h"
typedef struct SCorEpSet { typedef struct SCorEpSet {
int32_t version; int32_t version;
SEpSet epSet; SEpSet epSet;
...@@ -17,19 +31,16 @@ typedef struct SCorEpSet { ...@@ -17,19 +31,16 @@ typedef struct SCorEpSet {
typedef struct SBlockOrderInfo { typedef struct SBlockOrderInfo {
int32_t order; int32_t order;
int32_t colIndex; int32_t colIndex;
SColumnInfoData *pColData; SColumnInfoData* pColData;
// int32_t type;
// int32_t bytes;
// bool hasNull;
} SBlockOrderInfo; } SBlockOrderInfo;
int taosGetFqdnPortFromEp(const char *ep, SEp *pEp); int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp);
void addEpIntoEpSet(SEpSet *pEpSet, const char *fqdn, uint16_t port); void addEpIntoEpSet(SEpSet* pEpSet, const char* fqdn, uint16_t port);
bool isEpsetEqual(const SEpSet *s1, const SEpSet *s2); bool isEpsetEqual(const SEpSet* s1, const SEpSet* s2);
void updateEpSet_s(SCorEpSet *pEpSet, SEpSet *pNewEpSet); void updateEpSet_s(SCorEpSet* pEpSet, SEpSet* pNewEpSet);
SEpSet getEpSet_s(SCorEpSet *pEpSet); SEpSet getEpSet_s(SCorEpSet* pEpSet);
#define NBIT (3u) #define NBIT (3u)
#define BitPos(_n) ((_n) & ((1 << NBIT) - 1)) #define BitPos(_n) ((_n) & ((1 << NBIT) - 1))
...@@ -41,7 +52,23 @@ SEpSet getEpSet_s(SCorEpSet *pEpSet); ...@@ -41,7 +52,23 @@ SEpSet getEpSet_s(SCorEpSet *pEpSet);
BMCharPos(bm_, r_) |= (1u << (7u - BitPos(r_))); \ BMCharPos(bm_, r_) |= (1u << (7u - BitPos(r_))); \
} while (0) } while (0)
static FORCE_INLINE bool colDataIsNull(const SColumnInfoData* pColumnInfoData, uint32_t totalRows, uint32_t row, SColumnDataAgg* pColAgg) { static FORCE_INLINE bool colDataIsNull_s(const SColumnInfoData* pColumnInfoData, uint32_t row) {
if (!pColumnInfoData->hasNull) {
return false;
}
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
return pColumnInfoData->varmeta.offset[row] == -1;
} else {
if (pColumnInfoData->nullbitmap == NULL) {
return false;
}
return colDataIsNull_f(pColumnInfoData->nullbitmap, row);
}
}
static FORCE_INLINE bool colDataIsNull(const SColumnInfoData* pColumnInfoData, uint32_t totalRows, uint32_t row,
SColumnDataAgg* pColAgg) {
if (!pColumnInfoData->hasNull) { if (!pColumnInfoData->hasNull) {
return false; return false;
} }
...@@ -67,22 +94,27 @@ static FORCE_INLINE bool colDataIsNull(const SColumnInfoData* pColumnInfoData, u ...@@ -67,22 +94,27 @@ static FORCE_INLINE bool colDataIsNull(const SColumnInfoData* pColumnInfoData, u
} }
} }
#define colDataGet(p1_, r_) \ #define BitmapLen(_n) (((_n) + ((1 << NBIT) - 1)) >> NBIT)
((IS_VAR_DATA_TYPE((p1_)->info.type)) ? (p1_)->pData + (p1_)->varmeta.offset[(r_)] \
: (p1_)->pData + ((r_) * (p1_)->info.bytes)); // SColumnInfoData, rowNumber
#define colDataGetData(p1_, r_) \
((IS_VAR_DATA_TYPE((p1_)->info.type)) ? ((p1_)->pData + (p1_)->varmeta.offset[(r_)]) \
: ((p1_)->pData + ((r_) * (p1_)->info.bytes)))
int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData, bool isNull); int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData, bool isNull);
int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, const SColumnInfoData* pSource, uint32_t numOfRow2); int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, const SColumnInfoData* pSource,
uint32_t numOfRow2);
int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock); int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock);
int32_t colDataGetSize(const SColumnInfoData* pColumnInfoData, int32_t numOfRows); int32_t colDataGetLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRows);
void colDataTrim(SColumnInfoData* pColumnInfoData); void colDataTrim(SColumnInfoData* pColumnInfoData);
size_t colDataGetNumOfCols(const SSDataBlock* pBlock); size_t blockDataGetNumOfCols(const SSDataBlock* pBlock);
size_t colDataGetNumOfRows(const SSDataBlock* pBlock); size_t blockDataGetNumOfRows(const SSDataBlock* pBlock);
int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc); int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc);
int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startIndex, int32_t* stopIndex, int32_t pageSize); int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startIndex, int32_t* stopIndex,
int32_t pageSize);
SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount); SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount);
int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock); int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock);
...@@ -93,17 +125,20 @@ size_t blockDataGetRowSize(const SSDataBlock* pBlock); ...@@ -93,17 +125,20 @@ size_t blockDataGetRowSize(const SSDataBlock* pBlock);
double blockDataGetSerialRowSize(const SSDataBlock* pBlock); double blockDataGetSerialRowSize(const SSDataBlock* pBlock);
size_t blockDataGetSerialMetaSize(const SSDataBlock* pBlock); size_t blockDataGetSerialMetaSize(const SSDataBlock* pBlock);
size_t blockDataNumOfRowsForSerialize(const SSDataBlock* pBlock, int32_t blockSize); SSchema* blockDataExtractSchema(const SSDataBlock* pBlock, int32_t* numOfCols);
int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullFirst); int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullFirst);
int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullFirst); int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullFirst);
int32_t blockDataEnsureColumnCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows); int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
void blockDataClearup(SSDataBlock* pDataBlock, bool hasVarCol); void blockDataClearup(SSDataBlock* pDataBlock);
void *blockDataDestroy(SSDataBlock *pBlock); SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock);
size_t blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
void* blockDataDestroy(SSDataBlock* pBlock);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // TDENGINE_TEP_H #endif /*_TD_COMMON_EP_H_*/
include/common/tdataformat.h
浏览文件 @ 74c2ec8e
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _TD_COMMON_DATA_FORMAT_H_ #ifndef _TD_COMMON_DATA_FORMAT_H_
#define _TD_COMMON_DATA_FORMAT_H_ #define _TD_COMMON_DATA_FORMAT_H_
...@@ -77,9 +78,9 @@ typedef struct { ...@@ -77,9 +78,9 @@ typedef struct {
// ----------------- TSDB SCHEMA DEFINITION // ----------------- TSDB SCHEMA DEFINITION
typedef struct { typedef struct {
int version; // version int32_t version; // version
int numOfCols; // Number of columns appended int32_t numOfCols; // Number of columns appended
int tlen; // maximum length of a STpRow without the header part (sizeof(VarDataOffsetT) + sizeof(VarDataLenT) + int32_t tlen; // maximum length of a STpRow without the header part (sizeof(VarDataOffsetT) + sizeof(VarDataLenT) +
// (bytes)) // (bytes))
uint16_t flen; // First part length in a STpRow after the header part uint16_t flen; // First part length in a STpRow after the header part
uint16_t vlen; // pure value part length, excluded the overhead (bytes only) uint16_t vlen; // pure value part length, excluded the overhead (bytes only)
...@@ -95,10 +96,10 @@ typedef struct { ...@@ -95,10 +96,10 @@ typedef struct {
#define tdFreeSchema(s) tfree((s)) #define tdFreeSchema(s) tfree((s))
STSchema *tdDupSchema(const STSchema *pSchema); STSchema *tdDupSchema(const STSchema *pSchema);
int tdEncodeSchema(void **buf, STSchema *pSchema); int32_t tdEncodeSchema(void **buf, STSchema *pSchema);
void * tdDecodeSchema(void *buf, STSchema **pRSchema); void *tdDecodeSchema(void *buf, STSchema **pRSchema);
static FORCE_INLINE int comparColId(const void *key1, const void *key2) { static FORCE_INLINE int32_t comparColId(const void *key1, const void *key2) {
if (*(int16_t *)key1 > ((STColumn *)key2)->colId) { if (*(int16_t *)key1 > ((STColumn *)key2)->colId) {
return 1; return 1;
} else if (*(int16_t *)key1 < ((STColumn *)key2)->colId) { } else if (*(int16_t *)key1 < ((STColumn *)key2)->colId) {
...@@ -116,12 +117,12 @@ static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) { ...@@ -116,12 +117,12 @@ static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) {
// ----------------- SCHEMA BUILDER DEFINITION // ----------------- SCHEMA BUILDER DEFINITION
typedef struct { typedef struct {
int tCols; int32_t tCols;
int nCols; int32_t nCols;
int tlen; int32_t tlen;
uint16_t flen; uint16_t flen;
uint16_t vlen; uint16_t vlen;
int version; int32_t version;
STColumn *columns; STColumn *columns;
} STSchemaBuilder; } STSchemaBuilder;
...@@ -132,10 +133,10 @@ typedef struct { ...@@ -132,10 +133,10 @@ typedef struct {
#define TD_BITMAP_BYTES(cnt) (ceil((double)cnt / TD_VTYPE_PARTS)) #define TD_BITMAP_BYTES(cnt) (ceil((double)cnt / TD_VTYPE_PARTS))
#define TD_BIT_TO_BYTES(cnt) (ceil((double)cnt / 8)) #define TD_BIT_TO_BYTES(cnt) (ceil((double)cnt / 8))
int tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version); int32_t tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
void tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder); void tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
void tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version); void tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes); int32_t tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes);
STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder); STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
// ----------------- Semantic timestamp key definition // ----------------- Semantic timestamp key definition
...@@ -194,7 +195,7 @@ static FORCE_INLINE TKEY keyToTkey(TSKEY key) { ...@@ -194,7 +195,7 @@ static FORCE_INLINE TKEY keyToTkey(TSKEY key) {
return tdGetTKEY(lkey); return tdGetTKEY(lkey);
} }
static FORCE_INLINE int tkeyComparFn(const void *tkey1, const void *tkey2) { static FORCE_INLINE int32_t tkeyComparFn(const void *tkey1, const void *tkey2) {
TSKEY key1 = tdGetKey(*(TKEY *)tkey1); TSKEY key1 = tdGetKey(*(TKEY *)tkey1);
TSKEY key2 = tdGetKey(*(TKEY *)tkey2); TSKEY key2 = tdGetKey(*(TKEY *)tkey2);
...@@ -243,7 +244,7 @@ void tdInitDataRow(SDataRow row, STSchema *pSchema); ...@@ -243,7 +244,7 @@ void tdInitDataRow(SDataRow row, STSchema *pSchema);
SDataRow tdDataRowDup(SDataRow row); SDataRow tdDataRowDup(SDataRow row);
// offset here not include dataRow header length // offset here not include dataRow header length
static FORCE_INLINE int tdAppendDataColVal(SDataRow row, const void *value, bool isCopyVarData, int8_t type, static FORCE_INLINE int32_t tdAppendDataColVal(SDataRow row, const void *value, bool isCopyVarData, int8_t type,
int32_t offset) { int32_t offset) {
assert(value != NULL); assert(value != NULL);
int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE; int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE;
...@@ -268,7 +269,7 @@ static FORCE_INLINE int tdAppendDataColVal(SDataRow row, const void *value, bool ...@@ -268,7 +269,7 @@ static FORCE_INLINE int tdAppendDataColVal(SDataRow row, const void *value, bool
} }
// offset here not include dataRow header length // offset here not include dataRow header length
static FORCE_INLINE int tdAppendColVal(SDataRow row, const void *value, int8_t type, int32_t offset) { static FORCE_INLINE int32_t tdAppendColVal(SDataRow row, const void *value, int8_t type, int32_t offset) {
return tdAppendDataColVal(row, value, true, type, offset); return tdAppendDataColVal(row, value, true, type, offset);
} }
...@@ -281,25 +282,25 @@ static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t o ...@@ -281,25 +282,25 @@ static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t o
} }
} }
static FORCE_INLINE void *tdGetPtrToCol(SDataRow row, STSchema *pSchema, int idx) { static FORCE_INLINE void *tdGetPtrToCol(SDataRow row, STSchema *pSchema, int32_t idx) {
return POINTER_SHIFT(row, TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset); return POINTER_SHIFT(row, TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset);
} }
static FORCE_INLINE void *tdGetColOfRowBySchema(SDataRow row, STSchema *pSchema, int idx) { static FORCE_INLINE void *tdGetColOfRowBySchema(SDataRow row, STSchema *pSchema, int32_t idx) {
int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset; int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset;
int8_t type = pSchema->columns[idx].type; int8_t type = pSchema->columns[idx].type;
return tdGetRowDataOfCol(row, type, offset); return tdGetRowDataOfCol(row, type, offset);
} }
static FORCE_INLINE bool tdIsColOfRowNullBySchema(SDataRow row, STSchema *pSchema, int idx) { static FORCE_INLINE bool tdIsColOfRowNullBySchema(SDataRow row, STSchema *pSchema, int32_t idx) {
int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset; int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset;
int8_t type = pSchema->columns[idx].type; int8_t type = pSchema->columns[idx].type;
return isNull(tdGetRowDataOfCol(row, type, offset), type); return isNull(tdGetRowDataOfCol(row, type, offset), type);
} }
static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSchema, int idx) { static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSchema, int32_t idx) {
int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset; int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset;
int8_t type = pSchema->columns[idx].type; int8_t type = pSchema->columns[idx].type;
int16_t bytes = pSchema->columns[idx].bytes; int16_t bytes = pSchema->columns[idx].bytes;
...@@ -307,8 +308,8 @@ static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSche ...@@ -307,8 +308,8 @@ static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSche
setNull(tdGetRowDataOfCol(row, type, offset), type, bytes); setNull(tdGetRowDataOfCol(row, type, offset), type, bytes);
} }
static FORCE_INLINE void tdCopyColOfRowBySchema(SDataRow dst, STSchema *pDstSchema, int dstIdx, SDataRow src, static FORCE_INLINE void tdCopyColOfRowBySchema(SDataRow dst, STSchema *pDstSchema, int32_t dstIdx, SDataRow src,
STSchema *pSrcSchema, int srcIdx) { STSchema *pSrcSchema, int32_t srcIdx) {
int8_t type = pDstSchema->columns[dstIdx].type; int8_t type = pDstSchema->columns[dstIdx].type;
assert(type == pSrcSchema->columns[srcIdx].type); assert(type == pSrcSchema->columns[srcIdx].type);
void *pData = tdGetPtrToCol(dst, pDstSchema, dstIdx); void *pData = tdGetPtrToCol(dst, pDstSchema, dstIdx);
...@@ -364,13 +365,13 @@ typedef struct SDataCol { ...@@ -364,13 +365,13 @@ typedef struct SDataCol {
uint8_t bitmap : 1; // 0: has bitmap if has NULL/NORM rows, 1: no bitmap if all rows are NORM uint8_t bitmap : 1; // 0: has bitmap if has NULL/NORM rows, 1: no bitmap if all rows are NORM
uint8_t reserve : 7; uint8_t reserve : 7;
int16_t colId; // column ID int16_t colId; // column ID
int bytes; // column data bytes defined int32_t bytes; // column data bytes defined
int offset; // data offset in a SDataRow (including the header size) int32_t offset; // data offset in a SDataRow (including the header size)
int spaceSize; // Total space size for this column int32_t spaceSize; // Total space size for this column
int len; // column data length int32_t len; // column data length
VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column
void * pData; // Actual data pointer void *pData; // Actual data pointer
void * pBitmap; // Bitmap pointer void *pBitmap; // Bitmap pointer
TSKEY ts; // only used in last NULL column TSKEY ts; // only used in last NULL column
} SDataCol; } SDataCol;
...@@ -378,17 +379,17 @@ typedef struct SDataCol { ...@@ -378,17 +379,17 @@ typedef struct SDataCol {
#define isAllRowsNone(pCol) ((pCol)->len == 0) #define isAllRowsNone(pCol) ((pCol)->len == 0)
static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; } static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; }
int tdAllocMemForCol(SDataCol *pCol, int maxPoints); int32_t tdAllocMemForCol(SDataCol *pCol, int32_t maxPoints);
void dataColInit(SDataCol *pDataCol, STColumn *pCol, int maxPoints); void dataColInit(SDataCol *pDataCol, STColumn *pCol, int32_t maxPoints);
int dataColAppendVal(SDataCol *pCol, const void *value, int numOfRows, int maxPoints); int32_t dataColAppendVal(SDataCol *pCol, const void *value, int32_t numOfRows, int32_t maxPoints);
void *dataColSetOffset(SDataCol *pCol, int nEle); void *dataColSetOffset(SDataCol *pCol, int32_t nEle);
bool isNEleNull(SDataCol *pCol, int nEle); bool isNEleNull(SDataCol *pCol, int32_t nEle);
#if 0 #if 0
// Get the data pointer from a column-wised data // Get the data pointer from a column-wised data
static FORCE_INLINE const void *tdGetColDataOfRow(SDataCol *pCol, int row) { static FORCE_INLINE const void *tdGetColDataOfRow(SDataCol *pCol, int32_t row) {
if (isAllRowsNull(pCol)) { if (isAllRowsNull(pCol)) {
return getNullValue(pCol->type); return getNullValue(pCol->type);
} }
...@@ -399,7 +400,7 @@ static FORCE_INLINE const void *tdGetColDataOfRow(SDataCol *pCol, int row) { ...@@ -399,7 +400,7 @@ static FORCE_INLINE const void *tdGetColDataOfRow(SDataCol *pCol, int row) {
} }
} }
static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) { static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int32_t rows) {
assert(rows > 0); assert(rows > 0);
if (IS_VAR_DATA_TYPE(pDataCol->type)) { if (IS_VAR_DATA_TYPE(pDataCol->type)) {
...@@ -412,9 +413,9 @@ static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) { ...@@ -412,9 +413,9 @@ static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) {
typedef struct { typedef struct {
col_id_t maxCols; // max number of columns col_id_t maxCols; // max number of columns
col_id_t numOfCols; // Total number of cols col_id_t numOfCols; // Total number of cols
int maxPoints; // max number of points int32_t maxPoints; // max number of points
int numOfRows; int32_t numOfRows;
int sversion; // TODO: set sversion int32_t sversion; // TODO: set sversion
SDataCol *cols; SDataCol *cols;
} SDataCols; } SDataCols;
...@@ -429,7 +430,7 @@ static FORCE_INLINE TKEY dataColsTKeyFirst(SDataCols *pCols) { ...@@ -429,7 +430,7 @@ static FORCE_INLINE TKEY dataColsTKeyFirst(SDataCols *pCols) {
} }
} }
static FORCE_INLINE TSKEY dataColsKeyAtRow(SDataCols *pCols, int row) { static FORCE_INLINE TSKEY dataColsKeyAtRow(SDataCols *pCols, int32_t row) {
assert(row < pCols->numOfRows); assert(row < pCols->numOfRows);
return dataColsKeyAt(pCols, row); return dataColsKeyAt(pCols, row);
} }
...@@ -458,12 +459,12 @@ static FORCE_INLINE TSKEY dataColsKeyLast(SDataCols *pCols) { ...@@ -458,12 +459,12 @@ static FORCE_INLINE TSKEY dataColsKeyLast(SDataCols *pCols) {
} }
} }
SDataCols *tdNewDataCols(int maxCols, int maxRows); SDataCols *tdNewDataCols(int32_t maxCols, int32_t maxRows);
void tdResetDataCols(SDataCols *pCols); void tdResetDataCols(SDataCols *pCols);
int tdInitDataCols(SDataCols *pCols, STSchema *pSchema); int32_t tdInitDataCols(SDataCols *pCols, STSchema *pSchema);
SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData); SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData);
SDataCols *tdFreeDataCols(SDataCols *pCols); SDataCols *tdFreeDataCols(SDataCols *pCols);
int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset, bool forceSetNull); int32_t tdMergeDataCols(SDataCols *target, SDataCols *source, int32_t rowsToMerge, int32_t *pOffset, bool forceSetNull);
// ----------------- K-V data row structure // ----------------- K-V data row structure
/* |<-------------------------------------- len -------------------------------------------->| /* |<-------------------------------------- len -------------------------------------------->|
...@@ -501,12 +502,12 @@ typedef struct { ...@@ -501,12 +502,12 @@ typedef struct {
#define kvRowDeleted(r) TKEY_IS_DELETED(kvRowTKey(r)) #define kvRowDeleted(r) TKEY_IS_DELETED(kvRowTKey(r))
SKVRow tdKVRowDup(SKVRow row); SKVRow tdKVRowDup(SKVRow row);
int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value); int32_t tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value);
int tdEncodeKVRow(void **buf, SKVRow row); int32_t tdEncodeKVRow(void **buf, SKVRow row);
void * tdDecodeKVRow(void *buf, SKVRow *row); void *tdDecodeKVRow(void *buf, SKVRow *row);
void tdSortKVRowByColIdx(SKVRow row); void tdSortKVRowByColIdx(SKVRow row);
static FORCE_INLINE int comparTagId(const void *key1, const void *key2) { static FORCE_INLINE int32_t comparTagId(const void *key1, const void *key2) {
if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) { if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
return 1; return 1;
} else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) { } else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) {
...@@ -528,7 +529,7 @@ static FORCE_INLINE void *tdGetKVRowIdxOfCol(SKVRow row, int16_t colId) { ...@@ -528,7 +529,7 @@ static FORCE_INLINE void *tdGetKVRowIdxOfCol(SKVRow row, int16_t colId) {
#if 0 #if 0
// offset here not include kvRow header length // offset here not include kvRow header length
static FORCE_INLINE int tdAppendKvColVal(SKVRow row, const void *value, bool isCopyValData, int16_t colId, int8_t type, static FORCE_INLINE int32_t tdAppendKvColVal(SKVRow row, const void *value, bool isCopyValData, int16_t colId, int8_t type,
int32_t offset) { int32_t offset) {
assert(value != NULL); assert(value != NULL);
int32_t toffset = offset + TD_KV_ROW_HEAD_SIZE; int32_t toffset = offset + TD_KV_ROW_HEAD_SIZE;
...@@ -581,15 +582,15 @@ typedef struct { ...@@ -581,15 +582,15 @@ typedef struct {
SColIdx *pColIdx; SColIdx *pColIdx;
uint16_t alloc; uint16_t alloc;
uint16_t size; uint16_t size;
void * buf; void *buf;
} SKVRowBuilder; } SKVRowBuilder;
int tdInitKVRowBuilder(SKVRowBuilder *pBuilder); int32_t tdInitKVRowBuilder(SKVRowBuilder *pBuilder);
void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder); void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder);
void tdResetKVRowBuilder(SKVRowBuilder *pBuilder); void tdResetKVRowBuilder(SKVRowBuilder *pBuilder);
SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder); SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, const void *value) { static FORCE_INLINE int32_t tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, const void *value) {
if (pBuilder->nCols >= pBuilder->tCols) { if (pBuilder->nCols >= pBuilder->tCols) {
pBuilder->tCols *= 2; pBuilder->tCols *= 2;
SColIdx *pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols); SColIdx *pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols);
...@@ -602,7 +603,7 @@ static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, ...@@ -602,7 +603,7 @@ static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId,
pBuilder->nCols++; pBuilder->nCols++;
int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type]; int32_t tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
if (tlen > pBuilder->alloc - pBuilder->size) { if (tlen > pBuilder->alloc - pBuilder->size) {
while (tlen > pBuilder->alloc - pBuilder->size) { while (tlen > pBuilder->alloc - pBuilder->size) {
pBuilder->alloc *= 2; pBuilder->alloc *= 2;
...@@ -736,7 +737,7 @@ static FORCE_INLINE void *tdGetMemRowDataOfColEx(void *row, int16_t colId, int8_ ...@@ -736,7 +737,7 @@ static FORCE_INLINE void *tdGetMemRowDataOfColEx(void *row, int16_t colId, int8_
} }
} }
static FORCE_INLINE int tdAppendMemRowColVal(SMemRow row, const void *value, bool isCopyVarData, int16_t colId, static FORCE_INLINE int32_t tdAppendMemRowColVal(SMemRow row, const void *value, bool isCopyVarData, int16_t colId,
int8_t type, int32_t offset) { int8_t type, int32_t offset) {
if (isDataRow(row)) { if (isDataRow(row)) {
tdAppendDataColVal(memRowDataBody(row), value, isCopyVarData, type, offset); tdAppendDataColVal(memRowDataBody(row), value, isCopyVarData, type, offset);
......
include/common/tglobal.h
浏览文件 @ 74c2ec8e
...@@ -16,57 +16,60 @@ ...@@ -16,57 +16,60 @@
#ifndef _TD_COMMON_GLOBAL_H_ #ifndef _TD_COMMON_GLOBAL_H_
#define _TD_COMMON_GLOBAL_H_ #define _TD_COMMON_GLOBAL_H_
#include "tarray.h"
#include "tdef.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "tdef.h"
#include "tcfg.h"
// cluster // cluster
extern char tsFirst[]; extern char tsFirst[];
extern char tsSecond[]; extern char tsSecond[];
extern char tsLocalFqdn[]; extern char tsLocalFqdn[];
extern char tsLocalEp[]; extern char tsLocalEp[];
extern uint16_t tsServerPort; extern uint16_t tsServerPort;
extern int32_t tsVersion;
extern int32_t tsStatusInterval; extern int32_t tsStatusInterval;
extern int8_t tsEnableTelemetryReporting; extern bool tsEnableTelemetryReporting;
extern int32_t tsNumOfSupportVnodes;
// common // common
extern int tsRpcTimer; extern int32_t tsRpcTimer;
extern int tsRpcMaxTime; extern int32_t tsRpcMaxTime;
extern int tsRpcForceTcp; // all commands go to tcp protocol if this is enabled extern bool tsRpcForceTcp; // all commands go to tcp protocol if this is enabled
extern int32_t tsMaxConnections; extern int32_t tsMaxConnections;
extern int32_t tsMaxShellConns; extern int32_t tsMaxShellConns;
extern int32_t tsShellActivityTimer; extern int32_t tsShellActivityTimer;
extern uint32_t tsMaxTmrCtrl; extern int32_t tsMaxTmrCtrl;
extern float tsNumOfThreadsPerCore; extern float tsNumOfThreadsPerCore;
extern int32_t tsNumOfCommitThreads; extern int32_t tsNumOfCommitThreads;
extern float tsRatioOfQueryCores; extern float tsRatioOfQueryCores;
extern int8_t tsDaylight;
extern int8_t tsEnableCoreFile;
extern int32_t tsCompressMsgSize; extern int32_t tsCompressMsgSize;
extern int32_t tsCompressColData; extern int32_t tsCompressColData;
extern int32_t tsMaxNumOfDistinctResults; extern int32_t tsMaxNumOfDistinctResults;
extern char tsTempDir[]; extern int32_t tsCompatibleModel;
extern int tsCompatibleModel; // 2.0 compatible model extern bool tsEnableSlaveQuery;
extern int8_t tsEnableSlaveQuery; extern bool tsPrintAuth;
extern int8_t tsEnableAdjustMaster;
extern int8_t tsPrintAuth;
extern int64_t tsTickPerDay[3]; extern int64_t tsTickPerDay[3];
// monitor
extern bool tsEnableMonitor;
extern int32_t tsMonitorInterval;
extern char tsMonitorFqdn[];
extern uint16_t tsMonitorPort;
extern int32_t tsMonitorMaxLogs;
extern bool tsMonitorComp;
// query buffer management // query buffer management
extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing
extern int64_t tsQueryBufferSizeBytes; // maximum allowed usage buffer size in byte for each data node extern int64_t tsQueryBufferSizeBytes; // maximum allowed usage buffer size in byte for each data node
extern int32_t tsRetrieveBlockingModel; // retrieve threads will be blocked extern bool tsRetrieveBlockingModel; // retrieve threads will be blocked
extern int8_t tsKeepOriginalColumnName; extern bool tsKeepOriginalColumnName;
extern int8_t tsDeadLockKillQuery; extern bool tsDeadLockKillQuery;
// client // client
extern int32_t tsMaxWildCardsLen; extern int32_t tsMaxWildCardsLen;
extern int32_t tsMaxRegexStringLen; extern int32_t tsMaxRegexStringLen;
extern int8_t tsTscEnableRecordSql;
extern int32_t tsMaxNumOfOrderedResults; extern int32_t tsMaxNumOfOrderedResults;
extern int32_t tsMinSlidingTime; extern int32_t tsMinSlidingTime;
extern int32_t tsMinIntervalTime; extern int32_t tsMinIntervalTime;
...@@ -77,24 +80,10 @@ extern float tsStreamComputDelayRatio; // the delayed computing ration of the ...@@ -77,24 +80,10 @@ extern float tsStreamComputDelayRatio; // the delayed computing ration of the
extern int32_t tsProjectExecInterval; extern int32_t tsProjectExecInterval;
extern int64_t tsMaxRetentWindow; extern int64_t tsMaxRetentWindow;
// system info
extern float tsTotalLogDirGB;
extern float tsTotalTmpDirGB;
extern float tsTotalDataDirGB;
extern float tsAvailLogDirGB;
extern float tsAvailTmpDirectorySpace;
extern float tsAvailDataDirGB;
extern float tsUsedDataDirGB;
extern float tsMinimalLogDirGB;
extern float tsReservedTmpDirectorySpace;
extern float tsMinimalDataDirGB;
extern uint32_t tsVersion;
// build info // build info
extern char version[]; extern char version[];
extern char compatible_version[]; extern char compatible_version[];
extern char gitinfo[]; extern char gitinfo[];
extern char gitinfoOfInternal[];
extern char buildinfo[]; extern char buildinfo[];
// lossy // lossy
...@@ -105,18 +94,19 @@ extern uint32_t tsMaxRange; ...@@ -105,18 +94,19 @@ extern uint32_t tsMaxRange;
extern uint32_t tsCurRange; extern uint32_t tsCurRange;
extern char tsCompressor[]; extern char tsCompressor[];
// tfs
extern int32_t tsDiskCfgNum; extern int32_t tsDiskCfgNum;
extern SDiskCfg tsDiskCfg[]; extern SDiskCfg tsDiskCfg[];
#define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize) #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
void taosInitGlobalCfg(); int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char *envFile,
int32_t taosCheckAndPrintCfg(); const char *apolloUrl, SArray *pArgs, bool tsc);
int32_t taosCfgDynamicOptions(char *msg); int32_t taosInitCfg(const char *cfgDir, const char *envFile, const char *apolloUrl, SArray *pArgs, bool tsc);
bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId); void taosCleanupCfg();
void taosAddDataDir(int index, char *v1, int level, int primary); void taosCfgDynamicOptions(const char *option, const char *value);
void taosReadDataDirCfg(char *v1, char *v2, char *v3);
void taosPrintDataDirCfg(); struct SConfig *taosGetCfg();
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/common/tmsg.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/common/tmsgdef.h
浏览文件 @ 74c2ec8e
...@@ -47,7 +47,7 @@ enum { ...@@ -47,7 +47,7 @@ enum {
#define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM, #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM,
#define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP) #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP)
int tMsgDict[] = { int32_t tMsgDict[] = {
#elif defined(TD_MSG_SEG_CODE_) #elif defined(TD_MSG_SEG_CODE_)
...@@ -127,26 +127,32 @@ enum { ...@@ -127,26 +127,32 @@ enum {
TD_DEF_MSG_TYPE(TDMT_MND_CREATE_STB, "mnode-create-stb", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_CREATE_STB, "mnode-create-stb", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_ALTER_STB, "mnode-alter-stb", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_ALTER_STB, "mnode-alter-stb", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_DROP_STB, "mnode-drop-stb", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_DROP_STB, "mnode-drop-stb", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_STB_META, "mnode-stb-meta", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_TABLE_META, "mnode-table-meta", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_VGROUP_LIST, "mnode-vgroup-list", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_VGROUP_LIST, "mnode-vgroup-list", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_QNODE_LIST, "mnode-qnode-list", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_KILL_QUERY, "mnode-kill-query", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_KILL_QUERY, "mnode-kill-query", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_KILL_CONN, "mnode-kill-conn", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_KILL_CONN, "mnode-kill-conn", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_HEARTBEAT, "mnode-heartbeat", SClientHbBatchReq, SClientHbBatchRsp) TD_DEF_MSG_TYPE(TDMT_MND_HEARTBEAT, "mnode-heartbeat", SClientHbBatchReq, SClientHbBatchRsp)
TD_DEF_MSG_TYPE(TDMT_MND_SHOW, "mnode-show", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_SHOW, "mnode-show", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_SHOW_RETRIEVE, "mnode-retrieve", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_SHOW_RETRIEVE, "mnode-retrieve", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_SYSTABLE_RETRIEVE, "mnode-systable-retrieve", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_STATUS, "mnode-status", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_STATUS, "mnode-status", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_TRANS, "mnode-trans", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_TRANS_TIMER, "mnode-trans-tmr", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_KILL_TRANS, "mnode-kill-trans", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_KILL_TRANS, "mnode-kill-trans", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_TELEM_TIMER, "mnode-telem-tmr", SMTimerReq, SMTimerReq)
TD_DEF_MSG_TYPE(TDMT_MND_GRANT, "mnode-grant", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_GRANT, "mnode-grant", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_AUTH, "mnode-auth", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_AUTH, "mnode-auth", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_CREATE_TOPIC, "mnode-create-topic", SMCreateTopicReq, SMCreateTopicRsp) TD_DEF_MSG_TYPE(TDMT_MND_CREATE_TOPIC, "mnode-create-topic", SMCreateTopicReq, SMCreateTopicRsp)
TD_DEF_MSG_TYPE(TDMT_MND_ALTER_TOPIC, "mnode-alter-topic", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_ALTER_TOPIC, "mnode-alter-topic", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_DROP_TOPIC, "mnode-drop-topic", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_DROP_TOPIC, "mnode-drop-topic", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_SUBSCRIBE, "mnode-subscribe", SCMSubscribeReq, SCMSubscribeRsp) TD_DEF_MSG_TYPE(TDMT_MND_SUBSCRIBE, "mnode-subscribe", SCMSubscribeReq, SCMSubscribeRsp)
TD_DEF_MSG_TYPE(TDMT_MND_RESET_OFFSET, "mnode-reset-offset", SMqCMResetOffsetReq, SMqCMResetOffsetRsp)
TD_DEF_MSG_TYPE(TDMT_MND_GET_SUB_EP, "mnode-get-sub-ep", SMqCMGetSubEpReq, SMqCMGetSubEpRsp) TD_DEF_MSG_TYPE(TDMT_MND_GET_SUB_EP, "mnode-get-sub-ep", SMqCMGetSubEpReq, SMqCMGetSubEpRsp)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_TIMER, "mnode-mq-timer", SMTimerReq, SMTimerReq) TD_DEF_MSG_TYPE(TDMT_MND_MQ_TIMER, "mnode-mq-tmr", SMTimerReq, SMTimerReq)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_DO_REBALANCE, "mnode-mq-do-rebalance", SMqDoRebalanceMsg, SMqDoRebalanceMsg) TD_DEF_MSG_TYPE(TDMT_MND_MQ_DO_REBALANCE, "mnode-mq-do-rebalance", SMqDoRebalanceMsg, SMqDoRebalanceMsg)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_COMMIT_OFFSET, "mnode-mq-commit-offset", SMqCMCommitOffsetReq, SMqCMCommitOffsetRsp)
TD_DEF_MSG_TYPE(TDMT_MND_CREATE_STREAM, "mnode-create-stream", SCMCreateStreamReq, SCMCreateStreamRsp)
TD_DEF_MSG_TYPE(TDMT_MND_ALTER_STREAM, "mnode-alter-stream", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_DROP_STREAM, "mnode-drop-stream", NULL, NULL)
// Requests handled by VNODE // Requests handled by VNODE
TD_NEW_MSG_SEG(TDMT_VND_MSG) TD_NEW_MSG_SEG(TDMT_VND_MSG)
...@@ -179,19 +185,25 @@ enum { ...@@ -179,19 +185,25 @@ enum {
TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES, "vnode-show-tables", SVShowTablesReq, SVShowTablesRsp) TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES, "vnode-show-tables", SVShowTablesReq, SVShowTablesRsp)
TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES_FETCH, "vnode-show-tables-fetch", SVShowTablesFetchReq, SVShowTablesFetchRsp) TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES_FETCH, "vnode-show-tables-fetch", SVShowTablesFetchReq, SVShowTablesFetchRsp)
TD_DEF_MSG_TYPE(TDMT_VND_QUERY_CONTINUE, "vnode-query-continue", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_QUERY_CONTINUE, "vnode-query-continue", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_QUERY_HEARTBEAT, "vnode-query-heartbeat", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SUBSCRIBE, "vnode-subscribe", SMVSubscribeReq, SMVSubscribeRsp) TD_DEF_MSG_TYPE(TDMT_VND_SUBSCRIBE, "vnode-subscribe", SMVSubscribeReq, SMVSubscribeRsp)
TD_DEF_MSG_TYPE(TDMT_VND_CONSUME, "vnode-consume", SMqCVConsumeReq, SMqCVConsumeRsp) TD_DEF_MSG_TYPE(TDMT_VND_CONSUME, "vnode-consume", SMqCVConsumeReq, SMqCVConsumeRsp)
TD_DEF_MSG_TYPE(TDMT_VND_TASK_DEPLOY, "vnode-task-deploy", SStreamTaskDeployReq, SStreamTaskDeployRsp)
TD_DEF_MSG_TYPE(TDMT_VND_CREATE_SMA, "vnode-create-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_SMA, "vnode-cancel-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL)
// Requests handled by QNODE // Requests handled by QNODE
TD_NEW_MSG_SEG(TDMT_QND_MSG) TD_NEW_MSG_SEG(TDMT_QND_MSG)
// Requests handled by SNODE // Requests handled by SNODE
TD_NEW_MSG_SEG(TDMT_SND_MSG) TD_NEW_MSG_SEG(TDMT_SND_MSG)
TD_DEF_MSG_TYPE(TDMT_SND_TASK_DEPLOY, "snode-task-deploy", SStreamTaskDeployReq, SStreamTaskDeployRsp)
TD_DEF_MSG_TYPE(TDMT_SND_TASK_EXEC, "snode-task-exec", SStreamTaskExecReq, SStreamTaskExecRsp)
#if defined(TD_MSG_NUMBER_) #if defined(TD_MSG_NUMBER_)
TDMT_MAX TDMT_MAX
#endif #endif
}; };
// clang-format on
include/common/tname.h
浏览文件 @ 74c2ec8e
...@@ -13,17 +13,16 @@ ...@@ -13,17 +13,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_TNAME_H #ifndef _TD_COMMON_NAME_H_
#define TDENGINE_TNAME_H #define _TD_COMMON_NAME_H_
#include "tdef.h"
#include "tmsg.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "tdef.h"
#include "tmsg.h"
#define TSDB_DB_NAME_T 1 #define TSDB_DB_NAME_T 1
#define TSDB_TABLE_NAME_T 2 #define TSDB_TABLE_NAME_T 2
...@@ -32,7 +31,7 @@ extern "C" { ...@@ -32,7 +31,7 @@ extern "C" {
#define T_NAME_TABLE 0x4u #define T_NAME_TABLE 0x4u
typedef struct SName { typedef struct SName {
uint8_t type; //db_name_t, table_name_t uint8_t type; // db_name_t, table_name_t
int32_t acctId; int32_t acctId;
char dbname[TSDB_DB_NAME_LEN]; char dbname[TSDB_DB_NAME_LEN];
char tname[TSDB_TABLE_NAME_LEN]; char tname[TSDB_TABLE_NAME_LEN];
...@@ -68,5 +67,4 @@ SSchema createSchema(uint8_t type, int32_t bytes, int32_t colId, const char* nam ...@@ -68,5 +67,4 @@ SSchema createSchema(uint8_t type, int32_t bytes, int32_t colId, const char* nam
} }
#endif #endif
#endif /*_TD_COMMON_NAME_H_*/
#endif // TDENGINE_TNAME_H
include/common/trequest.h
浏览文件 @ 74c2ec8e
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _TD_TREQUEST_H_ #ifndef _TD_COMMON_REQUEST_H_
#define _TD_TREQUEST_H_ #define _TD_COMMON_REQUEST_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -36,7 +36,7 @@ void tdClearRBIter(SReqBatchIter *pIter); ...@@ -36,7 +36,7 @@ void tdClearRBIter(SReqBatchIter *pIter);
/* ------------------------ TYPES DEFINITION ------------------------ */ /* ------------------------ TYPES DEFINITION ------------------------ */
struct SReqBatchIter { struct SReqBatchIter {
int iReq; int32_t iReq;
SReqBatch *pReqBatch; SReqBatch *pReqBatch;
}; };
...@@ -44,4 +44,4 @@ struct SReqBatchIter { ...@@ -44,4 +44,4 @@ struct SReqBatchIter {
} }
#endif #endif
#endif /*_TD_TREQUEST_H_*/ #endif /*_TD_COMMON_REQUEST_H_*/
\ No newline at end of file \ No newline at end of file
include/common/trow.h
浏览文件 @ 74c2ec8e
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
#include "os.h" #include "os.h"
#include "talgo.h" #include "talgo.h"
#include "taosdef.h"
#include "taoserror.h" #include "taoserror.h"
#include "tbuffer.h" #include "tbuffer.h"
#include "tdef.h"
#include "taosdef.h"
#include "tdataformat.h" #include "tdataformat.h"
#include "tdef.h"
#include "tschema.h" #include "tschema.h"
#include "ttypes.h" #include "ttypes.h"
#include "tutil.h" #include "tutil.h"
...@@ -103,6 +103,7 @@ typedef struct { ...@@ -103,6 +103,7 @@ typedef struct {
typedef struct { typedef struct {
// TODO // TODO
int tmp; // TODO: to avoid compile error
} STpRow; // tuple } STpRow; // tuple
#pragma pack(push, 1) #pragma pack(push, 1)
...@@ -118,6 +119,8 @@ typedef struct { ...@@ -118,6 +119,8 @@ typedef struct {
} SKvRow; } SKvRow;
typedef struct { typedef struct {
/// timestamp
TSKEY ts;
union { union {
/// union field for encode and decode /// union field for encode and decode
uint32_t info; uint32_t info;
...@@ -138,8 +141,6 @@ typedef struct { ...@@ -138,8 +141,6 @@ typedef struct {
uint32_t len; uint32_t len;
/// row version /// row version
uint64_t ver; uint64_t ver;
/// timestamp
TSKEY ts;
/// the inline data, maybe a tuple or a k-v tuple /// the inline data, maybe a tuple or a k-v tuple
char data[]; char data[];
} STSRow; } STSRow;
...@@ -173,10 +174,10 @@ typedef struct { ...@@ -173,10 +174,10 @@ typedef struct {
#define TD_ROW_DATA(r) ((r)->data) #define TD_ROW_DATA(r) ((r)->data)
#define TD_ROW_LEN(r) ((r)->len) #define TD_ROW_LEN(r) ((r)->len)
#define TD_ROW_KEY(r) ((r)->ts) #define TD_ROW_KEY(r) ((r)->ts)
#define TD_ROW_KEY_ADDR(r) POINTER_SHIFT((r), 16) #define TD_ROW_KEY_ADDR(r) (r)
// N.B. If without STSchema, getExtendedRowSize() is used to get the rowMaxBytes and // N.B. If without STSchema, getExtendedRowSize() is used to get the rowMaxBytes and
// (int)ceil((double)nCols/TD_VTYPE_PARTS) should be added if TD_SUPPORT_BITMAP defined. // (int32_t)ceil((double)nCols/TD_VTYPE_PARTS) should be added if TD_SUPPORT_BITMAP defined.
#define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_ROW_HEAD_LEN) #define TD_ROW_MAX_BYTES_FROM_SCHEMA(s) (schemaTLen(s) + TD_ROW_HEAD_LEN)
#define TD_ROW_SET_TYPE(r, t) (TD_ROW_TYPE(r) = (t)) #define TD_ROW_SET_TYPE(r, t) (TD_ROW_TYPE(r) = (t))
...@@ -217,7 +218,7 @@ static FORCE_INLINE void tdRowCopy(void *dst, STSRow *row) { memcpy(dst, row, ...@@ -217,7 +218,7 @@ static FORCE_INLINE void tdRowCopy(void *dst, STSRow *row) { memcpy(dst, row,
static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType); static FORCE_INLINE int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType);
int32_t tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType); int32_t tdSetBitmapValTypeN(void *pBitmap, int16_t nEle, TDRowValT valType);
static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT *pValType); static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT *pValType);
int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int numOfRows, int maxPoints); int32_t tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int32_t numOfRows, int32_t maxPoints);
static FORCE_INLINE int32_t tdAppendColValToTpRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val, static FORCE_INLINE int32_t tdAppendColValToTpRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val,
bool isCopyVarData, int8_t colType, int16_t colIdx, int32_t offset); bool isCopyVarData, int8_t colType, int16_t colIdx, int32_t offset);
static FORCE_INLINE int32_t tdAppendColValToKvRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val, static FORCE_INLINE int32_t tdAppendColValToKvRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val,
...@@ -355,7 +356,6 @@ static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TD ...@@ -355,7 +356,6 @@ static FORCE_INLINE int32_t tdGetBitmapValType(void *pBitmap, int16_t colIdx, TD
* *
*/ */
/** /**
* @brief * @brief
* *
...@@ -432,7 +432,6 @@ static FORCE_INLINE int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t ...@@ -432,7 +432,6 @@ static FORCE_INLINE int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t
pBuilder->rowType = TD_ROW_TP; pBuilder->rowType = TD_ROW_TP;
} }
} else { } else {
pBuilder->rowType = TD_ROW_TP; pBuilder->rowType = TD_ROW_TP;
} }
...@@ -698,9 +697,9 @@ static FORCE_INLINE int32_t tdAppendColValToRow(SRowBuilder *pBuilder, int16_t c ...@@ -698,9 +697,9 @@ static FORCE_INLINE int32_t tdAppendColValToRow(SRowBuilder *pBuilder, int16_t c
} }
// TODO: We can avoid the type judegement by FP, but would prevent the inline scheme. // TODO: We can avoid the type judegement by FP, but would prevent the inline scheme.
if (TD_IS_TP_ROW(pRow)) { if (TD_IS_TP_ROW(pRow)) {
tdAppendColValToTpRow(pBuilder, valType, val, true, colType, colIdx, offset); tdAppendColValToTpRow(pBuilder, valType, val, isCopyVarData, colType, colIdx, offset);
} else { } else {
tdAppendColValToKvRow(pBuilder, valType, val, true, colType, colIdx, offset, colId); tdAppendColValToKvRow(pBuilder, valType, val, isCopyVarData, colType, colIdx, offset, colId);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -731,7 +730,7 @@ static FORCE_INLINE int32_t tdGetTpRowValOfCol(SCellVal *output, STSRow *pRow, v ...@@ -731,7 +730,7 @@ static FORCE_INLINE int32_t tdGetTpRowValOfCol(SCellVal *output, STSRow *pRow, v
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
static FORCE_INLINE int compareKvRowColId(const void *key1, const void *key2) { static FORCE_INLINE int32_t compareKvRowColId(const void *key1, const void *key2) {
if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) { if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
return 1; return 1;
} else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) { } else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) {
...@@ -793,8 +792,8 @@ static FORCE_INLINE void tdSTSRowIterInit(STSRowIter *pIter, STSchema *pSchema) ...@@ -793,8 +792,8 @@ static FORCE_INLINE void tdSTSRowIterInit(STSRowIter *pIter, STSchema *pSchema)
pIter->maxColId = pSchema->columns[pSchema->numOfCols - 1].colId; pIter->maxColId = pSchema->columns[pSchema->numOfCols - 1].colId;
} }
static int tdCompareColId(const void *arg1, const void *arg2) { static int32_t tdCompareColId(const void *arg1, const void *arg2) {
int colId = *(int *)arg1; int32_t colId = *(int32_t *)arg1;
STColumn *pCol = (STColumn *)arg2; STColumn *pCol = (STColumn *)arg2;
if (colId < pCol->colId) { if (colId < pCol->colId) {
...@@ -959,11 +958,11 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col ...@@ -959,11 +958,11 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col
STSRow *mergeTwoRows(void *buffer, STSRow *row1, STSRow *row2, STSchema *pSchema1, STSchema *pSchema2); STSRow *mergeTwoRows(void *buffer, STSRow *row1, STSRow *row2, STSchema *pSchema1, STSchema *pSchema2);
// Get the data pointer from a column-wised data // Get the data pointer from a column-wised data
static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, int row) { static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, int32_t row) {
if (isAllRowsNone(pCol)) { if (isAllRowsNone(pCol)) {
pVal->valType = TD_VTYPE_NULL; pVal->valType = TD_VTYPE_NULL;
#ifdef TD_SUPPORT_READ2 #ifdef TD_SUPPORT_READ2
pVal->val = (void*)getNullValue(pCol->type); pVal->val = (void *)getNullValue(pCol->type);
#else #else
pVal->val = NULL; pVal->val = NULL;
#endif #endif
...@@ -981,7 +980,7 @@ static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, in ...@@ -981,7 +980,7 @@ static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, in
} else { } else {
pVal->valType = TD_VTYPE_NULL; pVal->valType = TD_VTYPE_NULL;
#ifdef TD_SUPPORT_READ2 #ifdef TD_SUPPORT_READ2
pVal->val = (void*)getNullValue(pCol->type); pVal->val = (void *)getNullValue(pCol->type);
#else #else
pVal->val = NULL; pVal->val = NULL;
#endif #endif
...@@ -1000,7 +999,8 @@ static FORCE_INLINE bool tdSTpRowGetVal(STSRow *pRow, col_id_t colId, col_type_t ...@@ -1000,7 +999,8 @@ static FORCE_INLINE bool tdSTpRowGetVal(STSRow *pRow, col_id_t colId, col_type_t
return true; return true;
} }
static FORCE_INLINE bool tdSKvRowGetVal(STSRow *pRow, col_id_t colId, uint32_t offset, col_id_t colIdx, SCellVal *pVal) { static FORCE_INLINE bool tdSKvRowGetVal(STSRow *pRow, col_id_t colId, uint32_t offset, col_id_t colIdx,
SCellVal *pVal) {
if (colId == PRIMARYKEY_TIMESTAMP_COL_ID) { if (colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
tdRowSetVal(pVal, TD_VTYPE_NORM, TD_ROW_KEY_ADDR(pRow)); tdRowSetVal(pVal, TD_VTYPE_NORM, TD_ROW_KEY_ADDR(pRow));
return true; return true;
...@@ -1010,7 +1010,7 @@ static FORCE_INLINE bool tdSKvRowGetVal(STSRow *pRow, col_id_t colId, uint32_t o ...@@ -1010,7 +1010,7 @@ static FORCE_INLINE bool tdSKvRowGetVal(STSRow *pRow, col_id_t colId, uint32_t o
return true; return true;
} }
static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) { static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int32_t rows) {
ASSERT(rows > 0); ASSERT(rows > 0);
int32_t result = 0; int32_t result = 0;
...@@ -1082,12 +1082,12 @@ typedef struct { ...@@ -1082,12 +1082,12 @@ typedef struct {
void trbSetRowInfo(STSRowBuilder *pRB, bool del, uint16_t sver); void trbSetRowInfo(STSRowBuilder *pRB, bool del, uint16_t sver);
void trbSetRowVersion(STSRowBuilder *pRB, uint64_t ver); void trbSetRowVersion(STSRowBuilder *pRB, uint64_t ver);
void trbSetRowTS(STSRowBuilder *pRB, TSKEY ts); void trbSetRowTS(STSRowBuilder *pRB, TSKEY ts);
int trbWriteCol(STSRowBuilder *pRB, void *pData, col_id_t cid); int32_t trbWriteCol(STSRowBuilder *pRB, void *pData, col_id_t cid);
// STSRowReader // STSRowReader
#define tRowReaderInit(schema, row) \ #define tRowReaderInit(schema, row) \
{ .schema = (schema), .row = (row) } { .schema = (schema), .row = (row) }
int tRowReaderRead(STSRowReader *pRowReader, col_id_t cid, void *target, uint64_t size); int32_t tRowReaderRead(STSRowReader *pRowReader, col_id_t cid, void *target, uint64_t size);
// STSRowBatchIter // STSRowBatchIter
#define tRowBatchIterInit(pRB) \ #define tRowBatchIterInit(pRB) \
......
include/common/tschema.h
浏览文件 @ 74c2ec8e
...@@ -70,7 +70,7 @@ typedef struct { ...@@ -70,7 +70,7 @@ typedef struct {
{ .size = (capacity), .pSchema = (target) } { .size = (capacity), .pSchema = (target) }
void tSchemaBuilderSetSver(STShemaBuilder *pSchemaBuilder, uint16_t sver); void tSchemaBuilderSetSver(STShemaBuilder *pSchemaBuilder, uint16_t sver);
void tSchemaBuilderSetSMA(bool sma, SArray *smaArray); void tSchemaBuilderSetSMA(bool sma, SArray *smaArray);
int tSchemaBuilderPutColumn(char *cname, bool sma, uint8_t type, col_id_t cid, uint32_t bytes, char *comment); int32_t tSchemaBuilderPutColumn(char *cname, bool sma, uint8_t type, col_id_t cid, uint32_t bytes, char *comment);
#endif #endif
......
include/common/ttime.h
浏览文件 @ 74c2ec8e
...@@ -16,15 +16,26 @@ ...@@ -16,15 +16,26 @@
#ifndef _TD_COMMON_TIME_H_ #ifndef _TD_COMMON_TIME_H_
#define _TD_COMMON_TIME_H_ #define _TD_COMMON_TIME_H_
#include "taosdef.h"
#include "tmsg.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "taosdef.h"
#include "tmsg.h"
#define TIME_IS_VAR_DURATION(_t) ((_t) == 'n' || (_t) == 'y' || (_t) == 'N' || (_t) == 'Y') #define TIME_IS_VAR_DURATION(_t) ((_t) == 'n' || (_t) == 'y' || (_t) == 'N' || (_t) == 'Y')
#define TIME_UNIT_NANOSECOND 'b'
#define TIME_UNIT_MICROSECOND 'u'
#define TIME_UNIT_MILLISECOND 'a'
#define TIME_UNIT_SECOND 's'
#define TIME_UNIT_MINUTE 'm'
#define TIME_UNIT_HOUR 'h'
#define TIME_UNIT_DAY 'd'
#define TIME_UNIT_WEEK 'w'
#define TIME_UNIT_MONTH 'n'
#define TIME_UNIT_YEAR 'y'
/* /*
* @return timestamp decided by global conf variable, tsTimePrecision * @return timestamp decided by global conf variable, tsTimePrecision
* if precision == TSDB_TIME_PRECISION_MICRO, it returns timestamp in microsecond. * if precision == TSDB_TIME_PRECISION_MICRO, it returns timestamp in microsecond.
...@@ -35,7 +46,7 @@ static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) { ...@@ -35,7 +46,7 @@ static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) {
return taosGetTimestampUs(); return taosGetTimestampUs();
} else if (precision == TSDB_TIME_PRECISION_NANO) { } else if (precision == TSDB_TIME_PRECISION_NANO) {
return taosGetTimestampNs(); return taosGetTimestampNs();
}else { } else {
return taosGetTimestampMs(); return taosGetTimestampMs();
} }
} }
...@@ -52,6 +63,8 @@ void deltaToUtcInitOnce(); ...@@ -52,6 +63,8 @@ void deltaToUtcInitOnce();
int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision); int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision);
void taosFormatUtcTime(char *buf, int32_t bufLen, int64_t time, int32_t precision);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
include/common/ttokendef.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/common/ttszip.h
浏览文件 @ 74c2ec8e
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_TTSZIP_H #ifndef _TD_COMMON_TTSZIP_H_
#define TDENGINE_TTSZIP_H #define _TD_COMMON_TTSZIP_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "os.h" #include "os.h"
#include "tdef.h" #include "tdef.h"
#include "tvariant.h" #include "tvariant.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MEM_BUF_SIZE (1 << 20) #define MEM_BUF_SIZE (1 << 20)
#define TS_COMP_FILE_MAGIC 0x87F5EC4C #define TS_COMP_FILE_MAGIC 0x87F5EC4C
#define TS_COMP_FILE_GROUP_MAX 512 #define TS_COMP_FILE_GROUP_MAX 512
...@@ -73,7 +73,7 @@ typedef struct STSGroupBlockInfoEx { ...@@ -73,7 +73,7 @@ typedef struct STSGroupBlockInfoEx {
} STSGroupBlockInfoEx; } STSGroupBlockInfoEx;
typedef struct STSBuf { typedef struct STSBuf {
FILE* f; TdFilePtr pFile;
char path[PATH_MAX]; char path[PATH_MAX];
uint32_t fileSize; uint32_t fileSize;
...@@ -144,4 +144,4 @@ bool tsBufIsValidElem(STSElem* pElem); ...@@ -144,4 +144,4 @@ bool tsBufIsValidElem(STSElem* pElem);
} }
#endif #endif
#endif // TDENGINE_TTSZIP_H #endif /*_TD_COMMON_TTSZIP_H_*/
include/common/ttypes.h
浏览文件 @ 74c2ec8e
#ifndef TDENGINE_TTYPE_H /*
#define TDENGINE_TTYPE_H * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_COMMON_TTYPE_H_
#define _TD_COMMON_TTYPE_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -12,14 +27,9 @@ extern "C" { ...@@ -12,14 +27,9 @@ extern "C" {
typedef int32_t VarDataOffsetT; typedef int32_t VarDataOffsetT;
typedef uint32_t TDRowLenT; typedef uint32_t TDRowLenT;
typedef uint8_t TDRowValT; typedef uint8_t TDRowValT;
typedef uint16_t col_id_t; typedef int16_t col_id_t;
typedef int8_t col_type_t; typedef int8_t col_type_t;
typedef struct tstr {
VarDataLenT len;
char data[];
} tstr;
#pragma pack(push, 1) #pragma pack(push, 1)
typedef struct { typedef struct {
VarDataLenT len; VarDataLenT len;
...@@ -33,15 +43,14 @@ typedef struct { ...@@ -33,15 +43,14 @@ typedef struct {
#pragma pack(pop) #pragma pack(pop)
#define varDataTLen(v) (sizeof(VarDataLenT) + varDataLen(v)) #define varDataTLen(v) (sizeof(VarDataLenT) + varDataLen(v))
#define varDataCopy(dst, v) memcpy((dst), (void*) (v), varDataTLen(v)) #define varDataCopy(dst, v) memcpy((dst), (void *)(v), varDataTLen(v))
#define varDataLenByData(v) (*(VarDataLenT *)(((char*)(v)) - VARSTR_HEADER_SIZE)) #define varDataLenByData(v) (*(VarDataLenT *)(((char *)(v)) - VARSTR_HEADER_SIZE))
#define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT) (_len)) #define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT)(_len))
#define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_BINARY) || ((t) == TSDB_DATA_TYPE_NCHAR)) #define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_BINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
#define varDataNetLen(v) (htons(((VarDataLenT *)(v))[0])) #define varDataNetLen(v) (htons(((VarDataLenT *)(v))[0]))
#define varDataNetTLen(v) (sizeof(VarDataLenT) + varDataNetLen(v)) #define varDataNetTLen(v) (sizeof(VarDataLenT) + varDataNetLen(v))
// this data type is internally used only in 'in' query to hold the values // this data type is internally used only in 'in' query to hold the values
#define TSDB_DATA_TYPE_POINTER_ARRAY (1000) #define TSDB_DATA_TYPE_POINTER_ARRAY (1000)
#define TSDB_DATA_TYPE_VALUE_ARRAY (1001) #define TSDB_DATA_TYPE_VALUE_ARRAY (1001)
...@@ -62,7 +71,7 @@ typedef struct { ...@@ -62,7 +71,7 @@ typedef struct {
case TSDB_DATA_TYPE_USMALLINT: \ case TSDB_DATA_TYPE_USMALLINT: \
(_v) = (_finalType)GET_UINT16_VAL(_data); \ (_v) = (_finalType)GET_UINT16_VAL(_data); \
break; \ break; \
case TSDB_DATA_TYPE_TIMESTAMP:\ case TSDB_DATA_TYPE_TIMESTAMP: \
case TSDB_DATA_TYPE_BIGINT: \ case TSDB_DATA_TYPE_BIGINT: \
(_v) = (_finalType)(GET_INT64_VAL(_data)); \ (_v) = (_finalType)(GET_INT64_VAL(_data)); \
break; \ break; \
...@@ -91,6 +100,8 @@ typedef struct { ...@@ -91,6 +100,8 @@ typedef struct {
do { \ do { \
switch (_type) { \ switch (_type) { \
case TSDB_DATA_TYPE_BOOL: \ case TSDB_DATA_TYPE_BOOL: \
*(bool *)(_v) = (bool)(_data); \
break; \
case TSDB_DATA_TYPE_TINYINT: \ case TSDB_DATA_TYPE_TINYINT: \
*(int8_t *)(_v) = (int8_t)(_data); \ *(int8_t *)(_v) = (int8_t)(_data); \
break; \ break; \
...@@ -104,6 +115,7 @@ typedef struct { ...@@ -104,6 +115,7 @@ typedef struct {
*(uint16_t *)(_v) = (uint16_t)(_data); \ *(uint16_t *)(_v) = (uint16_t)(_data); \
break; \ break; \
case TSDB_DATA_TYPE_BIGINT: \ case TSDB_DATA_TYPE_BIGINT: \
case TSDB_DATA_TYPE_TIMESTAMP: \
*(int64_t *)(_v) = (int64_t)(_data); \ *(int64_t *)(_v) = (int64_t)(_data); \
break; \ break; \
case TSDB_DATA_TYPE_UBIGINT: \ case TSDB_DATA_TYPE_UBIGINT: \
...@@ -143,7 +155,8 @@ typedef struct { ...@@ -143,7 +155,8 @@ typedef struct {
#define IS_VALID_FLOAT(_t) ((_t) >= -FLT_MAX && (_t) <= FLT_MAX) #define IS_VALID_FLOAT(_t) ((_t) >= -FLT_MAX && (_t) <= FLT_MAX)
#define IS_VALID_DOUBLE(_t) ((_t) >= -DBL_MAX && (_t) <= DBL_MAX) #define IS_VALID_DOUBLE(_t) ((_t) >= -DBL_MAX && (_t) <= DBL_MAX)
#define IS_CONVERT_AS_SIGNED(_t) (IS_SIGNED_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL) || (_t) == (TSDB_DATA_TYPE_TIMESTAMP)) #define IS_CONVERT_AS_SIGNED(_t) \
(IS_SIGNED_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL) || (_t) == (TSDB_DATA_TYPE_TIMESTAMP))
#define IS_CONVERT_AS_UNSIGNED(_t) (IS_UNSIGNED_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL)) #define IS_CONVERT_AS_UNSIGNED(_t) (IS_UNSIGNED_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL))
static FORCE_INLINE bool isNull(const void *val, int32_t type) { static FORCE_INLINE bool isNull(const void *val, int32_t type) {
...@@ -164,17 +177,17 @@ static FORCE_INLINE bool isNull(const void *val, int32_t type) { ...@@ -164,17 +177,17 @@ static FORCE_INLINE bool isNull(const void *val, int32_t type) {
case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_DOUBLE:
return *(uint64_t *)val == TSDB_DATA_DOUBLE_NULL; return *(uint64_t *)val == TSDB_DATA_DOUBLE_NULL;
case TSDB_DATA_TYPE_NCHAR: case TSDB_DATA_TYPE_NCHAR:
return varDataLen(val) == sizeof(int32_t) && *(uint32_t*) varDataVal(val) == TSDB_DATA_NCHAR_NULL; return varDataLen(val) == sizeof(int32_t) && *(uint32_t *)varDataVal(val) == TSDB_DATA_NCHAR_NULL;
case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_BINARY:
return varDataLen(val) == sizeof(int8_t) && *(uint8_t *) varDataVal(val) == TSDB_DATA_BINARY_NULL; return varDataLen(val) == sizeof(int8_t) && *(uint8_t *)varDataVal(val) == TSDB_DATA_BINARY_NULL;
case TSDB_DATA_TYPE_UTINYINT: case TSDB_DATA_TYPE_UTINYINT:
return *(uint8_t*) val == TSDB_DATA_UTINYINT_NULL; return *(uint8_t *)val == TSDB_DATA_UTINYINT_NULL;
case TSDB_DATA_TYPE_USMALLINT: case TSDB_DATA_TYPE_USMALLINT:
return *(uint16_t*) val == TSDB_DATA_USMALLINT_NULL; return *(uint16_t *)val == TSDB_DATA_USMALLINT_NULL;
case TSDB_DATA_TYPE_UINT: case TSDB_DATA_TYPE_UINT:
return *(uint32_t*) val == TSDB_DATA_UINT_NULL; return *(uint32_t *)val == TSDB_DATA_UINT_NULL;
case TSDB_DATA_TYPE_UBIGINT: case TSDB_DATA_TYPE_UBIGINT:
return *(uint64_t*) val == TSDB_DATA_UBIGINT_NULL; return *(uint64_t *)val == TSDB_DATA_UBIGINT_NULL;
default: default:
return false; return false;
...@@ -185,32 +198,31 @@ typedef struct tDataTypeDescriptor { ...@@ -185,32 +198,31 @@ typedef struct tDataTypeDescriptor {
int16_t type; int16_t type;
int16_t nameLen; int16_t nameLen;
int32_t bytes; int32_t bytes;
char * name; char *name;
int64_t minValue; int64_t minValue;
int64_t maxValue; int64_t maxValue;
int (*compFunc)(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, int32_t (*compFunc)(const char *const input, int32_t inputSize, const int32_t nelements, char *const output,
char algorithm, char *const buffer, int bufferSize); int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
int (*decompFunc)(const char *const input, int compressedSize, const int nelements, char *const output, int32_t (*decompFunc)(const char *const input, int32_t compressedSize, const int32_t nelements, char *const output,
int outputSize, char algorithm, char *const buffer, int bufferSize); int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
void (*statisFunc)(const void *pData, int32_t numofrow, int64_t *min, int64_t *max, int64_t *sum, void (*statisFunc)(const void *pData, int32_t numofrow, int64_t *min, int64_t *max, int64_t *sum, int16_t *minindex,
int16_t *minindex, int16_t *maxindex, int16_t *numofnull); int16_t *maxindex, int16_t *numofnull);
} tDataTypeDescriptor; } tDataTypeDescriptor;
extern tDataTypeDescriptor tDataTypes[15]; extern tDataTypeDescriptor tDataTypes[15];
bool isValidDataType(int32_t type); bool isValidDataType(int32_t type);
void setVardataNull(void* val, int32_t type); void setVardataNull(void *val, int32_t type);
void setNull(void *val, int32_t type, int32_t bytes); void setNull(void *val, int32_t type, int32_t bytes);
void setNullN(void *val, int32_t type, int32_t bytes, int32_t numOfElems); void setNullN(void *val, int32_t type, int32_t bytes, int32_t numOfElems);
const void *getNullValue(int32_t type); const void *getNullValue(int32_t type);
void assignVal(char *val, const char *src, int32_t len, int32_t type); void assignVal(char *val, const char *src, int32_t len, int32_t type);
void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf); void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void *buf);
void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type); void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
void* getDataMin(int32_t type); void *getDataMin(int32_t type);
void* getDataMax(int32_t type); void *getDataMax(int32_t type);
#define SET_DOUBLE_NULL(v) (*(uint64_t *)(v) = TSDB_DATA_DOUBLE_NULL) #define SET_DOUBLE_NULL(v) (*(uint64_t *)(v) = TSDB_DATA_DOUBLE_NULL)
#define SET_BIGINT_NULL(v) (*(uint64_t *)(v) = TSDB_DATA_BIGINT_NULL) #define SET_BIGINT_NULL(v) (*(uint64_t *)(v) = TSDB_DATA_BIGINT_NULL)
...@@ -219,4 +231,4 @@ void* getDataMax(int32_t type); ...@@ -219,4 +231,4 @@ void* getDataMax(int32_t type);
} }
#endif #endif
#endif // TDENGINE_TTYPE_H #endif /*_TD_COMMON_TTYPE_H_*/
include/common/tvariant.h
浏览文件 @ 74c2ec8e
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_TVARIANT_H #ifndef _TD_COMMON_VARIANT_H_
#define TDENGINE_TVARIANT_H #define _TD_COMMON_VARIANT_H_
#include "tarray.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "tarray.h"
// variant, each number/string/field_id has a corresponding struct during parsing sql // variant, each number/string/field_id has a corresponding struct during parsing sql
typedef struct SVariant { typedef struct SVariant {
uint32_t nType; uint32_t nType;
...@@ -31,16 +31,16 @@ typedef struct SVariant { ...@@ -31,16 +31,16 @@ typedef struct SVariant {
uint64_t u; uint64_t u;
double d; double d;
char *pz; char *pz;
wchar_t *wpz; TdUcs4 *ucs4;
SArray *arr; // only for 'in' query to hold value list, not value for a field SArray *arr; // only for 'in' query to hold value list, not value for a field
}; };
} SVariant; } SVariant;
int32_t toInteger(const char* z, int32_t n, int32_t base, int64_t* value, bool* issigned); int32_t toInteger(const char *z, int32_t n, int32_t base, int64_t *value, bool *issigned);
bool taosVariantIsValid(SVariant *pVar); bool taosVariantIsValid(SVariant *pVar);
void taosVariantCreate(SVariant *pVar, const char* z, int32_t n, int32_t type); void taosVariantCreate(SVariant *pVar, const char *z, int32_t n, int32_t type);
void taosVariantCreateFromBinary(SVariant *pVar, const char *pz, size_t len, uint32_t type); void taosVariantCreateFromBinary(SVariant *pVar, const char *pz, size_t len, uint32_t type);
...@@ -48,7 +48,7 @@ void taosVariantDestroy(SVariant *pV); ...@@ -48,7 +48,7 @@ void taosVariantDestroy(SVariant *pV);
void taosVariantAssign(SVariant *pDst, const SVariant *pSrc); void taosVariantAssign(SVariant *pDst, const SVariant *pSrc);
int32_t taosVariantCompare(const SVariant* p1, const SVariant* p2); int32_t taosVariantCompare(const SVariant *p1, const SVariant *p2);
int32_t taosVariantToString(SVariant *pVar, char *dst); int32_t taosVariantToString(SVariant *pVar, char *dst);
...@@ -64,4 +64,4 @@ int32_t taosVariantTypeSetType(SVariant *pVariant, char type); ...@@ -64,4 +64,4 @@ int32_t taosVariantTypeSetType(SVariant *pVariant, char type);
} }
#endif #endif
#endif // TDENGINE_TVARIANT_H #endif /*_TD_COMMON_VARIANT_H_*/
include/dnode/mgmt/dnode.h
浏览文件 @ 74c2ec8e
...@@ -25,26 +25,12 @@ extern "C" { ...@@ -25,26 +25,12 @@ extern "C" {
/* ------------------------ TYPES EXPOSED ---------------- */ /* ------------------------ TYPES EXPOSED ---------------- */
typedef struct SDnode SDnode; typedef struct SDnode SDnode;
/* ------------------------ Environment ------------------ */
typedef struct {
int32_t sver;
int32_t numOfCores;
int16_t numOfCommitThreads;
int8_t enableTelem;
char timezone[TSDB_TIMEZONE_LEN];
char locale[TSDB_LOCALE_LEN];
char charset[TSDB_LOCALE_LEN];
char buildinfo[64];
char gitinfo[48];
} SDnodeEnvCfg;
/** /**
* @brief Initialize the environment * @brief Initialize the environment
* *
* @param pOption Option of the environment
* @return int32_t 0 for success and -1 for failure * @return int32_t 0 for success and -1 for failure
*/ */
int32_t dndInit(const SDnodeEnvCfg *pCfg); int32_t dndInit();
/** /**
* @brief clear the environment * @brief clear the environment
...@@ -55,16 +41,14 @@ void dndCleanup(); ...@@ -55,16 +41,14 @@ void dndCleanup();
/* ------------------------ SDnode ----------------------- */ /* ------------------------ SDnode ----------------------- */
typedef struct { typedef struct {
int32_t numOfSupportVnodes; int32_t numOfSupportVnodes;
int32_t statusInterval;
float numOfThreadsPerCore;
float ratioOfQueryCores;
int32_t maxShellConns;
int32_t shellActivityTimer;
uint16_t serverPort; uint16_t serverPort;
char dataDir[TSDB_FILENAME_LEN]; char dataDir[TSDB_FILENAME_LEN];
char localEp[TSDB_EP_LEN]; char localEp[TSDB_EP_LEN];
char localFqdn[TSDB_FQDN_LEN]; char localFqdn[TSDB_FQDN_LEN];
char firstEp[TSDB_EP_LEN]; char firstEp[TSDB_EP_LEN];
char secondEp[TSDB_EP_LEN];
SDiskCfg *pDisks;
int32_t numOfDisks;
} SDnodeObjCfg; } SDnodeObjCfg;
/** /**
......
include/dnode/mnode/mnode.h
浏览文件 @ 74c2ec8e
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#ifndef _TD_MND_H_ #ifndef _TD_MND_H_
#define _TD_MND_H_ #define _TD_MND_H_
#include "monitor.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -30,39 +32,12 @@ typedef int32_t (*PutReqToMWriteQFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg); ...@@ -30,39 +32,12 @@ typedef int32_t (*PutReqToMWriteQFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg);
typedef int32_t (*PutReqToMReadQFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg); typedef int32_t (*PutReqToMReadQFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg);
typedef void (*SendRedirectRspFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg); typedef void (*SendRedirectRspFp)(SDnode *pDnode, struct SRpcMsg *rpcMsg);
typedef struct SMnodeLoad {
int64_t numOfDnode;
int64_t numOfMnode;
int64_t numOfVgroup;
int64_t numOfDatabase;
int64_t numOfSuperTable;
int64_t numOfChildTable;
int64_t numOfNormalTable;
int64_t numOfColumn;
int64_t totalPoints;
int64_t totalStorage;
int64_t compStorage;
} SMnodeLoad;
typedef struct SMnodeCfg {
int32_t sver;
int8_t enableTelem;
int32_t statusInterval;
int32_t shellActivityTimer;
char *timezone;
char *locale;
char *charset;
char *buildinfo;
char *gitinfo;
} SMnodeCfg;
typedef struct { typedef struct {
int32_t dnodeId; int32_t dnodeId;
int64_t clusterId; int64_t clusterId;
int8_t replica; int8_t replica;
int8_t selfIndex; int8_t selfIndex;
SReplica replicas[TSDB_MAX_REPLICA]; SReplica replicas[TSDB_MAX_REPLICA];
SMnodeCfg cfg;
SDnode *pDnode; SDnode *pDnode;
PutReqToMWriteQFp putReqToMWriteQFp; PutReqToMWriteQFp putReqToMWriteQFp;
PutReqToMReadQFp putReqToMReadQFp; PutReqToMReadQFp putReqToMReadQFp;
...@@ -105,13 +80,16 @@ int32_t mndAlter(SMnode *pMnode, const SMnodeOpt *pOption); ...@@ -105,13 +80,16 @@ int32_t mndAlter(SMnode *pMnode, const SMnodeOpt *pOption);
void mndDestroy(const char *path); void mndDestroy(const char *path);
/** /**
* @brief Get mnode statistics info. * @brief Get mnode monitor info.
* *
* @param pMnode The mnode object. * @param pMnode The mnode object.
* @param pLoad Statistics of the mnode. * @param pClusterInfo
* @param pVgroupInfo
* @param pGrantInfo
* @return int32_t 0 for success, -1 for failure. * @return int32_t 0 for success, -1 for failure.
*/ */
int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad); int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
SMonGrantInfo *pGrantInfo);
/** /**
* @brief Get user authentication info. * @brief Get user authentication info.
......
include/dnode/mnode/sdb/sdb.h
浏览文件 @ 74c2ec8e
...@@ -113,14 +113,16 @@ typedef enum { ...@@ -113,14 +113,16 @@ typedef enum {
SDB_USER = 7, SDB_USER = 7,
SDB_AUTH = 8, SDB_AUTH = 8,
SDB_ACCT = 9, SDB_ACCT = 9,
SDB_SUBSCRIBE = 10, SDB_STREAM = 10,
SDB_CONSUMER = 11, SDB_OFFSET = 11,
SDB_TOPIC = 12, SDB_SUBSCRIBE = 12,
SDB_VGROUP = 13, SDB_CONSUMER = 13,
SDB_STB = 14, SDB_TOPIC = 14,
SDB_DB = 15, SDB_VGROUP = 15,
SDB_FUNC = 16, SDB_STB = 16,
SDB_MAX = 17 SDB_DB = 17,
SDB_FUNC = 18,
SDB_MAX = 19
} ESdbType; } ESdbType;
typedef struct SSdb SSdb; typedef struct SSdb SSdb;
......
include/dnode/snode/snode.h
浏览文件 @ 74c2ec8e
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
#ifndef _TD_SNODE_H_ #ifndef _TD_SNODE_H_
#define _TD_SNODE_H_ #define _TD_SNODE_H_
#include "tcommon.h"
#include "tmsg.h"
#include "trpc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -75,7 +79,11 @@ int32_t sndGetLoad(SSnode *pSnode, SSnodeLoad *pLoad); ...@@ -75,7 +79,11 @@ int32_t sndGetLoad(SSnode *pSnode, SSnodeLoad *pLoad);
* @param pRsp The response message * @param pRsp The response message
* @return int32_t 0 for success, -1 for failure * @return int32_t 0 for success, -1 for failure
*/ */
int32_t sndProcessMsg(SSnode *pSnode, SRpcMsg *pMsg, SRpcMsg **pRsp); // int32_t sndProcessMsg(SSnode *pSnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
int32_t sndProcessUMsg(SSnode *pSnode, SRpcMsg *pMsg);
int32_t sndProcessSMsg(SSnode *pSnode, SRpcMsg *pMsg);
/** /**
* @brief Drop a snode. * @brief Drop a snode.
......
include/libs/catalog/catalog.h
浏览文件 @ 74c2ec8e
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
#include "taosdef.h" #include "taosdef.h"
#include "query.h" #include "query.h"
#include "tname.h" #include "tname.h"
#include "common.h" #include "tcommon.h"
#include "tarray.h" #include "tarray.h"
#include "thash.h" #include "thash.h"
#include "tmsg.h" #include "tmsg.h"
...@@ -51,7 +51,7 @@ typedef struct SMetaData { ...@@ -51,7 +51,7 @@ typedef struct SMetaData {
SArray *pTableMeta; // STableMeta array SArray *pTableMeta; // STableMeta array
SArray *pVgroupInfo; // SVgroupInfo list SArray *pVgroupInfo; // SVgroupInfo list
SArray *pUdfList; // udf info list SArray *pUdfList; // udf info list
SEpSet *pEpSet; // qnode epset list SArray *pEpSetList; // qnode epset list, SArray<SEpSet>
} SMetaData; } SMetaData;
typedef struct SCatalogCfg { typedef struct SCatalogCfg {
...@@ -74,9 +74,9 @@ typedef struct SDbVgVersion { ...@@ -74,9 +74,9 @@ typedef struct SDbVgVersion {
char dbFName[TSDB_DB_FNAME_LEN]; char dbFName[TSDB_DB_FNAME_LEN];
int64_t dbId; int64_t dbId;
int32_t vgVersion; int32_t vgVersion;
int32_t numOfTable; // unit is TSDB_TABLE_NUM_UNIT
} SDbVgVersion; } SDbVgVersion;
int32_t catalogInit(SCatalogCfg *cfg); int32_t catalogInit(SCatalogCfg *cfg);
/** /**
...@@ -95,7 +95,7 @@ int32_t catalogGetHandle(uint64_t clusterId, SCatalog** catalogHandle); ...@@ -95,7 +95,7 @@ int32_t catalogGetHandle(uint64_t clusterId, SCatalog** catalogHandle);
*/ */
void catalogFreeHandle(SCatalog* pCatalog); void catalogFreeHandle(SCatalog* pCatalog);
int32_t catalogGetDBVgVersion(SCatalog* pCatalog, const char* dbName, int32_t* version); int32_t catalogGetDBVgVersion(SCatalog* pCtg, const char* dbFName, int32_t* version, int64_t* dbId, int32_t *tableNum);
/** /**
* Get a DB's all vgroup info. * Get a DB's all vgroup info.
......
include/libs/executor/dataSinkMgt.h
浏览文件 @ 74c2ec8e
...@@ -23,6 +23,7 @@ extern "C" { ...@@ -23,6 +23,7 @@ extern "C" {
#include "os.h" #include "os.h"
#include "thash.h" #include "thash.h"
#include "executor.h" #include "executor.h"
#include "plannodes.h"
#define DS_BUF_LOW 1 #define DS_BUF_LOW 1
#define DS_BUF_FULL 2 #define DS_BUF_FULL 2
...@@ -40,7 +41,6 @@ int32_t dsDataSinkMgtInit(SDataSinkMgtCfg *cfg); ...@@ -40,7 +41,6 @@ int32_t dsDataSinkMgtInit(SDataSinkMgtCfg *cfg);
typedef struct SInputData { typedef struct SInputData {
const struct SSDataBlock* pData; const struct SSDataBlock* pData;
SHashObj* pTableRetrieveTsMap;
} SInputData; } SInputData;
typedef struct SOutputData { typedef struct SOutputData {
...@@ -59,7 +59,7 @@ typedef struct SOutputData { ...@@ -59,7 +59,7 @@ typedef struct SOutputData {
* @param pHandle output * @param pHandle output
* @return error code * @return error code
*/ */
int32_t dsCreateDataSinker(const struct SDataSink *pDataSink, DataSinkHandle* pHandle); int32_t dsCreateDataSinker(const SDataSinkNode* pDataSink, DataSinkHandle* pHandle);
/** /**
* Put the result set returned by the executor into datasinker. * Put the result set returned by the executor into datasinker.
......
include/libs/executor/executor.h
浏览文件 @ 74c2ec8e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
extern "C" { extern "C" {
#endif #endif
#include "common.h" #include "tcommon.h"
typedef void* qTaskInfo_t; typedef void* qTaskInfo_t;
typedef void* DataSinkHandle; typedef void* DataSinkHandle;
...@@ -31,6 +31,7 @@ typedef struct SReadHandle { ...@@ -31,6 +31,7 @@ typedef struct SReadHandle {
void* reader; void* reader;
void* meta; void* meta;
} SReadHandle; } SReadHandle;
/** /**
* Create the exec task for streaming mode * Create the exec task for streaming mode
* @param pMsg * @param pMsg
...@@ -40,13 +41,23 @@ typedef struct SReadHandle { ...@@ -40,13 +41,23 @@ typedef struct SReadHandle {
qTaskInfo_t qCreateStreamExecTaskInfo(void *msg, void* streamReadHandle); qTaskInfo_t qCreateStreamExecTaskInfo(void *msg, void* streamReadHandle);
/** /**
* * Set the input data block for the stream scan.
* @param tinfo * @param tinfo
* @param input * @param input
* @return * @return
*/ */
int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input); int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input);
/**
* Update the table id list, add or remove.
*
* @param tinfo
* @param id
* @param isAdd
* @return
*/
int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isAdd);
/** /**
* Create the exec task object according to task json * Create the exec task object according to task json
* @param readHandle * @param readHandle
...@@ -78,25 +89,6 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t *useconds); ...@@ -78,25 +89,6 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t *useconds);
*/ */
int32_t qRetrieveQueryResultInfo(qTaskInfo_t tinfo, bool* buildRes, void* pRspContext); int32_t qRetrieveQueryResultInfo(qTaskInfo_t tinfo, bool* buildRes, void* pRspContext);
/**
*
* Retrieve the actual results to fill the response message payload.
* Note that this function must be executed after qRetrieveQueryResultInfo is invoked.
*
* @param tinfo tinfo object
* @param pRsp response message
* @param contLen payload length
* @return
*/
//int32_t qDumpRetrieveResult(qTaskInfo_t tinfo, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
/**
* return the transporter context (RPC)
* @param tinfo
* @return
*/
void* qGetResultRetrieveMsg(qTaskInfo_t tinfo);
/** /**
* kill the ongoing query and free the query handle and corresponding resources automatically * kill the ongoing query and free the query handle and corresponding resources automatically
* @param tinfo qhandle * @param tinfo qhandle
......
include/libs/function/function.h
浏览文件 @ 74c2ec8e
...@@ -20,9 +20,30 @@ ...@@ -20,9 +20,30 @@
extern "C" { extern "C" {
#endif #endif
#include "common.h"
#include "tvariant.h"
#include "tbuffer.h" #include "tbuffer.h"
#include "tcommon.h"
#include "tvariant.h"
struct SqlFunctionCtx;
struct SResultRowEntryInfo;
typedef struct SFunctionNode SFunctionNode;
typedef struct SFuncExecEnv {
int32_t calcMemSize;
} SFuncExecEnv;
typedef bool (*FExecGetEnv)(SFunctionNode* pFunc, SFuncExecEnv* pEnv);
typedef bool (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo* pResultCellInfo);
typedef void (*FExecProcess)(struct SqlFunctionCtx *pCtx);
typedef void (*FExecFinalize)(struct SqlFunctionCtx *pCtx);
typedef struct SFuncExecFuncs {
FExecGetEnv getEnv;
FExecInit init;
FExecProcess process;
FExecFinalize finalize;
} SFuncExecFuncs;
#define MAX_INTERVAL_TIME_WINDOW 1000000 // maximum allowed time windows in final results #define MAX_INTERVAL_TIME_WINDOW 1000000 // maximum allowed time windows in final results
...@@ -111,62 +132,65 @@ struct SqlFunctionCtx; ...@@ -111,62 +132,65 @@ struct SqlFunctionCtx;
struct SResultRowEntryInfo; struct SResultRowEntryInfo;
//for selectivity query, the corresponding tag value is assigned if the data is qualified //for selectivity query, the corresponding tag value is assigned if the data is qualified
typedef struct SExtTagsInfo { typedef struct SSubsidiaryResInfo {
int16_t tagsLen; // keep the tags data for top/bottom query result int16_t bufLen; // keep the tags data for top/bottom query result
int16_t numOfTagCols; int16_t numOfCols;
struct SqlFunctionCtx **pTagCtxList; struct SqlFunctionCtx **pCtx;
} SExtTagsInfo; } SSubsidiaryResInfo;
typedef struct SResultDataInfo { typedef struct SResultDataInfo {
int16_t precision;
int16_t scale;
int16_t type; int16_t type;
int16_t bytes; int16_t bytes;
int32_t intermediateBytes; int32_t interBufSize;
} SResultDataInfo; } SResultDataInfo;
#define GET_RES_INFO(ctx) ((ctx)->resultInfo) #define GET_RES_INFO(ctx) ((ctx)->resultInfo)
typedef struct SFunctionFpSet { typedef struct SInputColumnInfoData {
bool (*init)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo* pResultCellInfo); // setup the execute environment int32_t totalRows; // total rows in current columnar data
void (*addInput)(struct SqlFunctionCtx *pCtx); int32_t startRowIndex; // handle started row index
int32_t numOfRows; // the number of rows needs to be handled
// finalizer must be called after all exec has been executed to generated final result. int32_t numOfInputCols; // PTS is not included
void (*finalize)(struct SqlFunctionCtx *pCtx); bool colDataAggIsSet;// if agg is set or not
void (*combine)(struct SqlFunctionCtx *pCtx); SColumnInfoData *pPTS; // primary timestamp column
} SFunctionFpSet; SColumnInfoData **pData;
SColumnDataAgg **pColumnDataAgg;
extern SFunctionFpSet fpSet[1]; } SInputColumnInfoData;
// sql function runtime context // sql function runtime context
typedef struct SqlFunctionCtx { typedef struct SqlFunctionCtx {
int32_t size; // number of rows SInputColumnInfoData input;
void * pInput; // input data buffer
uint32_t order; // asc|desc
int16_t inputType;
int16_t inputBytes;
SResultDataInfo resDataInfo; SResultDataInfo resDataInfo;
bool hasNull; // null value exist in current block uint32_t order; // asc|desc
bool requireNull; // require null in some function ////////////////////////////////////////////////////////////////
int32_t startRow; // start row index
int32_t size; // handled processed row number
SColumnInfoData* pInput;
SColumnDataAgg agg;
int16_t inputType; // TODO remove it
int16_t inputBytes; // TODO remove it
bool hasNull; // null value exist in current block, TODO remove it
bool requireNull; // require null in some function, TODO remove it
int32_t columnIndex; // TODO remove it
uint8_t currentStage; // record current running step, default: 0
bool isAggSet;
/////////////////////////////////////////////////////////////////
bool stableQuery; bool stableQuery;
int16_t functionId; // function id int16_t functionId; // function id
char * pOutput; // final result output buffer, point to sdata->data char * pOutput; // final result output buffer, point to sdata->data
uint8_t currentStage; // record current running step, default: 0
int64_t startTs; // timestamp range of current query when function is executed on a specific data block int64_t startTs; // timestamp range of current query when function is executed on a specific data block
int32_t numOfParams; int32_t numOfParams;
SVariant param[4]; // input parameter, e.g., top(k, 20), the number of results for top query is kept in param SVariant param[4]; // input parameter, e.g., top(k, 20), the number of results for top query is kept in param
int64_t *ptsList; // corresponding timestamp array list int64_t *ptsList; // corresponding timestamp array list
void *ptsOutputBuf; // corresponding output buffer for timestamp of each result, e.g., top/bottom*/ void *ptsOutputBuf; // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
SVariant tag; SVariant tag;
bool isAggSet;
SColumnDataAgg agg;
struct SResultRowEntryInfo *resultInfo; struct SResultRowEntryInfo *resultInfo;
SExtTagsInfo tagInfo; SSubsidiaryResInfo subsidiaryRes;
SPoint1 start; SPoint1 start;
SPoint1 end; SPoint1 end;
SFuncExecFuncs fpSet;
int32_t columnIndex;
SFunctionFpSet* fpSet;
} SqlFunctionCtx; } SqlFunctionCtx;
enum { enum {
...@@ -192,9 +216,10 @@ typedef struct tExprNode { ...@@ -192,9 +216,10 @@ typedef struct tExprNode {
struct SVariant *pVal; // value node struct SVariant *pVal; // value node
struct {// function node struct {// function node
char functionName[FUNCTIONS_NAME_MAX_LENGTH]; char functionName[FUNCTIONS_NAME_MAX_LENGTH]; // todo refactor
int32_t functionId;
int32_t num; int32_t num;
SFunctionNode *pFunctNode;
// Note that the attribute of pChild is not the parameter of function, it is the columns that involved in the // Note that the attribute of pChild is not the parameter of function, it is the columns that involved in the
// calculation instead. // calculation instead.
// E.g., Cov(col1, col2), the column information, w.r.t. the col1 and col2, is kept in pChild nodes. // E.g., Cov(col1, col2), the column information, w.r.t. the col1 and col2, is kept in pChild nodes.
...@@ -205,7 +230,6 @@ typedef struct tExprNode { ...@@ -205,7 +230,6 @@ typedef struct tExprNode {
}; };
} tExprNode; } tExprNode;
//TODO create?
void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree); void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *)); void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *));
...@@ -227,7 +251,13 @@ typedef struct SAggFunctionInfo { ...@@ -227,7 +251,13 @@ typedef struct SAggFunctionInfo {
} SAggFunctionInfo; } SAggFunctionInfo;
typedef struct SScalarParam { typedef struct SScalarParam {
void* data; void *data;
union {
SColumnInfoData *columnData;
void *data;
} orig;
char *bitmap;
bool dataInBlock;
int32_t num; int32_t num;
int32_t type; int32_t type;
int32_t bytes; int32_t bytes;
...@@ -265,19 +295,8 @@ typedef struct SMultiFunctionsDesc { ...@@ -265,19 +295,8 @@ typedef struct SMultiFunctionsDesc {
int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, SResultDataInfo* pInfo, int16_t extLength, int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, SResultDataInfo* pInfo, int16_t extLength,
bool isSuperTable); bool isSuperTable);
/**
* If the given name is a valid built-in sql function, the value of true will be returned.
* @param name
* @param len
* @return
*/
int32_t qIsBuiltinFunction(const char* name, int32_t len, bool* scalarFunction);
bool qIsValidUdf(SArray* pUdfInfo, const char* name, int32_t len, int32_t* functionId); bool qIsValidUdf(SArray* pUdfInfo, const char* name, int32_t len, int32_t* functionId);
bool qIsAggregateFunction(const char* functionName);
bool qIsSelectivityFunction(const char* functionName);
tExprNode* exprTreeFromBinary(const void* data, size_t size); tExprNode* exprTreeFromBinary(const void* data, size_t size);
void extractFunctionDesc(SArray* pFunctionIdList, SMultiFunctionsDesc* pDesc); void extractFunctionDesc(SArray* pFunctionIdList, SMultiFunctionsDesc* pDesc);
...@@ -286,7 +305,7 @@ tExprNode* exprdup(tExprNode* pTree); ...@@ -286,7 +305,7 @@ tExprNode* exprdup(tExprNode* pTree);
void resetResultRowEntryResult(SqlFunctionCtx* pCtx, int32_t num); void resetResultRowEntryResult(SqlFunctionCtx* pCtx, int32_t num);
void cleanupResultRowEntry(struct SResultRowEntryInfo* pCell); void cleanupResultRowEntry(struct SResultRowEntryInfo* pCell);
int32_t getNumOfResult(SqlFunctionCtx* pCtx, int32_t num); int32_t getNumOfResult(SqlFunctionCtx* pCtx, int32_t num, SSDataBlock* pResBlock);
bool isRowEntryCompleted(struct SResultRowEntryInfo* pEntry); bool isRowEntryCompleted(struct SResultRowEntryInfo* pEntry);
bool isRowEntryInitialized(struct SResultRowEntryInfo* pEntry); bool isRowEntryInitialized(struct SResultRowEntryInfo* pEntry);
......
include/libs/function/functionMgt.h
浏览文件 @ 74c2ec8e
...@@ -102,22 +102,6 @@ struct SqlFunctionCtx; ...@@ -102,22 +102,6 @@ struct SqlFunctionCtx;
struct SResultRowEntryInfo; struct SResultRowEntryInfo;
struct STimeWindow; struct STimeWindow;
typedef struct SFuncExecEnv {
int32_t calcMemSize;
} SFuncExecEnv;
typedef bool (*FExecGetEnv)(SFunctionNode* pFunc, SFuncExecEnv* pEnv);
typedef bool (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo* pResultCellInfo);
typedef void (*FExecProcess)(struct SqlFunctionCtx *pCtx);
typedef void (*FExecFinalize)(struct SqlFunctionCtx *pCtx);
typedef struct SFuncExecFuncs {
FExecGetEnv getEnv;
FExecInit init;
FExecProcess process;
FExecFinalize finalize;
} SFuncExecFuncs;
typedef int32_t (*FScalarExecProcess)(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput); typedef int32_t (*FScalarExecProcess)(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
typedef struct SScalarFuncExecFuncs { typedef struct SScalarFuncExecFuncs {
...@@ -127,6 +111,8 @@ typedef struct SScalarFuncExecFuncs { ...@@ -127,6 +111,8 @@ typedef struct SScalarFuncExecFuncs {
int32_t fmFuncMgtInit(); int32_t fmFuncMgtInit();
void fmFuncMgtDestroy();
int32_t fmGetFuncInfo(const char* pFuncName, int32_t* pFuncId, int32_t* pFuncType); int32_t fmGetFuncInfo(const char* pFuncName, int32_t* pFuncId, int32_t* pFuncType);
int32_t fmGetFuncResultType(SFunctionNode* pFunc); int32_t fmGetFuncResultType(SFunctionNode* pFunc);
......
include/libs/index/index.h
浏览文件 @ 74c2ec8e
...@@ -29,6 +29,12 @@ typedef struct SIndexOpts SIndexOpts; ...@@ -29,6 +29,12 @@ typedef struct SIndexOpts SIndexOpts;
typedef struct SIndexMultiTermQuery SIndexMultiTermQuery; typedef struct SIndexMultiTermQuery SIndexMultiTermQuery;
typedef struct SArray SIndexMultiTerm; typedef struct SArray SIndexMultiTerm;
typedef struct SIndex SIndexJson;
typedef struct SIndexTerm SIndexJsonTerm;
typedef struct SIndexOpts SIndexJsonOpts;
typedef struct SIndexMultiTermQuery SIndexJsonMultiTermQuery;
typedef struct SArray SIndexJsonMultiTerm;
typedef enum { typedef enum {
ADD_VALUE, // add index colume value ADD_VALUE, // add index colume value
DEL_VALUE, // delete index column value DEL_VALUE, // delete index column value
...@@ -39,24 +45,108 @@ typedef enum { ...@@ -39,24 +45,108 @@ typedef enum {
} SIndexOperOnColumn; } SIndexOperOnColumn;
typedef enum { MUST = 0, SHOULD = 1, NOT = 2 } EIndexOperatorType; typedef enum { MUST = 0, SHOULD = 1, NOT = 2 } EIndexOperatorType;
typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2, QUERY_REGEX = 3 } EIndexQueryType; typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2, QUERY_REGEX = 3, QUERY_RANGE = 4 } EIndexQueryType;
/* /*
* @param: oper * create multi query
* * @param oper (input, relation between querys)
*/ */
SIndexMultiTermQuery* indexMultiTermQueryCreate(EIndexOperatorType oper); SIndexMultiTermQuery* indexMultiTermQueryCreate(EIndexOperatorType oper);
/*
* destroy multi query
* @param pQuery (input, multi-query-object to be destory)
*/
void indexMultiTermQueryDestroy(SIndexMultiTermQuery* pQuery); void indexMultiTermQueryDestroy(SIndexMultiTermQuery* pQuery);
/*
* add query to multi query
* @param pQuery (input, multi-query-object)
* @param term (input, single query term)
* @param type (input, single query type)
* @return error code
*/
int indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EIndexQueryType type); int indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EIndexQueryType type);
/* /*
* @param: * open index
* @param: * @param opt (input, index opt)
* @param path (input, index path)
* @param index (output, index object)
* @return error code
*/ */
int indexOpen(SIndexOpts* opt, const char* path, SIndex** index); int indexOpen(SIndexOpts* opt, const char* path, SIndex** index);
/*
* close index
* @param index (input, index to be closed)
* @return error code
*/
void indexClose(SIndex* index); void indexClose(SIndex* index);
/*
* insert terms into index
* @param index (input, index object)
* @param term (input, terms inserted into index)
* @param uid (input, uid of terms)
* @return error code
*/
int indexPut(SIndex* index, SIndexMultiTerm* terms, uint64_t uid); int indexPut(SIndex* index, SIndexMultiTerm* terms, uint64_t uid);
/*
* delete terms that meet query condition
* @param index (input, index object)
* @param query (input, condition query to deleted)
* @return error code
*/
int indexDelete(SIndex* index, SIndexMultiTermQuery* query); int indexDelete(SIndex* index, SIndexMultiTermQuery* query);
/*
* search index
* @param index (input, index object)
* @param query (input, multi query condition)
* @param result(output, query result)
* @return error code
*/
int indexSearch(SIndex* index, SIndexMultiTermQuery* query, SArray* result); int indexSearch(SIndex* index, SIndexMultiTermQuery* query, SArray* result);
/*
* rebuild index
* @param index (input, index object)
* @parma opt (input, rebuild index opts)
* @return error code
*/
int indexRebuild(SIndex* index, SIndexOpts* opt); int indexRebuild(SIndex* index, SIndexOpts* opt);
/*
* open index
* @param opt (input,index json opt)
* @param path (input, index json path)
* @param index (output, index json object)
* @return error code
*/
int tIndexJsonOpen(SIndexJsonOpts* opts, const char* path, SIndexJson** index);
/*
* close index
* @param index (input, index to be closed)
* @return void
*/
void tIndexJsonClose(SIndexJson* index);
/*
* insert terms into index
* @param index (input, index object)
* @param term (input, terms inserted into index)
* @param uid (input, uid of terms)
* @return error code
*/
int tIndexJsonPut(SIndexJson* index, SIndexJsonMultiTerm* terms, uint64_t uid);
/*
* search index
* @param index (input, index object)
* @param query (input, multi query condition)
* @param result(output, query result)
* @return error code
*/
int tIndexJsonSearch(SIndexJson* index, SIndexJsonMultiTermQuery* query, SArray* result);
/* /*
* @param * @param
* @param * @param
......
include/libs/monitor/monitor.h 0 → 100644
浏览文件 @ 74c2ec8e
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_MONITOR_H_
#define _TD_MONITOR_H_
#include "tarray.h"
#include "tdef.h"
#include "tlog.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MON_STATUS_LEN 8
#define MON_ROLE_LEN 9
#define MON_VER_LEN 12
#define MON_LOG_LEN 1024
typedef struct {
int32_t dnode_id;
char dnode_ep[TSDB_EP_LEN];
int64_t cluster_id;
int32_t protocol;
} SMonBasicInfo;
typedef struct {
int32_t dnode_id;
char dnode_ep[TSDB_EP_LEN];
char status[MON_STATUS_LEN];
} SMonDnodeDesc;
typedef struct {
int32_t mnode_id;
char mnode_ep[TSDB_EP_LEN];
char role[MON_ROLE_LEN];
} SMonMnodeDesc;
typedef struct {
char first_ep[TSDB_EP_LEN];
int32_t first_ep_dnode_id;
char version[MON_VER_LEN];
float master_uptime; // day
int32_t monitor_interval; // sec
int32_t vgroups_total;
int32_t vgroups_alive;
int32_t vnodes_total;
int32_t vnodes_alive;
int32_t connections_total;
SArray *dnodes; // array of SMonDnodeDesc
SArray *mnodes; // array of SMonMnodeDesc
} SMonClusterInfo;
typedef struct {
int32_t dnode_id;
char vnode_role[MON_ROLE_LEN];
} SMonVnodeDesc;
typedef struct {
int32_t vgroup_id;
char database_name[TSDB_DB_NAME_LEN];
int32_t tables_num;
char status[MON_STATUS_LEN];
SMonVnodeDesc vnodes[TSDB_MAX_REPLICA];
} SMonVgroupDesc;
typedef struct {
SArray *vgroups; // array of SMonVgroupDesc
} SMonVgroupInfo;
typedef struct {
int32_t expire_time;
int32_t timeseries_used;
int32_t timeseries_total;
} SMonGrantInfo;
typedef struct {
float uptime; // day
double cpu_engine;
double cpu_system;
float cpu_cores;
int64_t mem_engine; // KB
int64_t mem_system; // KB
int64_t mem_total; // KB
int64_t disk_engine; // Byte
int64_t disk_used; // Byte
int64_t disk_total; // Byte
int64_t net_in; // bytes
int64_t net_out; // bytes
int64_t io_read; // bytes
int64_t io_write; // bytes
int64_t io_read_disk; // bytes
int64_t io_write_disk; // bytes
int64_t req_select;
int64_t req_insert;
int64_t req_insert_success;
int64_t req_insert_batch;
int64_t req_insert_batch_success;
int32_t errors;
int32_t vnodes_num;
int32_t masters;
int8_t has_mnode;
} SMonDnodeInfo;
typedef struct {
char name[TSDB_FILENAME_LEN];
int8_t level;
SDiskSize size;
} SMonDiskDesc;
typedef struct {
SArray *datadirs; // array of SMonDiskDesc
SMonDiskDesc logdir;
SMonDiskDesc tempdir;
} SMonDiskInfo;
typedef struct SMonInfo SMonInfo;
typedef struct {
const char *server;
uint16_t port;
int32_t maxLogs;
bool comp;
} SMonCfg;
int32_t monInit(const SMonCfg *pCfg);
void monCleanup();
void monRecordLog(int64_t ts, ELogLevel level, const char *content);
SMonInfo *monCreateMonitorInfo();
void monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo);
void monSetClusterInfo(SMonInfo *pMonitor, SMonClusterInfo *pInfo);
void monSetVgroupInfo(SMonInfo *pMonitor, SMonVgroupInfo *pInfo);
void monSetGrantInfo(SMonInfo *pMonitor, SMonGrantInfo *pInfo);
void monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo);
void monSetDiskInfo(SMonInfo *pMonitor, SMonDiskInfo *pInfo);
void monSendReport(SMonInfo *pMonitor);
void monCleanupMonitorInfo(SMonInfo *pMonitor);
#ifdef __cplusplus
}
#endif
#endif /*_TD_MONITOR_H_*/
include/libs/nodes/cmdnodes.h 0 → 100644
浏览文件 @ 74c2ec8e
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_CMD_NODES_H_
#define _TD_CMD_NODES_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "querynodes.h"
typedef struct SDatabaseOptions {
ENodeType type;
int32_t numOfBlocks;
int32_t cacheBlockSize;
int8_t cachelast;
int32_t compressionLevel;
int32_t daysPerFile;
int32_t fsyncPeriod;
int32_t maxRowsPerBlock;
int32_t minRowsPerBlock;
int32_t keep;
int32_t precision;
int32_t quorum;
int32_t replica;
int32_t ttl;
int32_t walLevel;
int32_t numOfVgroups;
int8_t singleStable;
int8_t streamMode;
} SDatabaseOptions;
typedef struct SCreateDatabaseStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
bool ignoreExists;
SDatabaseOptions* pOptions;
} SCreateDatabaseStmt;
typedef struct SUseDatabaseStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
} SUseDatabaseStmt;
typedef struct SDropDatabaseStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
bool ignoreNotExists;
} SDropDatabaseStmt;
typedef struct SAlterDatabaseStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
SDatabaseOptions* pOptions;
} SAlterDatabaseStmt;
typedef struct STableOptions {
ENodeType type;
int32_t keep;
int32_t ttl;
char comments[TSDB_STB_COMMENT_LEN];
SNodeList* pSma;
} STableOptions;
typedef struct SColumnDefNode {
ENodeType type;
char colName[TSDB_COL_NAME_LEN];
SDataType dataType;
char comments[TSDB_STB_COMMENT_LEN];
} SColumnDefNode;
typedef struct SCreateTableStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
bool ignoreExists;
SNodeList* pCols;
SNodeList* pTags;
STableOptions* pOptions;
} SCreateTableStmt;
typedef struct SCreateSubTableClause {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
char useDbName[TSDB_DB_NAME_LEN];
char useTableName[TSDB_TABLE_NAME_LEN];
bool ignoreExists;
SNodeList* pSpecificTags;
SNodeList* pValsOfTags;
} SCreateSubTableClause;
typedef struct SCreateMultiTableStmt {
ENodeType type;
SNodeList* pSubTables;
} SCreateMultiTableStmt;
typedef struct SDropTableClause {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
bool ignoreNotExists;
} SDropTableClause;
typedef struct SDropTableStmt {
ENodeType type;
SNodeList* pTables;
} SDropTableStmt;
typedef struct SDropSuperTableStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
bool ignoreNotExists;
} SDropSuperTableStmt;
typedef struct SAlterTableStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
int8_t alterType;
char colName[TSDB_COL_NAME_LEN];
char newColName[TSDB_COL_NAME_LEN];
STableOptions* pOptions;
SDataType dataType;
SValueNode* pVal;
} SAlterTableStmt;
typedef struct SCreateUserStmt {
ENodeType type;
char useName[TSDB_USER_LEN];
char password[TSDB_USET_PASSWORD_LEN];
} SCreateUserStmt;
typedef struct SAlterUserStmt {
ENodeType type;
char useName[TSDB_USER_LEN];
char password[TSDB_USET_PASSWORD_LEN];
int8_t alterType;
} SAlterUserStmt;
typedef struct SDropUserStmt {
ENodeType type;
char useName[TSDB_USER_LEN];
} SDropUserStmt;
typedef struct SCreateDnodeStmt {
ENodeType type;
char fqdn[TSDB_FQDN_LEN];
int32_t port;
} SCreateDnodeStmt;
typedef struct SDropDnodeStmt {
ENodeType type;
int32_t dnodeId;
char fqdn[TSDB_FQDN_LEN];
int32_t port;
} SDropDnodeStmt;
typedef struct SAlterDnodeStmt {
ENodeType type;
int32_t dnodeId;
char config[TSDB_DNODE_CONFIG_LEN];
char value[TSDB_DNODE_VALUE_LEN];
} SAlterDnodeStmt;
typedef struct SShowStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
} SShowStmt;
typedef enum EIndexType {
INDEX_TYPE_SMA = 1,
INDEX_TYPE_FULLTEXT
} EIndexType;
typedef struct SIndexOptions {
ENodeType type;
SNodeList* pFuncs;
SNode* pInterval;
SNode* pOffset;
SNode* pSliding;
} SIndexOptions;
typedef struct SCreateIndexStmt {
ENodeType type;
EIndexType indexType;
char indexName[TSDB_INDEX_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
SNodeList* pCols;
SIndexOptions* pOptions;
} SCreateIndexStmt;
typedef struct SDropIndexStmt {
ENodeType type;
char indexName[TSDB_INDEX_NAME_LEN];
char tableName[TSDB_TABLE_NAME_LEN];
} SDropIndexStmt;
typedef struct SCreateQnodeStmt {
ENodeType type;
int32_t dnodeId;
} SCreateQnodeStmt;
typedef struct SDropQnodeStmt {
ENodeType type;
int32_t dnodeId;
} SDropQnodeStmt;
typedef struct SCreateTopicStmt {
ENodeType type;
char topicName[TSDB_TABLE_NAME_LEN];
char subscribeDbName[TSDB_DB_NAME_LEN];
bool ignoreExists;
SNode* pQuery;
} SCreateTopicStmt;
typedef struct SDropTopicStmt {
ENodeType type;
char topicName[TSDB_TABLE_NAME_LEN];
bool ignoreNotExists;
} SDropTopicStmt;
typedef struct SAlterLocalStmt {
ENodeType type;
char config[TSDB_DNODE_CONFIG_LEN];
char value[TSDB_DNODE_VALUE_LEN];
} SAlterLocalStmt;
#ifdef __cplusplus
}
#endif
#endif /*_TD_CMD_NODES_H_*/
include/libs/nodes/nodes.h
浏览文件 @ 74c2ec8e
...@@ -61,22 +61,80 @@ typedef enum ENodeType { ...@@ -61,22 +61,80 @@ typedef enum ENodeType {
QUERY_NODE_INTERVAL_WINDOW, QUERY_NODE_INTERVAL_WINDOW,
QUERY_NODE_NODE_LIST, QUERY_NODE_NODE_LIST,
QUERY_NODE_FILL, QUERY_NODE_FILL,
QUERY_NODE_COLUMN_REF, QUERY_NODE_RAW_EXPR, // Only be used in parser module.
QUERY_NODE_TARGET, QUERY_NODE_TARGET,
QUERY_NODE_DATABLOCK_DESC,
// Only be used in parser module. QUERY_NODE_SLOT_DESC,
QUERY_NODE_RAW_EXPR, QUERY_NODE_COLUMN_DEF,
QUERY_NODE_DOWNSTREAM_SOURCE,
QUERY_NODE_DATABASE_OPTIONS,
QUERY_NODE_TABLE_OPTIONS,
QUERY_NODE_INDEX_OPTIONS,
// Statement nodes are used in parser and planner module. // Statement nodes are used in parser and planner module.
QUERY_NODE_SET_OPERATOR, QUERY_NODE_SET_OPERATOR,
QUERY_NODE_SELECT_STMT, QUERY_NODE_SELECT_STMT,
QUERY_NODE_SHOW_STMT, QUERY_NODE_VNODE_MODIF_STMT,
QUERY_NODE_CREATE_DATABASE_STMT,
QUERY_NODE_DROP_DATABASE_STMT,
QUERY_NODE_ALTER_DATABASE_STMT,
QUERY_NODE_SHOW_DATABASES_STMT, // temp
QUERY_NODE_CREATE_TABLE_STMT,
QUERY_NODE_CREATE_SUBTABLE_CLAUSE,
QUERY_NODE_CREATE_MULTI_TABLE_STMT,
QUERY_NODE_DROP_TABLE_CLAUSE,
QUERY_NODE_DROP_TABLE_STMT,
QUERY_NODE_DROP_SUPER_TABLE_STMT,
QUERY_NODE_ALTER_TABLE_STMT,
QUERY_NODE_SHOW_TABLES_STMT, // temp
QUERY_NODE_SHOW_STABLES_STMT,
QUERY_NODE_CREATE_USER_STMT,
QUERY_NODE_ALTER_USER_STMT,
QUERY_NODE_DROP_USER_STMT,
QUERY_NODE_SHOW_USERS_STMT,
QUERY_NODE_USE_DATABASE_STMT,
QUERY_NODE_CREATE_DNODE_STMT,
QUERY_NODE_DROP_DNODE_STMT,
QUERY_NODE_ALTER_DNODE_STMT,
QUERY_NODE_SHOW_DNODES_STMT,
QUERY_NODE_SHOW_VGROUPS_STMT,
QUERY_NODE_SHOW_MNODES_STMT,
QUERY_NODE_SHOW_QNODES_STMT,
QUERY_NODE_CREATE_INDEX_STMT,
QUERY_NODE_DROP_INDEX_STMT,
QUERY_NODE_CREATE_QNODE_STMT,
QUERY_NODE_DROP_QNODE_STMT,
QUERY_NODE_CREATE_TOPIC_STMT,
QUERY_NODE_DROP_TOPIC_STMT,
QUERY_NODE_ALTER_LOCAL_STMT,
// logic plan node
QUERY_NODE_LOGIC_PLAN_SCAN, QUERY_NODE_LOGIC_PLAN_SCAN,
QUERY_NODE_LOGIC_PLAN_JOIN, QUERY_NODE_LOGIC_PLAN_JOIN,
QUERY_NODE_LOGIC_PLAN_FILTER,
QUERY_NODE_LOGIC_PLAN_AGG, QUERY_NODE_LOGIC_PLAN_AGG,
QUERY_NODE_LOGIC_PLAN_PROJECT QUERY_NODE_LOGIC_PLAN_PROJECT,
QUERY_NODE_LOGIC_PLAN_VNODE_MODIF,
QUERY_NODE_LOGIC_PLAN_EXCHANGE,
QUERY_NODE_LOGIC_PLAN_WINDOW,
QUERY_NODE_LOGIC_SUBPLAN,
QUERY_NODE_LOGIC_PLAN,
// physical plan node
QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN,
QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN,
QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN,
QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN,
QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN,
QUERY_NODE_PHYSICAL_PLAN_PROJECT,
QUERY_NODE_PHYSICAL_PLAN_JOIN,
QUERY_NODE_PHYSICAL_PLAN_AGG,
QUERY_NODE_PHYSICAL_PLAN_EXCHANGE,
QUERY_NODE_PHYSICAL_PLAN_SORT,
QUERY_NODE_PHYSICAL_PLAN_INTERVAL,
QUERY_NODE_PHYSICAL_PLAN_DISPATCH,
QUERY_NODE_PHYSICAL_PLAN_INSERT,
QUERY_NODE_PHYSICAL_SUBPLAN,
QUERY_NODE_PHYSICAL_PLAN
} ENodeType; } ENodeType;
/** /**
...@@ -99,15 +157,21 @@ typedef struct SNodeList { ...@@ -99,15 +157,21 @@ typedef struct SNodeList {
SListCell* pTail; SListCell* pTail;
} SNodeList; } SNodeList;
SNode* nodesMakeNode(ENodeType type); #define SNodeptr void*
void nodesDestroyNode(SNode* pNode);
SNodeptr nodesMakeNode(ENodeType type);
void nodesDestroyNode(SNodeptr pNode);
SNodeList* nodesMakeList(); SNodeList* nodesMakeList();
int32_t nodesListAppend(SNodeList* pList, SNode* pNode); int32_t nodesListAppend(SNodeList* pList, SNodeptr pNode);
int32_t nodesListStrictAppend(SNodeList* pList, SNodeptr pNode);
int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc); int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc);
int32_t nodesListStrictAppendList(SNodeList* pTarget, SNodeList* pSrc);
SListCell* nodesListErase(SNodeList* pList, SListCell* pCell); SListCell* nodesListErase(SNodeList* pList, SListCell* pCell);
SNode* nodesListGetNode(SNodeList* pList, int32_t index); SNodeptr nodesListGetNode(SNodeList* pList, int32_t index);
void nodesDestroyList(SNodeList* pList); void nodesDestroyList(SNodeList* pList);
// Only clear the linked list structure, without releasing the elements inside
void nodesClearList(SNodeList* pList);
typedef enum EDealRes { typedef enum EDealRes {
DEAL_RES_CONTINUE = 1, DEAL_RES_CONTINUE = 1,
...@@ -116,9 +180,9 @@ typedef enum EDealRes { ...@@ -116,9 +180,9 @@ typedef enum EDealRes {
} EDealRes; } EDealRes;
typedef EDealRes (*FNodeWalker)(SNode* pNode, void* pContext); typedef EDealRes (*FNodeWalker)(SNode* pNode, void* pContext);
void nodesWalkNode(SNode* pNode, FNodeWalker walker, void* pContext); void nodesWalkNode(SNodeptr pNode, FNodeWalker walker, void* pContext);
void nodesWalkList(SNodeList* pList, FNodeWalker walker, void* pContext); void nodesWalkList(SNodeList* pList, FNodeWalker walker, void* pContext);
void nodesWalkNodePostOrder(SNode* pNode, FNodeWalker walker, void* pContext); void nodesWalkNodePostOrder(SNodeptr pNode, FNodeWalker walker, void* pContext);
void nodesWalkListPostOrder(SNodeList* pList, FNodeWalker walker, void* pContext); void nodesWalkListPostOrder(SNodeList* pList, FNodeWalker walker, void* pContext);
typedef EDealRes (*FNodeRewriter)(SNode** pNode, void* pContext); typedef EDealRes (*FNodeRewriter)(SNode** pNode, void* pContext);
...@@ -127,14 +191,18 @@ void nodesRewriteList(SNodeList* pList, FNodeRewriter rewriter, void* pContext); ...@@ -127,14 +191,18 @@ void nodesRewriteList(SNodeList* pList, FNodeRewriter rewriter, void* pContext);
void nodesRewriteNodePostOrder(SNode** pNode, FNodeRewriter rewriter, void* pContext); void nodesRewriteNodePostOrder(SNode** pNode, FNodeRewriter rewriter, void* pContext);
void nodesRewriteListPostOrder(SNodeList* pList, FNodeRewriter rewriter, void* pContext); void nodesRewriteListPostOrder(SNodeList* pList, FNodeRewriter rewriter, void* pContext);
bool nodesEqualNode(const SNode* a, const SNode* b); bool nodesEqualNode(const SNodeptr a, const SNodeptr b);
SNode* nodesCloneNode(const SNode* pNode); SNodeptr nodesCloneNode(const SNodeptr pNode);
SNodeList* nodesCloneList(const SNodeList* pList); SNodeList* nodesCloneList(const SNodeList* pList);
int32_t nodesNodeToString(const SNode* pNode, bool format, char** pStr, int32_t* pLen); const char* nodesNodeName(ENodeType type);
int32_t nodesNodeToString(const SNodeptr pNode, bool format, char** pStr, int32_t* pLen);
int32_t nodesStringToNode(const char* pStr, SNode** pNode); int32_t nodesStringToNode(const char* pStr, SNode** pNode);
int32_t nodesListToString(const SNodeList* pList, bool format, char** pStr, int32_t* pLen);
int32_t nodesStringToList(const char* pStr, SNodeList** pList);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
include/libs/nodes/plannodes.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/nodes/querynodes.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/parser/parsenodes.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/libs/parser/parser.h
浏览文件 @ 74c2ec8e
...@@ -20,79 +20,44 @@ ...@@ -20,79 +20,44 @@
extern "C" { extern "C" {
#endif #endif
#include "parsenodes.h" #include "querynodes.h"
typedef struct SParseContext { typedef struct SParseContext {
uint64_t requestId; uint64_t requestId;
int32_t acctId; int32_t acctId;
const char *db; const char *db;
bool streamQuery;
void *pTransporter; void *pTransporter;
SEpSet mgmtEpSet; SEpSet mgmtEpSet;
const char *pSql; // sql string const char *pSql; // sql string
size_t sqlLen; // length of the sql string size_t sqlLen; // length of the sql string
char *pMsg; // extended error message if exists to help identifying the problem in sql statement. char *pMsg; // extended error message if exists to help identifying the problem in sql statement.
int32_t msgLen; // max length of the msg int32_t msgLen; // max length of the msg
struct SCatalog *pCatalog; struct SCatalog *pCatalog;
} SParseContext; } SParseContext;
/** typedef struct SCmdMsgInfo {
* Parse the sql statement and then return the SQueryStmtInfo as the result of bounded AST. int16_t msgType;
* @param pSql sql string SEpSet epSet;
* @param length length of the sql string void* pMsg;
* @param id operator id, generated by uuid generator int32_t msgLen;
* @param msg extended error message if exists. void* pExtension; // todo remove it soon
* @return error code } SCmdMsgInfo;
*/
int32_t qParseQuerySql(SParseContext* pContext, SQueryNode** pQueryNode); typedef struct SQuery {
bool directRpc;
/** bool haveResultSet;
* Return true if it is a ddl/dcl sql statement SNode* pRoot;
* @param pQuery int32_t numOfResCols;
* @return SSchema* pResSchema;
*/ SCmdMsgInfo* pCmdMsg;
bool qIsDdlQuery(const SQueryNode* pQueryNode); int32_t msgType;
bool streamQuery;
/** } SQuery;
* Destroy logic query plan
* @param pQueryNode int32_t qParseQuerySql(SParseContext* pCxt, SQuery** pQuery);
*/
void qDestroyQuery(SQueryNode* pQueryNode); void qDestroyQuery(SQuery* pQueryNode);
/**
* Convert a normal sql statement to only query tags information to enable that the subscribe client can be aware quickly of the true vgroup ids that
* involved in the subscribe procedure.
* @param pSql
* @param length
* @param pConvertSql
* @return
*/
int32_t qParserConvertSql(const char* pStr, size_t length, char** pConvertSql);
void assignExprInfo(SExprInfo* dst, const SExprInfo* src);
void columnListCopy(SArray* dst, const SArray* src, uint64_t uid);
void columnListDestroy(SArray* pColumnList);
void dropAllExprInfo(SArray** pExprInfo, int32_t numOfLevel);
void dropOneLevelExprInfo(SArray* pExprInfo);
typedef struct SSourceParam {
SArray *pExprNodeList; //Array<struct tExprNode*>
SArray *pColumnList; //Array<struct SColumn>
int32_t num;
} SSourceParam;
SExprInfo* createExprInfo(STableMetaInfo* pTableMetaInfo, const char* funcName, SSourceParam* pSource, SSchema* pResSchema, int16_t interSize);
int32_t copyExprInfoList(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy);
int32_t copyAllExprInfo(SArray* dst, const SArray* src, bool deepcopy);
int32_t getExprFunctionLevel(const SQueryStmtInfo* pQueryInfo);
STableMetaInfo* getMetaInfo(const SQueryStmtInfo* pQueryInfo, int32_t tableIndex);
SSchema *getOneColumnSchema(const STableMeta* pTableMeta, int32_t colIndex);
int32_t getNewResColId();
void addIntoSourceParam(SSourceParam* pSourceParam, tExprNode* pNode, SColumn* pColumn);
SExprInfo* createBinaryExprInfo(struct tExprNode* pNode, SSchema* pResSchema);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/libs/planner/planner.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/planner/plannerOp.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/libs/qcom/query.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/qworker/qworker.h
浏览文件 @ 74c2ec8e
...@@ -72,6 +72,8 @@ int32_t qWorkerProcessCancelMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg); ...@@ -72,6 +72,8 @@ int32_t qWorkerProcessCancelMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg);
int32_t qWorkerProcessDropMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg); int32_t qWorkerProcessDropMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg);
int32_t qWorkerProcessHbMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg);
int32_t qWorkerProcessShowMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg); int32_t qWorkerProcessShowMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg);
int32_t qWorkerProcessShowFetchMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg); int32_t qWorkerProcessShowFetchMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg);
......
include/libs/scalar/filter.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/scalar/scalar.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/scheduler/scheduler.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/sync/sync.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/tfs/tfs.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/transport/thttp.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/transport/trpc.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/libs/wal/wal.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/os.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osDef.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osDir.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osEnv.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osEok.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osFile.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osRand.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osSemaphore.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osSleep.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osSocket.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osString.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osSysinfo.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osSystem.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osThread.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osTime.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/os/osTimer.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/exception.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/util/talgo.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/taoserror.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tarray.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tbuffer.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tcache.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tchecksum.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tcoding.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tcompression.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tconfig.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tcrc32c.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tdef.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/texception.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tfile.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/util/tfunctional.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/thash.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/theap.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tidpool.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tjson.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tkey.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/util/tlist.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tlockfree.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tlog.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tlosertree.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tmd5.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tmempool.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tpagedbuf.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tqueue.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tref.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tsched.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tskiplist.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tstep.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
include/util/tstrbuild.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tthread.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/ttimer.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tutil.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tuuid.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tversion.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/tworker.h
浏览文件 @ 74c2ec8e
此差异已折叠。
include/util/types.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/inc/clientInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/inc/clientLog.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/src/clientEnv.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/src/clientHb.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/src/clientImpl.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/src/clientMain.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/src/tmq.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/test/clientTests.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/client/test/tmqTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tcompare.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/common/src/tdataformat.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tglobal.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tmsg.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tmsgtype.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tname.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/trow.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/ttime.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/ttszip.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/ttypes.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/src/tvariant.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/test/commonTests.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/common/test/tmsgTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/bnode/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mgmt/daemon/inc/dmnInt.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mgmt/daemon/src/dmnCfg.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mgmt/impl/inc/dndEnv.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mgmt/impl/inc/dndInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mgmt/impl/src/dndEnv.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/inc/mndOffset.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndDef.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndInfoSchema.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndOffset.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndScheduler.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mndStream.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/impl/src/mnode.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/mnode/sdb/inc/sdbInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/qnode/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/qnode/inc/qndInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/qnode/src/qnode.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/snode/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/snode/inc/sndInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/snode/src/snode.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/inc/meta.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/inc/tq.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/inc/tsdb.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/inc/vnode.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/inc/tqInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/inc/tsdbDBDef.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/inc/tsdbFS.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/inc/tsdbSma.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/inc/vnd.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/tq/tq.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/tq/tqPush.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/tq/tqRead.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbBDBImpl.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbSma.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/dnode/vnode/test/tsdbSmaTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/cache/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/catalog/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/catalog/src/catalog.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/inc/executil.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/inc/tsimplehash.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/inc/tsort.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/src/executil.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/src/executor.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/src/tlinearhash.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/src/tsimplehash.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/src/tsort.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/executor/test/sortTests.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/inc/builtins.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/inc/builtinsimpl.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/src/builtins.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/src/builtinsimpl.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/src/texpr.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/src/tfill.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/function/src/tfunction.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/index/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/inc/indexInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/inc/index_cache.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/inc/index_fst.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/inc/index_tfile.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/inc/index_util.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index_cache.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index_comm.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index_fst.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index_tfile.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/src/index_util.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/test/fstTest.cc
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/test/fstUT.cc 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/test/jsonUT.cc 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/index/test/utilUT.cc 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/monitor/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/monitor/inc/monInt.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/monitor/src/monitor.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/monitor/test/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/monitor/test/monTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/nodes/inc/nodesUtil.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/inc/astGenerator.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/inc/astToMsg.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/inc/new_sql.y 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/inc/parserInt.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/inc/parserUtil.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/inc/sql.y
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/src/astCreateContext.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/astCreateFuncs.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/astGenerator.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/astToMsg.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/astValidate.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/dCDAstProcess.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/new_sql.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/parAstCreater.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/src/parAstParser.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/src/parUtil.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/src/parser.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/src/parserUtil.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/queryInfoUtil.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/src/sql.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/parser/test/parserTests.cpp 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/test/plannerTest.cpp 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/parser/test/tokenizerTest.cpp 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/inc/planInt.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/inc/plannerInt.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/inc/plannerUtil.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/src/logicPlan.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/src/physicalPlan.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/src/physicalPlanJson.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/src/planLogicCreater.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/src/planPhysiCreater.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/src/planSpliter.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/src/planner.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/src/plannerImpl.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/src/plannerUtil.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/test/phyPlanTests.cpp 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/planner/test/plannerTestMain.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/planner/test/plannerTests.cpp 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/qcom/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/qcom/src/queryUtil.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/qcom/src/querymsg.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/qcom/test/queryTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/qworker/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/qworker/src/qworker.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/inc/filterInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/inc/sclInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/inc/sclvector.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/src/filter.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/src/scalar.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/src/sclfunc.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/src/sclvector.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/test/filter/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/test/filter/filterTests.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/test/scalar/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scalar/test/scalar/scalarTests.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/scheduler/src/schFlowCtrl.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncCommit.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncElection.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncEnv.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncIndexMgr.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncMessage.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncRaftLog.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncSnapshot.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncTimeout.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncUtil.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/inc/syncVoteMgr.h 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncCommit.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncElection.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncEnv.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncIO.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncIndexMgr.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncMain.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncMessage.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncRaft.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/sync/src/syncRaftLog.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncSnapshot.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncTimeout.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncUtil.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/src/syncVoteMgr.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncAppendEntriesReplyTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncAppendEntriesTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncClientRequestTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncElectTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncEncodeTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncEnqTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncEntryTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncEnvTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIOClientTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIOSendMsgTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIOServerTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIOTickPingTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIOTickQTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIndexMgrTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncIndexTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncInitTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncLogStoreTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncPingReplyTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncPingSelfTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncPingTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncPingTimerTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncPingTimerTest2.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncRaftStoreTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncReplicateTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncRequestVoteReplyTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncRequestVoteTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncRpcMsgTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncTimeoutTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncUtilTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncVotesGrantedTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncVotesRespondTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/sync/test/syncWriteTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tdb/src/db/tdbUtil.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tdb/src/inc/tdbUtil.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tdb/test/tdbTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tfs/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tfs/inc/tfsInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tfs/src/tfs.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/tfs/test/tfsTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/inc/rpcLog.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/inc/rpcUdp.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/src/rpcMain.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/src/rpcTcp.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/src/rpcUdp.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/src/thttp.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/src/trans.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/transport/test/pushClient.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/libs/wal/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/inc/walInt.h
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/src/walMeta.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/src/walMgmt.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/src/walRead.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/src/walSeek.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/libs/wal/src/walWrite.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osDir.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osEnv.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osFile.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osLocale.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osRand.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osSemaphore.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osSleep.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osSocket.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osString.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osStrptime.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osSysinfo.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osSystem.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osTime.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osTimer.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/os/src/osTimezone.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/inc/utilInt.h 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/util/src/exception.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/util/src/talgo.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tarray.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tbase64.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tbuffer.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tcache.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tcompression.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tconfig.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tcrc32c.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tdes.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/terror.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/texception.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tfile.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/util/src/tfunctional.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/thash.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/thashutil.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/theap.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tidpool.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tjson.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tlist.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tlockfree.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tlog.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tlosertree.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tmd5.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tmempool.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tnote.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/util/src/tpagedbuf.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tqueue.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tref.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tsched.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tskiplist.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tstep.c 已删除 100644 → 0
浏览文件 @ 1c0d55b2
此差异已折叠。
source/util/src/tstrbuild.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tthread.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/ttimer.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tutil.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tuuid.c 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tversion.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/tworker.c
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/src/version.c.in
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/CMakeLists.txt
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/arrayTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/cacheTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/cfgTest.cpp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/codingTests.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/encodeTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/freelistTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/hashTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/pageBufferTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/skiplistTest.cpp
浏览文件 @ 74c2ec8e
此差异已折叠。
source/util/test/trefTest.c
浏览文件 @ 74c2ec8e
此差异已折叠。
tests @ 4da4bb00
比较 4da4bb00...4da4bb00
此差异已折叠。
tests/CMakeLists.txt 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/Jenkinsfile 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/mas/Jenkinsfile 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/parallel_test/Jenkinsfile 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/TimeZone/TestCaseTimeZone.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/ZoneTimeTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/account/account_create.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/account/account_del.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alterColMultiTimes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alterTabAddTagWithNULL.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alterTimestampColDataProcess.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_cacheLastRow.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_create_exception.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_debugFlag.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_keep.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_replica.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_stable.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_table.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/alter_table_crash.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/db_update_options.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/alter/file_corrupt.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/bug2265.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/alterDatabase.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/change_time_1_1.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/change_time_1_2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/client.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/noConnectionErrorTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/thousandsofClient.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/twoClients.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/client/version.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/how-to-use 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/insert1Data.json 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/insert2Data.json 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/multClient.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/multQuery.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/TD-3693/queryCount.json 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/bananceTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/basicTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/changeReplicaTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/clusterSetup.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/dataFileRecoveryTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/fullDnodesTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/killAndRestartDnodesTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/offlineThresholdTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/oneReplicaOfflineTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/queryTimeTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/stopAllDnodesTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/stopTwoDnodesTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/syncingTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cluster/testcluster.sh 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/concurrent_inquiry.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/concurrent_inquiry.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/connector/lua.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/cq.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/README.md 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/__init__.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/crash_gen_main.py 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/service_manager.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/shared/config.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/shared/db.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/shared/misc.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/shared/types.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen/valgrind_taos.supp 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/crash_gen_bootstrap.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dbmgmt/createTableAndDropDnodes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dbmgmt/createTableAndKillDnodes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dbmgmt/database-name-boundary.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dbmgmt/dropDB_memory_test.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dbmgmt/nanoSecondCheck.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/Dockerfile 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/basic.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/buildClusterEnv.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/docker-compose.yml 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/insert.json 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/node3.yml 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/dockerCluster/taosdemoWrapper.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/fulltest.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/all_null_value.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_arithmetic.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_avg.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_avg_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_bottom.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_bottom_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_count.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_count_last_stab.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_count_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_derivative.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_diff.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_diff_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_first.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_first_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_interp.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_irate.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_last.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_last_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_last_row.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_last_row_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_leastsquares.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_leastsquares_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_max.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_max_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_min.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_min_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_operations.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_operations_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_percentile.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_percentile2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_percentile_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_spread.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_spread_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_stateWindow.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_stddev.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_stddev_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_stddev_td2555.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_sum.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_sum_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_top.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_top_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_twa.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_twa_restart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/function_twa_test2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/queryTestCases.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/functions/showOfflineThresholdIs864000.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/handle_crash_gen_val_log.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/handle_taosd_val_log.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/handle_val_log.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/hivemq-extension-test.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1H.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1HO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1HPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1S.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1Sub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1T.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1TO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock1TPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2H.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2HO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2HPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2S.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2Sub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2T.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2TO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlock2TPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importBlockbetween.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCSV.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileH.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileHO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileHPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileS.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileSub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileT.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileTO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importCacheFileTPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataH2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataHO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataHO2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataHPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastH.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastHO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastHPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastS.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastSub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastT.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastTO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataLastTPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataS.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataSub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataT.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataTO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importDataTPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHORestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHPORestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHRestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHead.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHeadOverlap.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importHeadPartOverlap.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importInsertThenImport.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastH.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastHO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastHPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastS.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastSub.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastT.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastTO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importLastTPO.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importSRestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importSpan.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importSubRestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTORestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTPORestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTRestart.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTail.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTailOverlap.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importTailPartOverlap.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/importToCommit.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/import_update_0.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/import_update_1.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/import_merge/import_update_2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/alterTableAndInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/basic.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/basic_unsigned.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/before_1970.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/bigint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/binary-boundary.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/binary.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/bool.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/boundary2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/bug3654.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/date.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/double.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/float.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/flushwhiledrop.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/in_function.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertDemo.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertDynamicColBeforeVal.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertFromCSV.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertFromCSVPerformance.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertIntoTwoTables.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertJSONPayload.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insertTelnetLines.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insert_before_use_db.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/insert_locking.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/int.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/line_insert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/metadataUpdate.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/modify_column.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/multi.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/nchar-boundary.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/nchar-unicode.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/nchar.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/ningsiInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/openTsdbTelnetLinesInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/randomNullCommit.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/restful.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/restfulInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/retentionpolicy.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/schemalessInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/smallint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/sparseData.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/special_character_show.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/tagSepcified.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/tinyint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/unsignedBigint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/unsignedInt.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/unsignedSmallint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/unsignedTinyint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/insert/writeDBNonStop.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/TD-5114/continueCreateDn.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/TD-5114/rollingUpgrade.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/cal_unavaliable_time_kill.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/cal_unavaliable_time_stop.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/manual_alter_block.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/manual_alter_comp.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/manual_change_time_2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/manualTest/manual_change_time_3.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/basic.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/dirNotExist.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/dirPermissionDenied.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/fileDistributionSameLevel.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/illegelLevelMountPoint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/middleLevelMissing.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/moreThan16disks.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/multiMainMountPoint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/noneMainMountPoint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/retentionTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/threeLevelMountPoint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/multilevel/wrongLevelMountPoint.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perf_gen.py 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perf_gen.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perfbenchmark/bug3433.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perfbenchmark/bug3589.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perfbenchmark/joinPerformance.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/perfbenchmark/taosdemoInsert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug1471.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug1874.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug1875.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug1876.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2117.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2118.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2119.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2143.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2218.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug2281.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug3351.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/bug3375.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/computeErrorinWhere.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/dataLossTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/distinctOneColTb.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filter.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterAllIntTypes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterAllUnsignedIntTypes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterCombo.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterFloatAndDouble.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterNoKeyword.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterOtherTypes.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/filterWithinMultiNchar.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/floatCompare.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/in.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/intervalOffset.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/isNullTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/kill_query.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/last_cache.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/last_row_cache.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/long_where_query.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/natualInterval.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestedQuery/insertData.json 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestedQuery/nestedQueryJson.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestedQuery/queryInterval.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestedQuery/queryWithOrderLimit.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestedQuery/queryWithSpread.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/nestquery_last_row.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/operator_cost.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/query.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/query1970YearsAf.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryBetweenAnd.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryCnameDisplay.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryConnection.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryCountCSVData.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryDiffColsOr.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryError.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryFillTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryFilterTswithDateUnit.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryGroupbySort.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryGroupbyWithInterval.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryInsertValue.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryInterval.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryJoin.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryJoin10tables.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryLike.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryMetaData.py 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryMetaPerformace.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryNormal.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryNullValueTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryPerformance.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/querySecondtscolumnTowherenow.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/querySession.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/querySort.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryStableJoin.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryStateWindow.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryStddevWithGroupby.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryTbnameUpperLower.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryTscomputWithNow.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryTsisNull.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryWildcardLength.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/queryWithTaosdKilled.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/query_performance.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/removeDBAndSTable.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/select_last_crash.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/sliding.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/subqueryFilter.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/tbname.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/query/unionAllTest.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/queryCount.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/random-test/random-test-multi-threading.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/random-test/random-test.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/regressiontest.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/restful/restful_bind_db1.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/restful/restful_bind_db2.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/simpletest_no_sudo.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/smoketest.sh 0 → 100755
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stable/insert.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stable/query_after_reset.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/cqSupportBefore1970.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/history.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/metric_1.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/metric_n.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/new.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/parser.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
tests/pytest/stream/showStreamExecTimeisNull.py 0 → 100644
浏览文件 @ 74c2ec8e
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或