Skip to content

TDengine
TDengine

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

通知 1192
Star 22018
Fork 4786
TDengine
TDengine
未验证 提交 2393e536 编写于 作者: wmmhello's avatar wmmhello 提交者： GitHub
浏览文件
操作

Merge pull request #12642 from taosdata/3.0 

3.0
上级 1fe2abc8 029ba39b
展开全部 隐藏空白更改
内联 并排
Showing with 114648 addition and 52991 deletion
.devcontainer/Dockerfile
浏览文件 @ 2393e536
...@@ -7,4 +7,4 @@ FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT} ...@@ -7,4 +7,4 @@ FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}
# [Optional] Uncomment this section to install additional packages. # [Optional] Uncomment this section to install additional packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here> # && apt-get -y install --no-install-recommends <your-package-list-here>
RUN apt-get update && apt-get -y install tree vim tmux RUN apt-get update && apt-get -y install tree vim tmux python3-pip
.gitignore
浏览文件 @ 2393e536
...@@ -40,6 +40,7 @@ taosdalipu/ ...@@ -40,6 +40,7 @@ taosdalipu/
Target/ Target/
*.failed *.failed
*.sql *.sql
sim
sim/ sim/
psim/ psim/
pysim/ pysim/
...@@ -107,3 +108,4 @@ TAGS ...@@ -107,3 +108,4 @@ TAGS
contrib/* contrib/*
!contrib/CMakeLists.txt !contrib/CMakeLists.txt
!contrib/test !contrib/test
sql
\ No newline at end of file
CMakeLists.txt
浏览文件 @ 2393e536
...@@ -7,7 +7,7 @@ project( ...@@ -7,7 +7,7 @@ project(
) )
if (NOT DEFINED TD_SOURCE_DIR) if (NOT DEFINED TD_SOURCE_DIR)
set( TD_SOURCE_DIR ${CMAKE_SOURCE_DIR} ) set( TD_SOURCE_DIR ${PROJECT_SOURCE_DIR} )
endif() endif()
set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake") set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake")
......
Jenkinsfile
浏览文件 @ 2393e536
...@@ -113,7 +113,7 @@ pipeline { ...@@ -113,7 +113,7 @@ pipeline {
''' '''
sh''' sh'''
cd ${WKC}/debug cd ${WKC}/debug
ctest ctest -VV
''' '''
} }
} }
......
Jenkinsfile2
浏览文件 @ 2393e536
...@@ -8,123 +8,255 @@ def skipbuild=0 ...@@ -8,123 +8,255 @@ def skipbuild=0
def win_stop=0 def win_stop=0
def abortPreviousBuilds() { def abortPreviousBuilds() {
def currentJobName = env.JOB_NAME def currentJobName = env.JOB_NAME
def currentBuildNumber = env.BUILD_NUMBER.toInteger() def currentBuildNumber = env.BUILD_NUMBER.toInteger()
def jobs = Jenkins.instance.getItemByFullName(currentJobName) def jobs = Jenkins.instance.getItemByFullName(currentJobName)
def builds = jobs.getBuilds() def builds = jobs.getBuilds()
for (build in builds) { for (build in builds) {
if (!build.isBuilding()) { if (!build.isBuilding()) {
continue; continue;
} }
if (currentBuildNumber == build.getNumber().toInteger()) { if (currentBuildNumber == build.getNumber().toInteger()) {
continue; continue;
} }
build.doKill() //doTerm(),doKill(),doTerm() build.doKill() //doTerm(),doKill(),doTerm()
} }
} }
// abort previous build // abort previous build
abortPreviousBuilds() abortPreviousBuilds()
def abort_previous(){ def abort_previous(){
def buildNumber = env.BUILD_NUMBER as int def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) milestone(buildNumber - 1) if (buildNumber > 1) milestone(buildNumber - 1)
milestone(buildNumber) milestone(buildNumber)
} }
def pre_test(){ def pre_test(){
sh'hostname'
sh ''' sh '''
date hostname
sudo rmtaos || echo "taosd has not installed" date
''' '''
sh ''' sh '''
killall -9 taosd ||echo "no taosd running" cd ${WK}
killall -9 gdb || echo "no gdb running" git reset --hard
killall -9 python3.8 || echo "no python program running" git fetch || git fetch
cd ${WKC} cd ${WKC}
git reset --hard
git fetch || git fetch
''' '''
script { script {
if (env.CHANGE_TARGET == 'master') { if (env.CHANGE_TARGET == 'master') {
sh ''' sh '''
cd ${WKC} cd ${WK}
git checkout master git checkout master
''' cd ${WKC}
git checkout master
'''
} else if(env.CHANGE_TARGET == '2.0') {
sh '''
cd ${WK}
git checkout 2.0
cd ${WKC}
git checkout 2.0
'''
} else if(env.CHANGE_TARGET == '3.0') {
sh '''
cd ${WK}
git checkout 3.0
cd ${WKC}
git checkout 3.0
'''
} else {
sh '''
cd ${WK}
git checkout develop
cd ${WKC}
git checkout develop
'''
} }
else if(env.CHANGE_TARGET == '2.0'){ }
if (env.CHANGE_URL =~ /\/TDengine\//) {
sh ''' sh '''
cd ${WKC} cd ${WKC}
git checkout 2.0 git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git log -5
cd ${WK}
git pull >/dev/null
git log -5
''' '''
} } else if (env.CHANGE_URL =~ /\/TDinternal\//) {
else if(env.CHANGE_TARGET == '3.0'){
sh ''' sh '''
cd ${WKC} cd ${WK}
git checkout 3.0 git pull >/dev/null
[ -d contrib/bdb ] && cd contrib/bdb && git clean -fxd && cd ../.. git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git log -5
cd ${WKC}
git pull >/dev/null
git log -5
''' '''
} } else {
else{
sh ''' sh '''
cd ${WKC} echo "unmatched reposiotry ${CHANGE_URL}"
git checkout develop
''' '''
}
} }
sh''' sh '''
cd ${WKC} cd ${WKC}
git pull >/dev/null git submodule update --init --recursive
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git submodule update --init --recursive
''' '''
sh''' sh '''
cd ${WKC} cd ${WKPY}
export TZ=Asia/Harbin git reset --hard
date git pull
rm -rf debug '''
mkdir debug return 1
cd debug }
cmake .. > /dev/null def pre_test_win(){
make -j4> /dev/null bat '''
hostname
date /t
time /t
taskkill /f /t /im python.exe
taskkill /f /t /im bash.exe
rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug
exit 0
'''
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git reset --hard
git fetch || git fetch
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git reset --hard
git fetch || git fetch
git checkout -f
'''
script {
if (env.CHANGE_TARGET == 'master') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git checkout master
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git checkout master
'''
} else if(env.CHANGE_TARGET == '2.0') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git checkout 2.0
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git checkout 2.0
'''
} else if(env.CHANGE_TARGET == '3.0') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git checkout 3.0
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git checkout 3.0
'''
} else {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git checkout develop
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git checkout develop
'''
}
}
script {
if (env.CHANGE_URL =~ /\/TDengine\//) {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git pull
git log -5
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git pull
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git log -5
'''
} else if (env.CHANGE_URL =~ /\/TDinternal\//) {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
git pull
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git log -5
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git pull
git log -5
'''
} else {
sh '''
echo "unmatched reposiotry ${CHANGE_URL}"
'''
}
}
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
git submodule update --init --recursive
'''
}
def pre_test_build_win() {
bat '''
echo "building ..."
time /t
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
mkdir debug
cd debug
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
set CL=/MP8
cmake .. -G "NMake Makefiles JOM"
jom -j 4 || exit 8
time /t
''' '''
return 1 return 1
} }
pipeline { pipeline {
agent none agent none
options { skipDefaultCheckout() } options { skipDefaultCheckout() }
environment{ environment{
WK = '/var/lib/jenkins/workspace/TDinternal' WKDIR = '/var/lib/jenkins/workspace'
WKC= '/var/lib/jenkins/workspace/TDengine' WK = '/var/lib/jenkins/workspace/TDinternal'
} WKC = '/var/lib/jenkins/workspace/TDinternal/community'
stages { WKPY = '/var/lib/jenkins/workspace/taos-connector-python'
stage('pre_build'){ }
agent{label " slave3_0 || slave15 || slave16 || slave17 "} stages {
options { skipDefaultCheckout() } stage('run test') {
when { parallel {
changeRequest() stage('linux test') {
} agent{label " slave3_0 || slave15 || slave16 || slave17 "}
steps { options { skipDefaultCheckout() }
script{ when {
abort_previous() changeRequest()
abortPreviousBuilds() }
} steps {
timeout(time: 45, unit: 'MINUTES'){ timeout(time: 40, unit: 'MINUTES'){
pre_test() pre_test()
sh''' script {
cd ${WKC}/tests sh '''
./test-all.sh b1fq cd ${WKC}/tests/parallel_test
''' date
sh''' time ./container_build.sh -w ${WKDIR} -t 8 -e
cd ${WKC}/debug rm -f /tmp/cases.task
ctest ./collect_cases.sh -e
''' '''
sh '''
cd ${WKC}/tests/parallel_test
export DEFAULT_RETRY_TIME=2
date
timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log -o 480
'''
}
}
}
}
} }
} }
} }
} post {
post {
success { success {
emailext ( emailext (
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS", subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS",
......
cmake/addr2line_CMakeLists.txt.in 0 → 100644
浏览文件 @ 2393e536
# addr2line
ExternalProject_Add(addr2line
GIT_REPOSITORY https://github.com/davea42/libdwarf-addr2line.git
GIT_TAG master
SOURCE_DIR "${TD_CONTRIB_DIR}/addr2line"
BINARY_DIR "${TD_CONTRIB_DIR}/addr2line"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
cmake/cmake.define
浏览文件 @ 2393e536
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
set(CMAKE_VERBOSE_MAKEFILE OFF)
SET(BUILD_SHARED_LIBS "OFF")
#set output directory #set output directory
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
...@@ -42,28 +46,44 @@ ENDIF () ...@@ -42,28 +46,44 @@ ENDIF ()
IF (TD_WINDOWS) IF (TD_WINDOWS)
MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}") MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE) SET(COMMON_FLAGS "/W3 /D_WIN32")
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-") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
# IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
# SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
# ENDIF ()
IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900)) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
ENDIF ()
ELSE () ELSE ()
IF (${COVER} MATCHES "true")
MESSAGE(STATUS "Test coverage mode, add extra flags")
SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
SET(GCC_COVERAGE_LINK_FLAGS "-lgcov --coverage")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
ENDIF ()
IF (${SANITIZER} MATCHES "true") IF (${SANITIZER} MATCHES "true")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -g3")
MESSAGE(STATUS "Will compile with Address Sanitizer!") MESSAGE(STATUS "Will compile with Address Sanitizer!")
ELSE () ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3")
ENDIF () ENDIF ()
MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}") MESSAGE("System processor ID: ${CMAKE_SYSTEM_PROCESSOR}")
IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
ADD_DEFINITIONS("-D_TD_ARM_") ADD_DEFINITIONS("-D_TD_ARM_")
ELSE () ELSE ()
ADD_DEFINITIONS("-msse4.2 -mfma") ADD_DEFINITIONS("-msse4.2")
IF("${FMA_SUPPORT}" MATCHES "true")
MESSAGE(STATUS "turn fma function support on")
ADD_DEFINITIONS("-mfma")
ELSE ()
MESSAGE(STATUS "turn fma function support off")
ENDIF()
ENDIF () ENDIF ()
ENDIF () ENDIF ()
cmake/cmake.install
浏览文件 @ 2393e536
IF (TD_LINUX) IF (TD_LINUX)
SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/make_install.sh") SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.sh")
INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")") INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})") INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})")
ELSEIF (TD_WINDOWS) ELSEIF (TD_WINDOWS)
......
cmake/cmake.options
浏览文件 @ 2393e536
...@@ -25,9 +25,34 @@ IF(${TD_WINDOWS}) ...@@ -25,9 +25,34 @@ IF(${TD_WINDOWS})
ON ON
) )
MESSAGE("build msvcregex Win32")
option(
BUILD_MSVCREGEX
"If build msvcregex on Windows"
ON
)
MESSAGE("build wcwidth Win32")
option(
BUILD_WCWIDTH
"If build wcwidth on Windows"
ON
)
MESSAGE("build wingetopt Win32")
option(
BUILD_WINGETOPT
"If build wingetopt on Windows"
ON
)
ENDIF () ENDIF ()
IF(${TD_LINUX} MATCHES TRUE) option(
BUILD_ADDR2LINE
"If build addr2line"
OFF
)
option( option(
BUILD_TEST BUILD_TEST
...@@ -35,8 +60,6 @@ option( ...@@ -35,8 +60,6 @@ option(
ON ON
) )
ENDIF ()
option( option(
BUILD_WITH_LEVELDB BUILD_WITH_LEVELDB
"If build with leveldb" "If build with leveldb"
...@@ -55,6 +78,12 @@ option( ...@@ -55,6 +78,12 @@ option(
OFF OFF
) )
option(
BUILD_WITH_BDB
"If build with BDB"
OFF
)
option( option(
BUILD_WITH_LUCENE BUILD_WITH_LUCENE
"If build with lucene" "If build with lucene"
......
cmake/libdwarf_CMakeLists.txt.in 0 → 100644
浏览文件 @ 2393e536
# libdwarf
ExternalProject_Add(libdwarf
GIT_REPOSITORY https://github.com/davea42/libdwarf-code.git
GIT_TAG libdwarf-0.3.1
SOURCE_DIR "${TD_CONTRIB_DIR}/libdwarf"
BINARY_DIR "${TD_CONTRIB_DIR}/libdwarf"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
cmake/msvcregex_CMakeLists.txt.in 0 → 100644
浏览文件 @ 2393e536
# msvcregex
ExternalProject_Add(msvcregex
GIT_REPOSITORY https://gitee.com/l0km/libgnurx-msvc.git
GIT_TAG master
SOURCE_DIR "${TD_CONTRIB_DIR}/msvcregex"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
\ No newline at end of file
cmake/pthread_CMakeLists.txt.in
浏览文件 @ 2393e536
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
ExternalProject_Add(pthread ExternalProject_Add(pthread
GIT_REPOSITORY https://github.com/GerHobbelt/pthread-win32 GIT_REPOSITORY https://github.com/GerHobbelt/pthread-win32
GIT_TAG v3.0.3.1 GIT_TAG v3.0.3.1
SOURCE_DIR "${TD_CONTRIB_DIR}/pthread-win32" SOURCE_DIR "${TD_CONTRIB_DIR}/pthread"
BINARY_DIR "" BINARY_DIR ""
#BUILD_IN_SOURCE TRUE #BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
......
cmake/wcwidth_CMakeLists.txt.in 0 → 100644
浏览文件 @ 2393e536
# wcwidth
ExternalProject_Add(wcwidth
GIT_REPOSITORY https://github.com/fumiyas/wcwidth-cjk.git
GIT_TAG master
SOURCE_DIR "${TD_CONTRIB_DIR}/wcwidth"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
\ No newline at end of file
cmake/wingetopt_CMakeLists.txt.in 0 → 100644
浏览文件 @ 2393e536
# wingetopt
ExternalProject_Add(wingetopt
GIT_REPOSITORY https://github.com/alex85k/wingetopt.git
GIT_TAG master
SOURCE_DIR "${TD_CONTRIB_DIR}/wingetopt"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
\ No newline at end of file
contrib/CMakeLists.txt
浏览文件 @ 2393e536
...@@ -14,9 +14,24 @@ if(${BUILD_PTHREAD}) ...@@ -14,9 +14,24 @@ if(${BUILD_PTHREAD})
cat("${TD_SUPPORT_DIR}/pthread_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/pthread_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif() endif()
# gnu regex # iconv
if(${BUILD_GNUREGEX}) if(${BUILD_WITH_ICONV})
cat("${TD_SUPPORT_DIR}/gnuregex_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/iconv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif()
# msvc regex
if(${BUILD_MSVCREGEX})
cat("${TD_SUPPORT_DIR}/msvcregex_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif()
# wcwidth
if(${BUILD_WCWIDTH})
cat("${TD_SUPPORT_DIR}/wcwidth_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif()
# wingetopt
if(${BUILD_WINGETOPT})
cat("${TD_SUPPORT_DIR}/wingetopt_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif() endif()
# googletest # googletest
...@@ -63,9 +78,9 @@ if(${BUILD_WITH_UV}) ...@@ -63,9 +78,9 @@ if(${BUILD_WITH_UV})
endif(${BUILD_WITH_UV}) endif(${BUILD_WITH_UV})
# bdb # bdb
#if(${BUILD_WITH_BDB}) if(${BUILD_WITH_BDB})
#cat("${TD_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
#endif(${BUILD_WITH_BDB}) endif(${BUILD_WITH_BDB})
# sqlite # sqlite
if(${BUILD_WITH_SQLITE}) if(${BUILD_WITH_SQLITE})
...@@ -83,6 +98,12 @@ if(${BUILD_WITH_NURAFT}) ...@@ -83,6 +98,12 @@ if(${BUILD_WITH_NURAFT})
cat("${TD_SUPPORT_DIR}/nuraft_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/nuraft_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif(${BUILD_WITH_NURAFT}) endif(${BUILD_WITH_NURAFT})
# addr2line
if(${BUILD_ADDR2LINE})
cat("${TD_SUPPORT_DIR}/libdwarf_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/addr2line_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif(${BUILD_ADDR2LINE})
# download dependencies # download dependencies
configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt") configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
...@@ -95,12 +116,31 @@ execute_process(COMMAND "${CMAKE_COMMAND}" --build . ...@@ -95,12 +116,31 @@ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
# ================================================================================================ # ================================================================================================
# googletest # googletest
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(googletest) add_subdirectory(googletest EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
gtest gtest
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src>
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_linux>
) )
if(${TD_WINDOWS})
target_include_directories(
gtest
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_win>
)
endif(${TD_WINDOWS})
if(${TD_LINUX})
target_include_directories(
gtest
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_linux>
)
endif(${TD_LINUX})
if(${TD_DARWIN})
target_include_directories(
gtest
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_darwin>
)
endif(${TD_DARWIN})
endif(${BUILD_TEST}) endif(${BUILD_TEST})
# cJson # cJson
...@@ -109,7 +149,7 @@ set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in") ...@@ -109,7 +149,7 @@ set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
option(ENABLE_CJSON_TEST "Enable building cJSON test" OFF) option(ENABLE_CJSON_TEST "Enable building cJSON test" OFF)
option(CJSON_OVERRIDE_BUILD_SHARED_LIBS "Override BUILD_SHARED_LIBS with CJSON_BUILD_SHARED_LIBS" ON) option(CJSON_OVERRIDE_BUILD_SHARED_LIBS "Override BUILD_SHARED_LIBS with CJSON_BUILD_SHARED_LIBS" ON)
option(CJSON_BUILD_SHARED_LIBS "Overrides BUILD_SHARED_LIBS if CJSON_OVERRIDE_BUILD_SHARED_LIBS is enabled" OFF) option(CJSON_BUILD_SHARED_LIBS "Overrides BUILD_SHARED_LIBS if CJSON_OVERRIDE_BUILD_SHARED_LIBS is enabled" OFF)
add_subdirectory(cJson) add_subdirectory(cJson EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
cjson cjson
# see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source # see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source
...@@ -118,7 +158,7 @@ target_include_directories( ...@@ -118,7 +158,7 @@ target_include_directories(
unset(CMAKE_PROJECT_INCLUDE_BEFORE) unset(CMAKE_PROJECT_INCLUDE_BEFORE)
# lz4 # lz4
add_subdirectory(lz4/build/cmake) add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
lz4_static lz4_static
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lz4/lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lz4/lib
...@@ -126,7 +166,7 @@ target_include_directories( ...@@ -126,7 +166,7 @@ target_include_directories(
# zlib # zlib
set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in") set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
add_subdirectory(zlib) add_subdirectory(zlib EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
zlibstatic zlibstatic
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
...@@ -142,7 +182,7 @@ unset(CMAKE_PROJECT_INCLUDE_BEFORE) ...@@ -142,7 +182,7 @@ unset(CMAKE_PROJECT_INCLUDE_BEFORE)
# leveldb # leveldb
if(${BUILD_WITH_LEVELDB}) if(${BUILD_WITH_LEVELDB})
option(LEVELDB_BUILD_TESTS "" OFF) option(LEVELDB_BUILD_TESTS "" OFF)
add_subdirectory(leveldb) add_subdirectory(leveldb EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
leveldb leveldb
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/leveldb/include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/leveldb/include>
...@@ -158,7 +198,7 @@ if(${BUILD_WITH_ROCKSDB}) ...@@ -158,7 +198,7 @@ if(${BUILD_WITH_ROCKSDB})
option(WITH_TOOLS "" OFF) option(WITH_TOOLS "" OFF)
option(WITH_LIBURING "" OFF) option(WITH_LIBURING "" OFF)
option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF) option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
add_subdirectory(rocksdb) add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
rocksdb rocksdb
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
...@@ -169,7 +209,7 @@ endif(${BUILD_WITH_ROCKSDB}) ...@@ -169,7 +209,7 @@ endif(${BUILD_WITH_ROCKSDB})
# To support build on ubuntu: sudo apt-get install libboost-all-dev # To support build on ubuntu: sudo apt-get install libboost-all-dev
if(${BUILD_WITH_LUCENE}) if(${BUILD_WITH_LUCENE})
option(ENABLE_TEST "Enable the tests" OFF) option(ENABLE_TEST "Enable the tests" OFF)
add_subdirectory(lucene) add_subdirectory(lucene EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
lucene++ lucene++
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lucene/include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lucene/include>
...@@ -179,9 +219,56 @@ endif(${BUILD_WITH_LUCENE}) ...@@ -179,9 +219,56 @@ endif(${BUILD_WITH_LUCENE})
# NuRaft # NuRaft
if(${BUILD_WITH_NURAFT}) if(${BUILD_WITH_NURAFT})
add_subdirectory(nuraft) add_subdirectory(nuraft EXCLUDE_FROM_ALL)
endif(${BUILD_WITH_NURAFT}) endif(${BUILD_WITH_NURAFT})
# pthread
if(${BUILD_PTHREAD})
set(CMAKE_BUILD_TYPE release)
add_definitions(-DPTW32_STATIC_LIB)
add_subdirectory(pthread)
set_target_properties(libpthreadVC3 PROPERTIES OUTPUT_NAME pthread)
add_library(pthread STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET pthread PROPERTY IMPORTED_LOCATION ${LIBRARY_OUTPUT_PATH}/pthread.lib)
endif()
# iconv
if(${BUILD_WITH_ICONV})
add_library(iconv STATIC iconv/win_iconv.c)
endif(${BUILD_WITH_ICONV})
# wingetopt
if(${BUILD_WINGETOPT})
add_subdirectory(wingetopt EXCLUDE_FROM_ALL)
endif(${BUILD_WINGETOPT})
# msvcregex
if(${BUILD_MSVCREGEX})
add_library(msvcregex STATIC "")
target_sources(msvcregex
PRIVATE "msvcregex/regex.c"
)
target_include_directories(msvcregex
PRIVATE "msvcregex"
)
target_link_libraries(msvcregex
INTERFACE Shell32
)
SET_TARGET_PROPERTIES(msvcregex PROPERTIES OUTPUT_NAME msvcregex)
endif(${BUILD_MSVCREGEX})
# msvcregex
if(${BUILD_WCWIDTH})
add_library(wcwidth STATIC "")
target_sources(wcwidth
PRIVATE "wcwidth/wcwidth.c"
)
target_include_directories(wcwidth
PRIVATE "wcwidth"
)
SET_TARGET_PROPERTIES(wcwidth PROPERTIES OUTPUT_NAME wcwidth)
endif(${BUILD_WCWIDTH})
# CRAFT # CRAFT
if(${BUILD_WITH_CRAFT}) if(${BUILD_WITH_CRAFT})
add_library(craft STATIC IMPORTED GLOBAL) add_library(craft STATIC IMPORTED GLOBAL)
...@@ -212,7 +299,7 @@ if(${BUILD_WITH_UV}) ...@@ -212,7 +299,7 @@ if(${BUILD_WITH_UV})
MESSAGE("Windows need set no-sign-compare") MESSAGE("Windows need set no-sign-compare")
add_compile_options(-Wno-sign-compare) add_compile_options(-Wno-sign-compare)
endif () endif ()
add_subdirectory(libuv) add_subdirectory(libuv EXCLUDE_FROM_ALL)
endif(${BUILD_WITH_UV}) endif(${BUILD_WITH_UV})
# BDB # BDB
...@@ -238,16 +325,61 @@ if(${BUILD_WITH_SQLITE}) ...@@ -238,16 +325,61 @@ if(${BUILD_WITH_SQLITE})
target_link_libraries(sqlite target_link_libraries(sqlite
INTERFACE m INTERFACE m
INTERFACE pthread INTERFACE pthread
INTERFACE dl
) )
if(NOT TD_WINDOWS)
target_link_libraries(sqlite
INTERFACE dl
)
endif(NOT TD_WINDOWS)
endif(${BUILD_WITH_SQLITE}) endif(${BUILD_WITH_SQLITE})
# pthread # addr2line
if(${BUILD_ADDR2LINE})
check_include_file( "sys/types.h" HAVE_SYS_TYPES_H)
check_include_file( "sys/stat.h" HAVE_SYS_STAT_H )
check_include_file( "inttypes.h" HAVE_INTTYPES_H )
check_include_file( "stddef.h" HAVE_STDDEF_H )
check_include_file( "stdlib.h" HAVE_STDLIB_H )
check_include_file( "string.h" HAVE_STRING_H )
check_include_file( "memory.h" HAVE_MEMORY_H )
check_include_file( "strings.h" HAVE_STRINGS_H )
check_include_file( "stdint.h" HAVE_STDINT_H )
check_include_file( "unistd.h" HAVE_UNISTD_H )
check_include_file( "sgidefs.h" HAVE_SGIDEFS_H )
check_include_file( "stdafx.h" HAVE_STDAFX_H )
check_include_file( "elf.h" HAVE_ELF_H )
check_include_file( "libelf.h" HAVE_LIBELF_H )
check_include_file( "libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
check_include_file( "alloca.h" HAVE_ALLOCA_H )
check_include_file( "elfaccess.h" HAVE_ELFACCESS_H)
check_include_file( "sys/elf_386.h" HAVE_SYS_ELF_386_H )
check_include_file( "sys/elf_amd64.h" HAVE_SYS_ELF_AMD64_H)
check_include_file( "sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
check_include_file( "sys/ia64/elf.h" HAVE_SYS_IA64_ELF_H )
set(VERSION 0.3.1)
set(PACKAGE_VERSION "\"${VERSION}\"")
configure_file(libdwarf/cmake/config.h.cmake config.h)
file(GLOB_RECURSE LIBDWARF_SOURCES "libdwarf/src/lib/libdwarf/*.c")
add_library(libdwarf STATIC ${LIBDWARF_SOURCES})
set_target_properties(libdwarf PROPERTIES OUTPUT_NAME "libdwarf")
if(HAVE_LIBELF_H OR HAVE_LIBELF_LIBELF_H)
target_link_libraries(libdwarf PUBLIC libelf)
endif()
target_include_directories(libdwarf SYSTEM PUBLIC "libdwarf/src/lib/libdwarf" ${CMAKE_CURRENT_BINARY_DIR})
file(READ "addr2line/addr2line.c" ADDR2LINE_CONTENT)
string(REPLACE "static int" "int" ADDR2LINE_CONTENT "${ADDR2LINE_CONTENT}")
string(REPLACE "static void" "void" ADDR2LINE_CONTENT "${ADDR2LINE_CONTENT}")
string(REPLACE "main(" "main_addr2line(" ADDR2LINE_CONTENT "${ADDR2LINE_CONTENT}")
file(WRITE "addr2line/addr2line.c" "${ADDR2LINE_CONTENT}")
add_library(addr2line STATIC "addr2line/addr2line.c")
target_link_libraries(addr2line PUBLIC libdwarf dl z)
target_include_directories(addr2line PUBLIC "libdwarf/src/lib/libdwarf" )
endif(${BUILD_ADDR2LINE})
# ================================================================================================ # ================================================================================================
# Build test # Build test
# ================================================================================================ # ================================================================================================
if(${BUILD_DEPENDENCY_TESTS}) if(${BUILD_DEPENDENCY_TESTS})
add_subdirectory(test) add_subdirectory(test EXCLUDE_FROM_ALL)
endif(${BUILD_DEPENDENCY_TESTS}) endif(${BUILD_DEPENDENCY_TESTS})
contrib/test/CMakeLists.txt
浏览文件 @ 2393e536
...@@ -7,9 +7,9 @@ if(${BUILD_WITH_LUCENE}) ...@@ -7,9 +7,9 @@ if(${BUILD_WITH_LUCENE})
add_subdirectory(lucene) add_subdirectory(lucene)
endif(${BUILD_WITH_LUCENE}) endif(${BUILD_WITH_LUCENE})
#if(${BUILD_WITH_BDB}) if(${BUILD_WITH_BDB})
#add_subdirectory(bdb) add_subdirectory(bdb)
#endif(${BUILD_WITH_BDB}) endif(${BUILD_WITH_BDB})
if(${BUILD_WITH_SQLITE}) if(${BUILD_WITH_SQLITE})
add_subdirectory(sqlite) add_subdirectory(sqlite)
......
contrib/test/craft/CMakeLists.txt
浏览文件 @ 2393e536
add_executable(simulate_vnode "simulate_vnode.c") add_executable(simulate_vnode "simulate_vnode.c")
target_link_libraries(simulate_vnode PUBLIC craft lz4 uv_a) target_link_libraries(simulate_vnode PUBLIC craft lz4 uv_a)
\ No newline at end of file if(${BUILD_WINGETOPT})
target_link_libraries(simulate_vnode PUBLIC wingetopt)
target_include_directories(
simulate_vnode
PUBLIC "${TD_SOURCE_DIR}/contrib/wingetopt/src"
)
endif()
\ No newline at end of file
contrib/test/tdev/src/main.c
浏览文件 @ 2393e536
...@@ -6,43 +6,39 @@ ...@@ -6,43 +6,39 @@
#define POINTER_SHIFT(ptr, s) ((void *)(((char *)ptr) + (s))) #define POINTER_SHIFT(ptr, s) ((void *)(((char *)ptr) + (s)))
#define POINTER_DISTANCE(pa, pb) ((char *)(pb) - (char *)(pa)) #define POINTER_DISTANCE(pa, pb) ((char *)(pb) - (char *)(pa))
#define tPutA(buf, val) \ static inline void tPutA(void **buf, uint64_t val) {
({ \ memcpy(buf, &val, sizeof(val));
memcpy(buf, &val, sizeof(val)); \ *buf = POINTER_SHIFT(buf, sizeof(val));
POINTER_SHIFT(buf, sizeof(val)); \ }
})
#define tPutB(buf, val) \ static inline void tPutB(void **buf, uint64_t val) {
({ \ ((uint8_t *)buf)[7] = ((val) >> 56) & 0xff;
((uint8_t *)buf)[7] = ((val) >> 56) & 0xff; \ ((uint8_t *)buf)[6] = ((val) >> 48) & 0xff;
((uint8_t *)buf)[6] = ((val) >> 48) & 0xff; \ ((uint8_t *)buf)[5] = ((val) >> 40) & 0xff;
((uint8_t *)buf)[5] = ((val) >> 40) & 0xff; \ ((uint8_t *)buf)[4] = ((val) >> 32) & 0xff;
((uint8_t *)buf)[4] = ((val) >> 32) & 0xff; \ ((uint8_t *)buf)[3] = ((val) >> 24) & 0xff;
((uint8_t *)buf)[3] = ((val) >> 24) & 0xff; \ ((uint8_t *)buf)[2] = ((val) >> 16) & 0xff;
((uint8_t *)buf)[2] = ((val) >> 16) & 0xff; \ ((uint8_t *)buf)[1] = ((val) >> 8) & 0xff;
((uint8_t *)buf)[1] = ((val) >> 8) & 0xff; \ ((uint8_t *)buf)[0] = (val)&0xff;
((uint8_t *)buf)[0] = (val)&0xff; \ *buf = POINTER_SHIFT(buf, sizeof(val));
POINTER_SHIFT(buf, sizeof(val)); \ }
})
#define tPutC(buf, val) \ static inline void tPutC(void **buf, uint64_t val) {
({ \ if (buf) {
if (buf) { \ ((uint64_t *)buf)[0] = (val);
((uint64_t *)buf)[0] = (val); \ POINTER_SHIFT(buf, sizeof(val));
POINTER_SHIFT(buf, sizeof(val)); \ }
} \ *buf = NULL;
NULL; \ }
})
#define tPutD(buf, val) \ static inline void tPutD(void **buf, uint64_t val) {
({ \ uint64_t tmp = val;
uint64_t tmp = val; \ for (size_t i = 0; i < sizeof(val); i++) {
for (size_t i = 0; i < sizeof(val); i++) { \ ((uint8_t *)buf)[i] = tmp & 0xff;
((uint8_t *)buf)[i] = tmp & 0xff; \ tmp >>= 8;
tmp >>= 8; \ }
} \ *buf = POINTER_SHIFT(buf, sizeof(val));
POINTER_SHIFT(buf, sizeof(val)); \ }
})
static inline void tPutE(void **buf, uint64_t val) { static inline void tPutE(void **buf, uint64_t val) {
if (buf) { if (buf) {
...@@ -61,7 +57,7 @@ static void func(T t) { ...@@ -61,7 +57,7 @@ static void func(T t) {
switch (t) { switch (t) {
case A: case A:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) { for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
pBuf = tPutA(pBuf, val); tPutA(pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) { if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf; pBuf = buf;
} }
...@@ -69,7 +65,7 @@ static void func(T t) { ...@@ -69,7 +65,7 @@ static void func(T t) {
break; break;
case B: case B:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) { for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
pBuf = tPutB(pBuf, val); tPutB(pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) { if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf; pBuf = buf;
} }
...@@ -77,7 +73,7 @@ static void func(T t) { ...@@ -77,7 +73,7 @@ static void func(T t) {
break; break;
case C: case C:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) { for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
pBuf = tPutC(pBuf, val); tPutC(pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) { if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf; pBuf = buf;
} }
...@@ -85,7 +81,7 @@ static void func(T t) { ...@@ -85,7 +81,7 @@ static void func(T t) {
break; break;
case D: case D:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) { for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
pBuf = tPutD(pBuf, val); tPutD(pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) { if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf; pBuf = buf;
} }
......
example/CMakeLists.txt
浏览文件 @ 2393e536
...@@ -30,6 +30,7 @@ target_link_libraries(demoapi ...@@ -30,6 +30,7 @@ target_link_libraries(demoapi
) )
target_include_directories(tmq target_include_directories(tmq
PUBLIC "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
...@@ -39,6 +40,7 @@ target_include_directories(tstream ...@@ -39,6 +40,7 @@ target_include_directories(tstream
target_include_directories(demoapi target_include_directories(demoapi
PUBLIC "${TD_SOURCE_DIR}/include/client" PUBLIC "${TD_SOURCE_DIR}/include/client"
PUBLIC "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
......
example/src/demoapi.c
浏览文件 @ 2393e536
...@@ -4,10 +4,12 @@ ...@@ -4,10 +4,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> // #include <unistd.h>
#include <inttypes.h> #include <inttypes.h>
#ifndef WINDOWS
#include <argp.h> #include <argp.h>
#endif
#include "osSleep.h"
#include "taos.h" #include "taos.h"
#define debugPrint(fmt, ...) \ #define debugPrint(fmt, ...) \
...@@ -32,6 +34,7 @@ ...@@ -32,6 +34,7 @@
int64_t g_num_of_tb = 2; int64_t g_num_of_tb = 2;
int64_t g_num_of_rec = 3; int64_t g_num_of_rec = 3;
#ifndef WINDOWS
static struct argp_option options[] = { static struct argp_option options[] = {
{"tables", 't', "NUMBER", 0, "Number of child tables, default is 10000."}, {"tables", 't', "NUMBER", 0, "Number of child tables, default is 10000."},
{"records", 'n', "NUMBER", 0, {"records", 'n', "NUMBER", 0,
...@@ -61,16 +64,16 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { ...@@ -61,16 +64,16 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
} }
static struct argp argp = {options, parse_opt, "", ""}; static struct argp argp = {options, parse_opt, "", ""};
#endif
static void prepare_data(TAOS* taos) { static void prepare_data(TAOS* taos) {
TAOS_RES *res; TAOS_RES *res;
res = taos_query(taos, "drop database if exists test;"); res = taos_query(taos, "drop database if exists test;");
taos_free_result(res); taos_free_result(res);
usleep(100000); taosMsleep(100);
res = taos_query(taos, "create database test;"); res = taos_query(taos, "create database test;");
taos_free_result(res); taos_free_result(res);
usleep(100000); taosMsleep(100);
taos_select_db(taos, "test"); taos_select_db(taos, "test");
char command[1024] = {0}; char command[1024] = {0};
...@@ -87,18 +90,17 @@ static void prepare_data(TAOS* taos) { ...@@ -87,18 +90,17 @@ static void prepare_data(TAOS* taos) {
taos_free_result(res); taos_free_result(res);
for (int64_t i = 0; i < g_num_of_tb; i ++) { for (int64_t i = 0; i < g_num_of_tb; i ++) {
// sprintf(command, "create table t%"PRId64" using meters "
// "tags(%"PRId64", '%s', '%s', '%s');",
// i, i, (i%2)?"beijing":"shanghai",
// (i%2)?"朝阳区":"黄浦区",
// (i%2)?"长安街":"中山路");
sprintf(command, "create table t%"PRId64" using meters " sprintf(command, "create table t%"PRId64" using meters "
"tags(%"PRId64", '%s', '%s', '%s');",
i, i, (i%2)?"beijing":"shanghai",
(i%2)?"朝阳区":"黄浦区",
(i%2)?"长安街":"中山路");
/* sprintf(command, "create table t%"PRId64" using meters "
"tags(%"PRId64", '%s', '%s', '%s');", "tags(%"PRId64", '%s', '%s', '%s');",
i, i, i, i,
(i%2)?"beijing":"shanghai", (i%2)?"beijing":"shanghai",
(i%2)?"chaoyang":"huangpu", (i%2)?"chaoyang":"huangpu",
(i%2?"changan street":"jianguo rd")); (i%2?"changan street":"jianguo rd"));
*/
res = taos_query(taos, command); res = taos_query(taos, command);
if ((res) && (0 == taos_errno(res))) { if ((res) && (0 == taos_errno(res))) {
okPrint("t%" PRId64 " created\n", i); okPrint("t%" PRId64 " created\n", i);
...@@ -117,7 +119,8 @@ static void prepare_data(TAOS* taos) { ...@@ -117,7 +119,8 @@ static void prepare_data(TAOS* taos) {
"'%c%d', '%s%c%d', '%c%d')", "'%c%d', '%s%c%d', '%c%d')",
i, 1650000000000+j, (float)j, j, i, 1650000000000+j, (float)j, j,
'a'+(int)j%25, rand(), 'a'+(int)j%25, rand(),
"涛思", 'z' - (int)j%25, rand(), // "涛思", 'z' - (int)j%25, rand(),
"TAOS", 'z' - (int)j%25, rand(),
'b' - (int)j%25, rand() 'b' - (int)j%25, rand()
); );
res = taos_query(taos, command); res = taos_query(taos, command);
...@@ -176,7 +179,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) { ...@@ -176,7 +179,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) {
} }
if (block) { if (block) {
warnPrint("%s", "call taos_fetch_block()\n"); warnPrint("%s", "call taos_fetch_block(), don't call taos_fetch_lengths()\n");
int rows = 0; int rows = 0;
while ((rows = taos_fetch_block(res, &row))) { while ((rows = taos_fetch_block(res, &row))) {
int *lengths = taos_fetch_lengths(res); int *lengths = taos_fetch_lengths(res);
...@@ -196,7 +199,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) { ...@@ -196,7 +199,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) {
printf("col%d, row: %"PRId64", " printf("col%d, row: %"PRId64", "
"value: %"PRId64"\n", "value: %"PRId64"\n",
f, c, f, c,
*(int64_t*)(row[f]+c*sizeof(int64_t))); *(int64_t*)((char*)(row[f])+c*sizeof(int64_t)));
} }
break; break;
...@@ -208,7 +211,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) { ...@@ -208,7 +211,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) {
printf("col%d, row: %"PRId64", " printf("col%d, row: %"PRId64", "
"value: %d\n", "value: %d\n",
f, c, f, c,
*(int32_t*)(row[f]+c*sizeof(int32_t))); *(int32_t*)((char*)(row[f])+c*sizeof(int32_t)));
} }
break; break;
...@@ -220,7 +223,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) { ...@@ -220,7 +223,7 @@ static int print_result(char *tbname, TAOS_RES* res, int block) {
printf("col%d, row: %"PRId64", " printf("col%d, row: %"PRId64", "
"value: %f\n", "value: %f\n",
f, c, f, c,
*(float*)(row[f]+c*sizeof(float))); *(float*)((char*)(row[f])+c*sizeof(float)));
} }
break; break;
...@@ -235,9 +238,9 @@ static int print_result(char *tbname, TAOS_RES* res, int block) { ...@@ -235,9 +238,9 @@ static int print_result(char *tbname, TAOS_RES* res, int block) {
if (offsets) { if (offsets) {
for (int c = 0; c < rows; c++) { for (int c = 0; c < rows; c++) {
if (offsets[c] != -1) { if (offsets[c] != -1) {
int length = *(int16_t*)(row[f] + offsets[c]); int length = *(int16_t*)((char*)(row[f]) + offsets[c]);
char *buf = calloc(1, length + 1); char *buf = calloc(1, length + 1);
strncpy(buf, (char *)(row[f] + offsets[c] + 2), length); strncpy(buf, (char *)((char*)(row[f]) + offsets[c] + 2), length);
printf("row: %d, col: %d, offset: %d, length: %d, content: %s\n", printf("row: %d, col: %d, offset: %d, length: %d, content: %s\n",
c, f, offsets[c], length, buf); c, f, offsets[c], length, buf);
free(buf); free(buf);
...@@ -314,8 +317,9 @@ int main(int argc, char *argv[]) { ...@@ -314,8 +317,9 @@ int main(int argc, char *argv[]) {
const char* host = "127.0.0.1"; const char* host = "127.0.0.1";
const char* user = "root"; const char* user = "root";
const char* passwd = "taosdata"; const char* passwd = "taosdata";
#ifndef WINDOWS
argp_parse(&argp, argc, argv, 0, 0, NULL); argp_parse(&argp, argc, argv, 0, 0, NULL);
#endif
TAOS* taos = taos_connect(host, user, passwd, "", 0); TAOS* taos = taos_connect(host, user, passwd, "", 0);
if (taos == NULL) { if (taos == NULL) {
printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos)); printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos));
......
example/src/tmq.c
浏览文件 @ 2393e536
...@@ -22,8 +22,9 @@ ...@@ -22,8 +22,9 @@
static int running = 1; static int running = 1;
static void msg_process(TAOS_RES* msg) { static void msg_process(TAOS_RES* msg) {
char buf[1024]; char buf[1024];
/*memset(buf, 0, 1024);*/
printf("topic: %s\n", tmq_get_topic_name(msg)); printf("topic: %s\n", tmq_get_topic_name(msg));
printf("vg:%d\n", tmq_get_vgroup_id(msg)); printf("vg: %d\n", tmq_get_vgroup_id(msg));
while (1) { while (1) {
TAOS_ROW row = taos_fetch_row(msg); TAOS_ROW row = taos_fetch_row(msg);
if (row == NULL) break; if (row == NULL) break;
...@@ -31,6 +32,11 @@ static void msg_process(TAOS_RES* msg) { ...@@ -31,6 +32,11 @@ static void msg_process(TAOS_RES* msg) {
int32_t numOfFields = taos_field_count(msg); int32_t numOfFields = taos_field_count(msg);
taos_print_row(buf, row, fields, numOfFields); taos_print_row(buf, row, fields, numOfFields);
printf("%s\n", buf); printf("%s\n", buf);
const char* tbName = tmq_get_table_name(msg);
if (tbName) {
printf("from tb: %s\n", tbName);
}
} }
} }
...@@ -55,7 +61,7 @@ int32_t init_env() { ...@@ -55,7 +61,7 @@ int32_t init_env() {
taos_free_result(pRes); taos_free_result(pRes);
pRes = pRes =
taos_query(pConn, "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(10)) tags(t1 int)"); taos_query(pConn, "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int)");
if (taos_errno(pRes) != 0) { if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes)); printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1; return -1;
...@@ -100,9 +106,8 @@ int32_t create_topic() { ...@@ -100,9 +106,8 @@ int32_t create_topic() {
} }
taos_free_result(pRes); taos_free_result(pRes);
/*const char* sql = "select * from tu1";*/ pRes = taos_query(pConn, "create topic topic_ctb_column as abc1");
/*pRes = tmq_create_topic(pConn, "test_stb_topic_1", sql, strlen(sql));*/ /*pRes = taos_query(pConn, "create topic topic_ctb_column as select ts, c1, c2, c3 from st1");*/
pRes = taos_query(pConn, "create topic topic_ctb_column as select ts, c1, c2, c3 from ct1");
if (taos_errno(pRes) != 0) { if (taos_errno(pRes) != 0) {
printf("failed to create topic topic_ctb_column, reason:%s\n", taos_errstr(pRes)); printf("failed to create topic topic_ctb_column, reason:%s\n", taos_errstr(pRes));
return -1; return -1;
...@@ -141,7 +146,7 @@ int32_t create_topic() { ...@@ -141,7 +146,7 @@ int32_t create_topic() {
} }
void tmq_commit_cb_print(tmq_t* tmq, tmq_resp_err_t resp, tmq_topic_vgroup_list_t* offsets, void* param) { 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); printf("commit %d tmq %p offsets %p param %p\n", resp, tmq, offsets, param);
} }
tmq_t* build_consumer() { tmq_t* build_consumer() {
...@@ -160,15 +165,18 @@ tmq_t* build_consumer() { ...@@ -160,15 +165,18 @@ tmq_t* build_consumer() {
tmq_conf_set(conf, "group.id", "tg2"); tmq_conf_set(conf, "group.id", "tg2");
tmq_conf_set(conf, "td.connect.user", "root"); tmq_conf_set(conf, "td.connect.user", "root");
tmq_conf_set(conf, "td.connect.pass", "taosdata"); tmq_conf_set(conf, "td.connect.pass", "taosdata");
tmq_conf_set(conf, "td.connect.db", "abc1"); /*tmq_conf_set(conf, "td.connect.db", "abc1");*/
tmq_conf_set_offset_commit_cb(conf, tmq_commit_cb_print); tmq_conf_set(conf, "msg.with.table.name", "true");
tmq_t* tmq = tmq_consumer_new1(conf, NULL, 0); tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
tmq_t* tmq = tmq_consumer_new(conf, NULL, 0);
assert(tmq);
return tmq; return tmq;
} }
tmq_list_t* build_topic_list() { tmq_list_t* build_topic_list() {
tmq_list_t* topic_list = tmq_list_new(); tmq_list_t* topic_list = tmq_list_new();
tmq_list_append(topic_list, "topic_ctb_column"); tmq_list_append(topic_list, "topic_ctb_column");
/*tmq_list_append(topic_list, "tmq_test_db_multi_insert_topic");*/
return topic_list; return topic_list;
} }
...@@ -183,12 +191,12 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -183,12 +191,12 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
int32_t cnt = 0; int32_t cnt = 0;
/*clock_t startTime = clock();*/ /*clock_t startTime = clock();*/
while (running) { while (running) {
TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 500); TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 0);
if (tmqmessage) { if (tmqmessage) {
cnt++; cnt++;
/*printf("get data\n");*/ /*printf("get data\n");*/
/*msg_process(tmqmessage);*/ /*msg_process(tmqmessage);*/
tmq_message_destroy(tmqmessage); taos_free_result(tmqmessage);
/*} else {*/ /*} else {*/
/*break;*/ /*break;*/
} }
...@@ -214,13 +222,25 @@ void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -214,13 +222,25 @@ void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
return; return;
} }
tmq_list_t* subList = NULL;
tmq_subscription(tmq, &subList);
char** subTopics = tmq_list_to_c_array(subList);
int32_t sz = tmq_list_get_size(subList);
printf("subscribed topics: ");
for (int32_t i = 0; i < sz; i++) {
printf("%s, ", subTopics[i]);
}
printf("\n");
tmq_list_destroy(subList);
while (running) { while (running) {
TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 1000); TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 1000);
if (tmqmessage) { if (tmqmessage) {
msg_process(tmqmessage); msg_process(tmqmessage);
tmq_message_destroy(tmqmessage); taos_free_result(tmqmessage);
if ((++msg_count % MIN_COMMIT_COUNT) == 0) tmq_commit(tmq, NULL, 0); tmq_commit(tmq, NULL, 1);
/*if ((++msg_count % MIN_COMMIT_COUNT) == 0) tmq_commit(tmq, NULL, 0);*/
} }
} }
...@@ -248,7 +268,7 @@ void perf_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -248,7 +268,7 @@ void perf_loop(tmq_t* tmq, tmq_list_t* topics) {
batchCnt++; batchCnt++;
/*skipLogNum += tmqGetSkipLogNum(tmqmessage);*/ /*skipLogNum += tmqGetSkipLogNum(tmqmessage);*/
/*msg_process(tmqmessage);*/ /*msg_process(tmqmessage);*/
tmq_message_destroy(tmqmessage); taos_free_result(tmqmessage);
} else { } else {
break; break;
} }
...@@ -265,10 +285,11 @@ void perf_loop(tmq_t* tmq, tmq_list_t* topics) { ...@@ -265,10 +285,11 @@ void perf_loop(tmq_t* tmq, tmq_list_t* topics) {
} }
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
int code;
if (argc > 1) { if (argc > 1) {
printf("env init\n"); printf("env init\n");
code = init_env(); if (init_env() < 0) {
return -1;
}
create_topic(); create_topic();
} }
tmq_t* tmq = build_consumer(); tmq_t* tmq = build_consumer();
......
example/src/tstream.c
浏览文件 @ 2393e536
...@@ -25,7 +25,7 @@ int32_t init_env() { ...@@ -25,7 +25,7 @@ int32_t init_env() {
return -1; return -1;
} }
TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 2"); TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 1");
if (taos_errno(pRes) != 0) { if (taos_errno(pRes) != 0) {
printf("error in create db, reason:%s\n", taos_errstr(pRes)); printf("error in create db, reason:%s\n", taos_errstr(pRes));
return -1; return -1;
...@@ -78,11 +78,15 @@ int32_t create_stream() { ...@@ -78,11 +78,15 @@ int32_t create_stream() {
taos_free_result(pRes); taos_free_result(pRes);
/*const char* sql = "select min(k), max(k), sum(k) from tu1";*/ /*const char* sql = "select min(k), max(k), sum(k) from tu1";*/
const char* sql = "select min(k), max(k), sum(k) as sum_of_k from st1"; /*const char* sql = "select min(k), max(k), sum(k) as sum_of_k from st1";*/
/*const char* sql = "select sum(k) from tu1 interval(10m)";*/ /*const char* sql = "select sum(k) from tu1 interval(10m)";*/
pRes = tmq_create_stream(pConn, "stream1", "out1", sql); /*pRes = tmq_create_stream(pConn, "stream1", "out1", sql);*/
pRes = taos_query(
pConn,
"create stream stream1 trigger at_once into outstb as select _wstartts, min(k), max(k), sum(k) as sum_of_k "
"from tu1 interval(10m)");
if (taos_errno(pRes) != 0) { if (taos_errno(pRes) != 0) {
printf("failed to create stream out1, reason:%s\n", taos_errstr(pRes)); printf("failed to create stream stream1, reason:%s\n", taos_errstr(pRes));
return -1; return -1;
} }
taos_free_result(pRes); taos_free_result(pRes);
......
examples/c/CMakeLists.txt
浏览文件 @ 2393e536
PROJECT(TDengine) PROJECT(TDengine)
IF (TD_LINUX) IF (TD_LINUX)
INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc ${TD_COMMUNITY_DIR}/inc) INCLUDE_DIRECTORIES(. ${TD_SOURCE_DIR}/src/inc ${TD_SOURCE_DIR}/src/client/inc ${TD_SOURCE_DIR}/inc)
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(demo apitest.c) ADD_EXECUTABLE(demo apitest.c)
TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread ) TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
...@@ -13,7 +13,7 @@ IF (TD_LINUX) ...@@ -13,7 +13,7 @@ IF (TD_LINUX)
TARGET_LINK_LIBRARIES(epoll taos_static trpc tutil pthread lua) TARGET_LINK_LIBRARIES(epoll taos_static trpc tutil pthread lua)
ENDIF () ENDIF ()
IF (TD_DARWIN) IF (TD_DARWIN)
INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc ${TD_COMMUNITY_DIR}/inc) INCLUDE_DIRECTORIES(. ${TD_SOURCE_DIR}/src/inc ${TD_SOURCE_DIR}/src/client/inc ${TD_SOURCE_DIR}/inc)
AUX_SOURCE_DIRECTORY(. SRC) AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(demo demo.c) ADD_EXECUTABLE(demo demo.c)
TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread lua) TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread lua)
......
examples/c/asyncdemo.c
浏览文件 @ 2393e536
...@@ -45,7 +45,7 @@ typedef struct { ...@@ -45,7 +45,7 @@ typedef struct {
void taos_insert_call_back(void *param, TAOS_RES *tres, int code); void taos_insert_call_back(void *param, TAOS_RES *tres, int code);
void taos_select_call_back(void *param, TAOS_RES *tres, int code); void taos_select_call_back(void *param, TAOS_RES *tres, int code);
void taos_error(TAOS *taos); void shellPrintError(TAOS *taos);
static void queryDB(TAOS *taos, char *command) { static void queryDB(TAOS *taos, char *command) {
int i; int i;
...@@ -102,7 +102,7 @@ int main(int argc, char *argv[]) ...@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
taos = taos_connect(argv[1], "root", "taosdata", NULL, 0); taos = taos_connect(argv[1], "root", "taosdata", NULL, 0);
if (taos == NULL) if (taos == NULL)
taos_error(taos); shellPrintError(taos);
printf("success to connect to server\n"); printf("success to connect to server\n");
...@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) ...@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
void taos_error(TAOS *con) void shellPrintError(TAOS *con)
{ {
fprintf(stderr, "TDengine error: %s\n", taos_errstr(con)); fprintf(stderr, "TDengine error: %s\n", taos_errstr(con));
taos_close(con); taos_close(con);
......
include/client/taos.h
浏览文件 @ 2393e536
...@@ -27,10 +27,7 @@ typedef void TAOS; ...@@ -27,10 +27,7 @@ typedef void TAOS;
typedef void TAOS_STMT; typedef void TAOS_STMT;
typedef void TAOS_RES; typedef void TAOS_RES;
typedef void **TAOS_ROW; typedef void **TAOS_ROW;
#if 0 typedef void TAOS_SUB;
typedef void TAOS_STREAM;
#endif
typedef void TAOS_SUB;
// Data type definition // Data type definition
#define TSDB_DATA_TYPE_NULL 0 // 1 bytes #define TSDB_DATA_TYPE_NULL 0 // 1 bytes
...@@ -88,34 +85,14 @@ typedef struct taosField { ...@@ -88,34 +85,14 @@ typedef struct taosField {
int32_t bytes; int32_t bytes;
} TAOS_FIELD; } TAOS_FIELD;
#ifdef WINDOWS
#define DLL_EXPORT __declspec(dllexport)
#else
#define DLL_EXPORT #define DLL_EXPORT
#endif
typedef void (*__taos_async_fn_t)(void *param, TAOS_RES *, int code); typedef void (*__taos_async_fn_t)(void *param, TAOS_RES *, int code);
typedef struct TAOS_BIND {
int buffer_type;
void *buffer;
uintptr_t buffer_length; // unused
uintptr_t *length;
int *is_null;
int is_unsigned; // unused
int *error; // unused
union {
int64_t ts;
int8_t b;
int8_t v1;
int16_t v2;
int32_t v4;
int64_t v8;
float f4;
double f8;
unsigned char *bin;
char *nchar;
} u;
unsigned int allocated;
} TAOS_BIND;
typedef struct TAOS_MULTI_BIND { typedef struct TAOS_MULTI_BIND {
int buffer_type; int buffer_type;
void *buffer; void *buffer;
...@@ -144,6 +121,7 @@ typedef struct setConfRet { ...@@ -144,6 +121,7 @@ typedef struct setConfRet {
DLL_EXPORT void taos_cleanup(void); DLL_EXPORT void taos_cleanup(void);
DLL_EXPORT int taos_options(TSDB_OPTION option, const void *arg, ...); DLL_EXPORT int taos_options(TSDB_OPTION option, const void *arg, ...);
DLL_EXPORT setConfRet taos_set_config(const char *config); DLL_EXPORT setConfRet taos_set_config(const char *config);
DLL_EXPORT int taos_init(void);
DLL_EXPORT TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port); DLL_EXPORT TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port);
DLL_EXPORT TAOS *taos_connect_l(const char *ip, int ipLen, const char *user, int userLen, const char *pass, int passLen, DLL_EXPORT TAOS *taos_connect_l(const char *ip, int ipLen, const char *user, int userLen, const char *pass, int passLen,
const char *db, int dbLen, uint16_t port); const char *db, int dbLen, uint16_t port);
...@@ -154,14 +132,14 @@ const char *taos_data_type(int type); ...@@ -154,14 +132,14 @@ const char *taos_data_type(int type);
DLL_EXPORT TAOS_STMT *taos_stmt_init(TAOS *taos); DLL_EXPORT TAOS_STMT *taos_stmt_init(TAOS *taos);
DLL_EXPORT int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length); DLL_EXPORT int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length);
DLL_EXPORT int taos_stmt_set_tbname_tags(TAOS_STMT *stmt, const char *name, TAOS_BIND *tags); DLL_EXPORT int taos_stmt_set_tbname_tags(TAOS_STMT *stmt, const char *name, TAOS_MULTI_BIND *tags);
DLL_EXPORT int taos_stmt_set_tbname(TAOS_STMT *stmt, const char *name); DLL_EXPORT int taos_stmt_set_tbname(TAOS_STMT *stmt, const char *name);
DLL_EXPORT int taos_stmt_set_sub_tbname(TAOS_STMT *stmt, const char *name); DLL_EXPORT int taos_stmt_set_sub_tbname(TAOS_STMT *stmt, const char *name);
DLL_EXPORT int taos_stmt_is_insert(TAOS_STMT *stmt, int *insert); DLL_EXPORT int taos_stmt_is_insert(TAOS_STMT *stmt, int *insert);
DLL_EXPORT int taos_stmt_num_params(TAOS_STMT *stmt, int *nums); DLL_EXPORT int taos_stmt_num_params(TAOS_STMT *stmt, int *nums);
DLL_EXPORT int taos_stmt_get_param(TAOS_STMT *stmt, int idx, int *type, int *bytes); DLL_EXPORT int taos_stmt_get_param(TAOS_STMT *stmt, int idx, int *type, int *bytes);
DLL_EXPORT int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind); DLL_EXPORT int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind);
DLL_EXPORT int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind); DLL_EXPORT int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind);
DLL_EXPORT int taos_stmt_bind_single_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind, int colIdx); DLL_EXPORT int taos_stmt_bind_single_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind, int colIdx);
DLL_EXPORT int taos_stmt_add_batch(TAOS_STMT *stmt); DLL_EXPORT int taos_stmt_add_batch(TAOS_STMT *stmt);
...@@ -170,6 +148,7 @@ DLL_EXPORT TAOS_RES *taos_stmt_use_result(TAOS_STMT *stmt); ...@@ -170,6 +148,7 @@ DLL_EXPORT TAOS_RES *taos_stmt_use_result(TAOS_STMT *stmt);
DLL_EXPORT int taos_stmt_close(TAOS_STMT *stmt); DLL_EXPORT int taos_stmt_close(TAOS_STMT *stmt);
DLL_EXPORT char *taos_stmt_errstr(TAOS_STMT *stmt); DLL_EXPORT char *taos_stmt_errstr(TAOS_STMT *stmt);
DLL_EXPORT int taos_stmt_affected_rows(TAOS_STMT *stmt); DLL_EXPORT int taos_stmt_affected_rows(TAOS_STMT *stmt);
DLL_EXPORT int taos_stmt_affected_rows_once(TAOS_STMT *stmt);
DLL_EXPORT TAOS_RES *taos_query(TAOS *taos, const char *sql); DLL_EXPORT TAOS_RES *taos_query(TAOS *taos, const char *sql);
DLL_EXPORT TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen); DLL_EXPORT TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen);
...@@ -215,12 +194,6 @@ DLL_EXPORT TAOS_RES *taos_consume(TAOS_SUB *tsub); ...@@ -215,12 +194,6 @@ DLL_EXPORT TAOS_RES *taos_consume(TAOS_SUB *tsub);
DLL_EXPORT void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress); DLL_EXPORT void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress);
#endif #endif
#if 0
DLL_EXPORT TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
int64_t stime, void *param, void (*callback)(void *));
DLL_EXPORT void taos_close_stream(TAOS_STREAM *tstr);
#endif
DLL_EXPORT int taos_load_table_info(TAOS *taos, const char *tableNameList); DLL_EXPORT int taos_load_table_info(TAOS *taos, const char *tableNameList);
DLL_EXPORT TAOS_RES *taos_schemaless_insert(TAOS *taos, char *lines[], int numLines, int protocol, int precision); DLL_EXPORT TAOS_RES *taos_schemaless_insert(TAOS *taos, char *lines[], int numLines, int protocol, int precision);
...@@ -239,37 +212,34 @@ typedef struct tmq_topic_vgroup_list_t tmq_topic_vgroup_list_t; ...@@ -239,37 +212,34 @@ typedef struct tmq_topic_vgroup_list_t tmq_topic_vgroup_list_t;
typedef struct tmq_conf_t tmq_conf_t; typedef struct tmq_conf_t tmq_conf_t;
typedef struct tmq_list_t tmq_list_t; typedef struct tmq_list_t tmq_list_t;
// typedef struct tmq_message_t tmq_message_t;
typedef void(tmq_commit_cb(tmq_t *, tmq_resp_err_t, tmq_topic_vgroup_list_t *, void *param)); typedef void(tmq_commit_cb(tmq_t *, tmq_resp_err_t, tmq_topic_vgroup_list_t *, void *param));
DLL_EXPORT tmq_list_t *tmq_list_new(); DLL_EXPORT tmq_list_t *tmq_list_new();
DLL_EXPORT int32_t tmq_list_append(tmq_list_t *, const char *); DLL_EXPORT int32_t tmq_list_append(tmq_list_t *, const char *);
DLL_EXPORT void tmq_list_destroy(tmq_list_t *); DLL_EXPORT void tmq_list_destroy(tmq_list_t *);
DLL_EXPORT int32_t tmq_list_get_size(const tmq_list_t *);
DLL_EXPORT char **tmq_list_to_c_array(const tmq_list_t *);
#if 1 DLL_EXPORT tmq_t *tmq_consumer_new(tmq_conf_t *conf, char *errstr, int32_t errstrLen);
DLL_EXPORT tmq_t *tmq_consumer_new(void *conn, tmq_conf_t *conf, char *errstr, int32_t errstrLen);
#endif
DLL_EXPORT tmq_t *tmq_consumer_new1(tmq_conf_t *conf, char *errstr, int32_t errstrLen);
DLL_EXPORT const char *tmq_err2str(tmq_resp_err_t); 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, const tmq_list_t *topic_list);
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_list_t **topics);
DLL_EXPORT TAOS_RES *tmq_consumer_poll(tmq_t *tmq, int64_t blocking_time); DLL_EXPORT TAOS_RES *tmq_consumer_poll(tmq_t *tmq, int64_t wait_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
DLL_EXPORT tmq_resp_err_t tmq_assign(tmq_t* tmq, const tmq_topic_vgroup_list_t* vgroups);
DLL_EXPORT tmq_resp_err_t tmq_assignment(tmq_t* tmq, tmq_topic_vgroup_list_t** vgroups);
#endif
DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, int32_t async); DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, int32_t async);
DLL_EXPORT void tmq_commit_async(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, tmq_commit_cb *cb, void *param);
DLL_EXPORT tmq_resp_err_t tmq_commit_sync(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets);
#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);
DLL_EXPORT tmq_resp_err_t tmq_seek(tmq_t *tmq, const tmq_topic_vgroup_t *offset); DLL_EXPORT tmq_resp_err_t tmq_seek(tmq_t *tmq, const tmq_topic_vgroup_t *offset);
#endif #endif
/* ----------------------TMQ CONFIGURATION INTERFACE---------------------- */ /* ----------------------TMQ CONFIGURATION INTERFACE---------------------- */
enum tmq_conf_res_t { enum tmq_conf_res_t {
...@@ -283,34 +253,21 @@ typedef enum tmq_conf_res_t tmq_conf_res_t; ...@@ -283,34 +253,21 @@ typedef enum tmq_conf_res_t tmq_conf_res_t;
DLL_EXPORT tmq_conf_t *tmq_conf_new(); DLL_EXPORT tmq_conf_t *tmq_conf_new();
DLL_EXPORT tmq_conf_res_t tmq_conf_set(tmq_conf_t *conf, const char *key, const char *value); DLL_EXPORT tmq_conf_res_t tmq_conf_set(tmq_conf_t *conf, const char *key, const char *value);
DLL_EXPORT void tmq_conf_destroy(tmq_conf_t *conf); DLL_EXPORT void tmq_conf_destroy(tmq_conf_t *conf);
DLL_EXPORT void tmq_conf_set_offset_commit_cb(tmq_conf_t *conf, tmq_commit_cb *cb); DLL_EXPORT void tmq_conf_set_auto_commit_cb(tmq_conf_t *conf, tmq_commit_cb *cb, void *param);
#if 0
// temporary used function for demo only
void tmqShowMsg(tmq_message_t *tmq_message);
int32_t tmqGetSkipLogNum(tmq_message_t *tmq_message);
#endif
/* -------------------------TMQ MSG HANDLE INTERFACE---------------------- */ /* -------------------------TMQ MSG HANDLE INTERFACE---------------------- */
DLL_EXPORT char *tmq_get_topic_name(TAOS_RES *res); DLL_EXPORT const char *tmq_get_topic_name(TAOS_RES *res);
DLL_EXPORT int32_t tmq_get_vgroup_id(TAOS_RES *res); DLL_EXPORT int32_t tmq_get_vgroup_id(TAOS_RES *res);
DLL_EXPORT const char *tmq_get_table_name(TAOS_RES *res);
#if 0 #if 0
DLL_EXPORT TAOS_ROW tmq_get_row(tmq_message_t *message);
DLL_EXPORT int64_t tmq_get_request_offset(tmq_message_t *message); DLL_EXPORT int64_t tmq_get_request_offset(tmq_message_t *message);
DLL_EXPORT int64_t tmq_get_response_offset(tmq_message_t *message); DLL_EXPORT int64_t tmq_get_response_offset(tmq_message_t *message);
DLL_EXPORT TAOS_FIELD *tmq_get_fields(tmq_t *tmq, const char *topic);
DLL_EXPORT int32_t tmq_field_count(tmq_t *tmq, const char *topic);
#endif
DLL_EXPORT void tmq_message_destroy(TAOS_RES *res);
/* --------------------TMPORARY INTERFACE FOR TESTING--------------------- */
#if 0
DLL_EXPORT TAOS_RES *tmq_create_topic(TAOS *taos, const char *name, const char *sql, int sqlLen);
#endif #endif
DLL_EXPORT TAOS_RES *tmq_create_stream(TAOS *taos, const char *streamName, const char *tbName, const char *sql);
/* ------------------------------ TMQ END -------------------------------- */ /* ------------------------------ TMQ END -------------------------------- */
#if 1 // Shuduo: temporary enable for app build #if 1 // Shuduo: temporary enable for app build
typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB *tsub, TAOS_RES *res, void *param, int code); typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB *tsub, TAOS_RES *res, void *param, int code);
#endif #endif
......
include/common/systable.h 0 → 100644
浏览文件 @ 2393e536
/*
* 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/>.
*/
#ifdef __cplusplus
extern "C" {
#endif
#include "os.h"
#ifndef TDENGINE_SYSTABLE_H
#define TDENGINE_SYSTABLE_H
#define TSDB_INFORMATION_SCHEMA_DB "information_schema"
#define TSDB_INS_TABLE_DNODES "dnodes"
#define TSDB_INS_TABLE_MNODES "mnodes"
#define TSDB_INS_TABLE_MODULES "modules"
#define TSDB_INS_TABLE_QNODES "qnodes"
#define TSDB_INS_TABLE_BNODES "bnodes"
#define TSDB_INS_TABLE_SNODES "snodes"
#define TSDB_INS_TABLE_CLUSTER "cluster"
#define TSDB_INS_TABLE_USER_DATABASES "user_databases"
#define TSDB_INS_TABLE_USER_FUNCTIONS "user_functions"
#define TSDB_INS_TABLE_USER_INDEXES "user_indexes"
#define TSDB_INS_TABLE_USER_STABLES "user_stables"
#define TSDB_INS_TABLE_USER_STREAMS "user_streams"
#define TSDB_INS_TABLE_USER_TABLES "user_tables"
#define TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED "user_table_distributed"
#define TSDB_INS_TABLE_USER_USERS "user_users"
#define TSDB_INS_TABLE_LICENCES "grants"
#define TSDB_INS_TABLE_VGROUPS "vgroups"
#define TSDB_INS_TABLE_VNODES "vnodes"
#define TSDB_INS_TABLE_CONFIGS "configs"
#define TSDB_PERFORMANCE_SCHEMA_DB "performance_schema"
#define TSDB_PERFS_TABLE_SMAS "smas"
#define TSDB_PERFS_TABLE_CONNECTIONS "connections"
#define TSDB_PERFS_TABLE_QUERIES "queries"
#define TSDB_PERFS_TABLE_TOPICS "topics"
#define TSDB_PERFS_TABLE_CONSUMERS "consumers"
#define TSDB_PERFS_TABLE_SUBSCRIPTIONS "subscriptions"
#define TSDB_PERFS_TABLE_OFFSETS "offsets"
#define TSDB_PERFS_TABLE_TRANS "trans"
#define TSDB_PERFS_TABLE_STREAMS "streams"
typedef struct SSysDbTableSchema {
const char* name;
const int32_t type;
const int32_t bytes;
} SSysDbTableSchema;
typedef struct SSysTableMeta {
const char* name;
const SSysDbTableSchema* schema;
const int32_t colNum;
} SSysTableMeta;
void getInfosDbMeta(const SSysTableMeta** pInfosTableMeta, size_t* size);
void getPerfDbMeta(const SSysTableMeta** pPerfsTableMeta, size_t* size);
#ifdef __cplusplus
}
#endif
#endif // TDENGINE_SYSTABLE_H
include/common/taosdef.h
浏览文件 @ 2393e536
...@@ -28,15 +28,17 @@ typedef int64_t tb_uid_t; ...@@ -28,15 +28,17 @@ 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))
#define TSWINDOW_IS_EQUAL(t1, t2) (((t1).skey == (t2).skey) && ((t1).ekey == (t2).ekey))
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 from stream computing
TSDB_TEMP_TABLE = 5, // temp table created by nest query TSDB_TEMP_TABLE = 5, // temp table created by nest query
TSDB_SYSTEM_TABLE = 6, TSDB_SYSTEM_TABLE = 6,
TSDB_TABLE_MAX = 7 TSDB_TSMA_TABLE = 7, // time-range-wise sma
TSDB_TABLE_MAX = 8
} ETableType; } ETableType;
typedef enum { typedef enum {
...@@ -71,7 +73,6 @@ typedef enum { ...@@ -71,7 +73,6 @@ typedef enum {
TSDB_SMA_STAT_DROPPED = 2, // sma dropped TSDB_SMA_STAT_DROPPED = 2, // sma dropped
} ETsdbSmaStat; // bit operation } ETsdbSmaStat; // bit operation
typedef enum { typedef enum {
TSDB_SMA_TYPE_BLOCK = 0, // Block-wise SMA TSDB_SMA_TYPE_BLOCK = 0, // Block-wise SMA
TSDB_SMA_TYPE_TIME_RANGE = 1, // Time-range-wise SMA TSDB_SMA_TYPE_TIME_RANGE = 1, // Time-range-wise SMA
...@@ -79,15 +80,17 @@ typedef enum { ...@@ -79,15 +80,17 @@ typedef enum {
} ETsdbSmaType; } ETsdbSmaType;
typedef enum { typedef enum {
TSDB_BSMA_TYPE_NONE = 0, // no block-wise SMA TSDB_RETENTION_L0 = 0,
TSDB_BSMA_TYPE_I = 1, // sum/min/max(default) TSDB_RETENTION_L1 = 1,
} ETsdbBSmaType; TSDB_RETENTION_L2 = 2,
TSDB_RETENTION_MAX = 3
#define TSDB_BSMA_TYPE_LATEST TSDB_BSMA_TYPE_I } ERetentionLevel;
extern char *qtypeStr[]; extern char *qtypeStr[];
#define TSDB_PORT_HTTP 11 #define TSDB_PORT_HTTP 11
#undef TD_DEBUG_PRINT_ROW
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/common/tcommon.h
浏览文件 @ 2393e536
...@@ -45,6 +45,13 @@ enum { ...@@ -45,6 +45,13 @@ enum {
STREAM_TRIGGER__BY_EVENT_TIME, STREAM_TRIGGER__BY_EVENT_TIME,
}; };
typedef enum EStreamType {
STREAM_NORMAL = 1,
STREAM_INVERT,
STREAM_REPROCESS,
STREAM_INVALID,
} EStreamType;
typedef struct { typedef struct {
uint32_t numOfTables; uint32_t numOfTables;
SArray* pGroupList; SArray* pGroupList;
...@@ -65,20 +72,19 @@ typedef struct SDataBlockInfo { ...@@ -65,20 +72,19 @@ typedef struct SDataBlockInfo {
STimeWindow window; STimeWindow window;
int32_t rows; int32_t rows;
int32_t rowSize; int32_t rowSize;
union { int64_t uid; // the uid of table, from which current data block comes
int64_t uid; // from which table of uid, comes from this data block int64_t blockId; // block id, generated by physical planner
int64_t blockId;
};
uint64_t groupId; // no need to serialize uint64_t groupId; // no need to serialize
int16_t numOfCols; int16_t numOfCols;
int16_t hasVarCol; int16_t hasVarCol;
int16_t capacity; int32_t capacity;
EStreamType type;
} SDataBlockInfo; } SDataBlockInfo;
typedef struct SSDataBlock { typedef struct SSDataBlock {
SColumnDataAgg* pBlockAgg; SColumnDataAgg** pBlockAgg;
SArray* pDataBlock; // SArray<SColumnInfoData> SArray* pDataBlock; // SArray<SColumnInfoData>
SDataBlockInfo info; SDataBlockInfo info;
} SSDataBlock; } SSDataBlock;
typedef struct SVarColAttr { typedef struct SVarColAttr {
...@@ -99,6 +105,15 @@ typedef struct SColumnInfoData { ...@@ -99,6 +105,15 @@ typedef struct SColumnInfoData {
}; };
} SColumnInfoData; } SColumnInfoData;
typedef struct SQueryTableDataCond {
STimeWindow twindow;
int32_t order; // desc|asc order to iterate the data block
int32_t numOfCols;
SColumnInfo *colList;
bool loadExternalRows; // load external rows or not
int32_t type; // data block load type:
} SQueryTableDataCond;
void* blockDataDestroy(SSDataBlock* pBlock); void* blockDataDestroy(SSDataBlock* pBlock);
int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock); int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock);
void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock); void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock);
...@@ -108,8 +123,6 @@ void* tDecodeDataBlocks(const void* buf, SArray** blocks); ...@@ -108,8 +123,6 @@ void* tDecodeDataBlocks(const void* buf, SArray** blocks);
void colDataDestroy(SColumnInfoData* pColData); void colDataDestroy(SColumnInfoData* pColData);
static FORCE_INLINE void blockDestroyInner(SSDataBlock* pBlock) { static FORCE_INLINE void blockDestroyInner(SSDataBlock* pBlock) {
// WARNING: do not use info.numOfCols,
// sometimes info.numOfCols != array size
int32_t numOfOutput = taosArrayGetSize(pBlock->pDataBlock); int32_t numOfOutput = taosArrayGetSize(pBlock->pDataBlock);
for (int32_t i = 0; i < numOfOutput; ++i) { for (int32_t i = 0; i < numOfOutput; ++i) {
SColumnInfoData* pColInfoData = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pColInfoData = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, i);
...@@ -122,59 +135,6 @@ static FORCE_INLINE void blockDestroyInner(SSDataBlock* pBlock) { ...@@ -122,59 +135,6 @@ static FORCE_INLINE void blockDestroyInner(SSDataBlock* pBlock) {
static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) { blockDestroyInner(pBlock); } static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) { blockDestroyInner(pBlock); }
static FORCE_INLINE int32_t tEncodeSMqPollRsp(void** buf, const SMqPollRsp* pRsp) {
int32_t tlen = 0;
int32_t sz = 0;
// tlen += taosEncodeFixedI64(buf, pRsp->consumerId);
tlen += taosEncodeFixedI64(buf, pRsp->reqOffset);
tlen += taosEncodeFixedI64(buf, pRsp->rspOffset);
tlen += taosEncodeFixedI32(buf, pRsp->skipLogNum);
tlen += taosEncodeFixedI32(buf, pRsp->numOfTopics);
if (pRsp->numOfTopics == 0) return tlen;
tlen += taosEncodeSSchemaWrapper(buf, pRsp->schema);
if (pRsp->pBlockData) {
sz = taosArrayGetSize(pRsp->pBlockData);
}
tlen += taosEncodeFixedI32(buf, sz);
for (int32_t i = 0; i < sz; i++) {
SSDataBlock* pBlock = (SSDataBlock*)taosArrayGet(pRsp->pBlockData, i);
tlen += tEncodeDataBlock(buf, pBlock);
}
return tlen;
}
static FORCE_INLINE void* tDecodeSMqPollRsp(void* buf, SMqPollRsp* pRsp) {
int32_t sz;
// buf = taosDecodeFixedI64(buf, &pRsp->consumerId);
buf = taosDecodeFixedI64(buf, &pRsp->reqOffset);
buf = taosDecodeFixedI64(buf, &pRsp->rspOffset);
buf = taosDecodeFixedI32(buf, &pRsp->skipLogNum);
buf = taosDecodeFixedI32(buf, &pRsp->numOfTopics);
if (pRsp->numOfTopics == 0) return buf;
pRsp->schema = (SSchemaWrapper*)taosMemoryCalloc(1, sizeof(SSchemaWrapper));
if (pRsp->schema == NULL) return NULL;
buf = taosDecodeSSchemaWrapper(buf, pRsp->schema);
buf = taosDecodeFixedI32(buf, &sz);
pRsp->pBlockData = taosArrayInit(sz, sizeof(SSDataBlock));
for (int32_t i = 0; i < sz; i++) {
SSDataBlock block = {0};
tDecodeDataBlock(buf, &block);
taosArrayPush(pRsp->pBlockData, &block);
}
return buf;
}
static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqPollRsp* pRsp) {
if (pRsp->schema) {
if (pRsp->schema->nCols) {
taosMemoryFreeClear(pRsp->schema->pSchema);
}
taosMemoryFree(pRsp->schema);
}
taosArrayDestroyEx(pRsp->pBlockData, (void (*)(void*))blockDestroyInner);
pRsp->pBlockData = NULL;
}
//====================================================================================================================== //======================================================================================================================
// the following structure shared by parser and executor // the following structure shared by parser and executor
typedef struct SColumn { typedef struct SColumn {
...@@ -195,22 +155,22 @@ typedef struct SColumn { ...@@ -195,22 +155,22 @@ typedef struct SColumn {
} SColumn; } SColumn;
typedef struct STableBlockDistInfo { typedef struct STableBlockDistInfo {
uint16_t rowSize; uint16_t rowSize;
uint16_t numOfFiles; uint16_t numOfFiles;
uint32_t numOfTables; uint32_t numOfTables;
uint64_t totalSize; uint64_t totalSize;
uint64_t totalRows; uint64_t totalRows;
int32_t maxRows; int32_t maxRows;
int32_t minRows; int32_t minRows;
int32_t firstSeekTimeUs; int32_t firstSeekTimeUs;
uint32_t numOfRowsInMemTable; uint32_t numOfRowsInMemTable;
uint32_t numOfSmallBlocks; uint32_t numOfSmallBlocks;
SArray *dataBlockInfos; SArray* dataBlockInfos;
} STableBlockDistInfo; } STableBlockDistInfo;
enum { enum {
FUNC_PARAM_TYPE_VALUE = 0x1, FUNC_PARAM_TYPE_VALUE = 0x1,
FUNC_PARAM_TYPE_COLUMN= 0x2, FUNC_PARAM_TYPE_COLUMN = 0x2,
}; };
typedef struct SFunctParam { typedef struct SFunctParam {
...@@ -229,7 +189,6 @@ typedef struct SResSchame { ...@@ -229,7 +189,6 @@ typedef struct SResSchame {
char name[TSDB_COL_NAME_LEN]; char name[TSDB_COL_NAME_LEN];
} SResSchema; } SResSchema;
// TODO move away to executor.h
typedef struct SExprBasicInfo { typedef struct SExprBasicInfo {
SResSchema resSchema; SResSchema resSchema;
int16_t numOfParams; // argument value of each function int16_t numOfParams; // argument value of each function
...@@ -241,7 +200,21 @@ typedef struct SExprInfo { ...@@ -241,7 +200,21 @@ typedef struct SExprInfo {
struct tExprNode* pExpr; struct tExprNode* pExpr;
} SExprInfo; } SExprInfo;
#define QUERY_ASC_FORWARD_STEP 1 typedef struct {
const char* key;
int32_t keyLen;
uint8_t type;
union{
const char* value;
int64_t i;
uint64_t u;
double d;
float f;
};
int32_t length;
} SSmlKv;
#define QUERY_ASC_FORWARD_STEP 1
#define QUERY_DESC_FORWARD_STEP -1 #define QUERY_DESC_FORWARD_STEP -1
#define GET_FORWARD_DIRECTION_FACTOR(ord) (((ord) == TSDB_ORDER_ASC) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP) #define GET_FORWARD_DIRECTION_FACTOR(ord) (((ord) == TSDB_ORDER_ASC) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP)
......
include/common/tdata.h 0 → 100644
浏览文件 @ 2393e536
/*
* 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_TDATA_H_
#define _TD_TDATA_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "os.h"
typedef struct STaosData TDATA, tdata_t;
typedef enum {
TAOS_META_STABLE_DATA = 0, // super table meta
TAOS_META_TABLE_DATA, // non-super table meta
TAOS_TS_ROW_DATA, // row time-series data
TAOS_TS_COL_DATA, // col time-series data
TAOS_DATA_MAX
} ETaosDataT;
struct STaosData {
ETaosDataT type;
uint32_t nPayload;
uint8_t *pPayload;
};
#ifdef __cplusplus
}
#endif
#endif /*_TD_TDATA_H_*/
\ No newline at end of file
include/common/tdatablock.h
浏览文件 @ 2393e536
...@@ -54,8 +54,13 @@ SEpSet getEpSet_s(SCorEpSet* pEpSet); ...@@ -54,8 +54,13 @@ SEpSet getEpSet_s(SCorEpSet* pEpSet);
BMCharPos(bm_, r_) |= (1u << (7u - BitPos(r_))); \ BMCharPos(bm_, r_) |= (1u << (7u - BitPos(r_))); \
} while (0) } while (0)
#define colDataIsNull_var(pColumnInfoData, row) (pColumnInfoData->varmeta.offset[row] == -1) #define colDataSetNotNull_f(bm_, r_) \
#define colDataSetNull_var(pColumnInfoData, row) (pColumnInfoData->varmeta.offset[row] = -1) do { \
BMCharPos(bm_, r_) &= ~(1u << (7u - BitPos(r_))); \
} while (0)
#define colDataIsNull_var(pColumnInfoData, row) (pColumnInfoData->varmeta.offset[row] == -1)
#define colDataSetNull_var(pColumnInfoData, row) (pColumnInfoData->varmeta.offset[row] = -1)
#define BitmapLen(_n) (((_n) + ((1 << NBIT) - 1)) >> NBIT) #define BitmapLen(_n) (((_n) + ((1 << NBIT) - 1)) >> NBIT)
...@@ -63,24 +68,23 @@ SEpSet getEpSet_s(SCorEpSet* pEpSet); ...@@ -63,24 +68,23 @@ SEpSet getEpSet_s(SCorEpSet* pEpSet);
#define colDataGetNumData(p1_, r_) ((p1_)->pData + ((r_) * (p1_)->info.bytes)) #define colDataGetNumData(p1_, r_) ((p1_)->pData + ((r_) * (p1_)->info.bytes))
// SColumnInfoData, rowNumber // SColumnInfoData, rowNumber
#define colDataGetData(p1_, r_) \ #define colDataGetData(p1_, r_) \
((IS_VAR_DATA_TYPE((p1_)->info.type)) ? colDataGetVarData(p1_, r_) \ ((IS_VAR_DATA_TYPE((p1_)->info.type)) ? colDataGetVarData(p1_, r_) : colDataGetNumData(p1_, r_))
: colDataGetNumData(p1_, r_))
static FORCE_INLINE bool colDataIsNull_s(const SColumnInfoData* pColumnInfoData, uint32_t row) { static FORCE_INLINE bool colDataIsNull_s(const SColumnInfoData* pColumnInfoData, uint32_t row) {
if (pColumnInfoData->info.type == TSDB_DATA_TYPE_JSON){ if (pColumnInfoData->info.type == TSDB_DATA_TYPE_JSON) {
if(colDataIsNull_var(pColumnInfoData, row)){ if (colDataIsNull_var(pColumnInfoData, row)) {
return true; return true;
} }
char *data = colDataGetVarData(pColumnInfoData, row); char* data = colDataGetVarData(pColumnInfoData, row);
return (*data == TSDB_DATA_TYPE_NULL); return (*data == TSDB_DATA_TYPE_NULL);
} }
if (!pColumnInfoData->hasNull) { if (!pColumnInfoData->hasNull) {
return false; return false;
} }
if (pColumnInfoData->info.type== TSDB_DATA_TYPE_VARCHAR || pColumnInfoData->info.type == TSDB_DATA_TYPE_NCHAR) { if (pColumnInfoData->info.type == TSDB_DATA_TYPE_VARCHAR || pColumnInfoData->info.type == TSDB_DATA_TYPE_NCHAR) {
return colDataIsNull_var(pColumnInfoData, row); return colDataIsNull_var(pColumnInfoData, row);
} else { } else {
if (pColumnInfoData->nullbitmap == NULL) { if (pColumnInfoData->nullbitmap == NULL) {
...@@ -132,7 +136,7 @@ static FORCE_INLINE void colDataAppendNULL(SColumnInfoData* pColumnInfoData, uin ...@@ -132,7 +136,7 @@ static FORCE_INLINE void colDataAppendNULL(SColumnInfoData* pColumnInfoData, uin
static FORCE_INLINE void colDataAppendNNULL(SColumnInfoData* pColumnInfoData, uint32_t start, size_t nRows) { static FORCE_INLINE void colDataAppendNNULL(SColumnInfoData* pColumnInfoData, uint32_t start, size_t nRows) {
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) { if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
for (int32_t i = start; i < start + nRows; ++i) { for (int32_t i = start; i < start + nRows; ++i) {
colDataSetNull_var(pColumnInfoData,i); // it is a null value of VAR type. colDataSetNull_var(pColumnInfoData, i); // it is a null value of VAR type.
} }
} else { } else {
for (int32_t i = start; i < start + nRows; ++i) { for (int32_t i = start; i < start + nRows; ++i) {
...@@ -183,8 +187,8 @@ static FORCE_INLINE void colDataAppendDouble(SColumnInfoData* pColumnInfoData, u ...@@ -183,8 +187,8 @@ static FORCE_INLINE void colDataAppendDouble(SColumnInfoData* pColumnInfoData, u
} }
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, int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, int32_t* capacity,
uint32_t numOfRow2); const SColumnInfoData* pSource, uint32_t numOfRow2);
int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* pSource, int32_t numOfRows); int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* pSource, int32_t numOfRows);
int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock); int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock);
...@@ -225,6 +229,11 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData); ...@@ -225,6 +229,11 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData);
void blockDebugShowData(const SArray* dataBlocks); void blockDebugShowData(const SArray* dataBlocks);
int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SArray* pDataBlocks, STSchema* pTSchema, int32_t vgId,
tb_uid_t uid, tb_uid_t suid);
SSubmitReq* tdBlockToSubmit(const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid, int32_t vgId);
static FORCE_INLINE int32_t blockGetEncodeSize(const SSDataBlock* pBlock) { static FORCE_INLINE int32_t blockGetEncodeSize(const SSDataBlock* pBlock) {
return blockDataGetSerialMetaSize(pBlock) + blockDataGetSize(pBlock); return blockDataGetSerialMetaSize(pBlock) + blockDataGetSize(pBlock);
} }
...@@ -238,10 +247,16 @@ static FORCE_INLINE int32_t blockCompressColData(SColumnInfoData* pColRes, int32 ...@@ -238,10 +247,16 @@ static FORCE_INLINE int32_t blockCompressColData(SColumnInfoData* pColRes, int32
static FORCE_INLINE void blockCompressEncode(const SSDataBlock* pBlock, char* data, int32_t* dataLen, int32_t numOfCols, static FORCE_INLINE void blockCompressEncode(const SSDataBlock* pBlock, char* data, int32_t* dataLen, int32_t numOfCols,
int8_t needCompress) { int8_t needCompress) {
int32_t* colSizes = (int32_t*)data; int32_t* actualLen = (int32_t*)data;
data += sizeof(int32_t);
uint64_t* groupId = (uint64_t*)data;
data += sizeof(uint64_t);
int32_t* colSizes = (int32_t*)data;
data += numOfCols * sizeof(int32_t); data += numOfCols * sizeof(int32_t);
*dataLen = (numOfCols * sizeof(int32_t));
*dataLen = (numOfCols * sizeof(int32_t) + sizeof(uint64_t) + sizeof(int32_t));
int32_t numOfRows = pBlock->info.rows; int32_t numOfRows = pBlock->info.rows;
for (int32_t col = 0; col < numOfCols; ++col) { for (int32_t col = 0; col < numOfCols; ++col) {
...@@ -273,6 +288,9 @@ static FORCE_INLINE void blockCompressEncode(const SSDataBlock* pBlock, char* da ...@@ -273,6 +288,9 @@ static FORCE_INLINE void blockCompressEncode(const SSDataBlock* pBlock, char* da
colSizes[col] = htonl(colSizes[col]); colSizes[col] = htonl(colSizes[col]);
} }
*actualLen = *dataLen;
*groupId = pBlock->info.groupId;
} }
#ifdef __cplusplus #ifdef __cplusplus
......
include/common/tdataformat.h
浏览文件 @ 2393e536
此差异已折叠。
include/common/tglobal.h
浏览文件 @ 2393e536
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#define _TD_COMMON_GLOBAL_H_ #define _TD_COMMON_GLOBAL_H_
#include "tarray.h" #include "tarray.h"
#include "tdef.h"
#include "tconfig.h" #include "tconfig.h"
#include "tdef.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -32,31 +32,27 @@ extern char tsLocalEp[]; ...@@ -32,31 +32,27 @@ extern char tsLocalEp[];
extern uint16_t tsServerPort; extern uint16_t tsServerPort;
extern int32_t tsVersion; extern int32_t tsVersion;
extern int32_t tsStatusInterval; extern int32_t tsStatusInterval;
extern bool tsEnableTelemetryReporting; extern int32_t tsNumOfSupportVnodes;
// common // common
extern int32_t tsRpcTimer;
extern int32_t tsRpcMaxTime;
extern bool tsRpcForceTcp; // all commands go to tcp protocol if this is enabled
extern int32_t tsMaxConnections;
extern int32_t tsMaxShellConns; extern int32_t tsMaxShellConns;
extern int32_t tsShellActivityTimer; extern int32_t tsShellActivityTimer;
extern int32_t tsMaxTmrCtrl;
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 int32_t tsCompatibleModel; extern int32_t tsCompatibleModel;
extern bool tsEnableSlaveQuery; extern bool tsEnableSlaveQuery;
extern bool tsPrintAuth; extern bool tsPrintAuth;
extern int64_t tsTickPerDay[3]; extern int64_t tsTickPerMin[3];
// multi-process // multi-process
extern bool tsMultiProcess; extern int32_t tsMultiProcess;
extern int32_t tsMnodeShmSize; extern int32_t tsMnodeShmSize;
extern int32_t tsVnodeShmSize; extern int32_t tsVnodeShmSize;
extern int32_t tsQnodeShmSize; extern int32_t tsQnodeShmSize;
extern int32_t tsSnodeShmSize; extern int32_t tsSnodeShmSize;
extern int32_t tsBnodeShmSize; extern int32_t tsBnodeShmSize;
extern int32_t tsNumOfShmThreads;
// queue & threads // queue & threads
extern int32_t tsNumOfRpcThreads; extern int32_t tsNumOfRpcThreads;
...@@ -73,6 +69,7 @@ extern int32_t tsNumOfQnodeQueryThreads; ...@@ -73,6 +69,7 @@ extern int32_t tsNumOfQnodeQueryThreads;
extern int32_t tsNumOfQnodeFetchThreads; extern int32_t tsNumOfQnodeFetchThreads;
extern int32_t tsNumOfSnodeSharedThreads; extern int32_t tsNumOfSnodeSharedThreads;
extern int32_t tsNumOfSnodeUniqueThreads; extern int32_t tsNumOfSnodeUniqueThreads;
extern int64_t tsRpcQueueMemoryAllowed;
// monitor // monitor
extern bool tsEnableMonitor; extern bool tsEnableMonitor;
...@@ -82,6 +79,12 @@ extern uint16_t tsMonitorPort; ...@@ -82,6 +79,12 @@ extern uint16_t tsMonitorPort;
extern int32_t tsMonitorMaxLogs; extern int32_t tsMonitorMaxLogs;
extern bool tsMonitorComp; extern bool tsMonitorComp;
// telem
extern bool tsEnableTelem;
extern int32_t tsTelemInterval;
extern char tsTelemServer[];
extern uint16_t tsTelemPort;
// 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
...@@ -89,10 +92,10 @@ extern bool tsRetrieveBlockingModel; // retrieve threads will be blocked ...@@ -89,10 +92,10 @@ extern bool tsRetrieveBlockingModel; // retrieve threads will be blocked
extern bool tsKeepOriginalColumnName; extern bool tsKeepOriginalColumnName;
extern bool tsDeadLockKillQuery; extern bool tsDeadLockKillQuery;
// query client
extern int32_t tsQueryPolicy;
// client // client
extern int32_t tsMaxWildCardsLen;
extern int32_t tsMaxRegexStringLen;
extern int32_t tsMaxNumOfOrderedResults;
extern int32_t tsMinSlidingTime; extern int32_t tsMinSlidingTime;
extern int32_t tsMinIntervalTime; extern int32_t tsMinIntervalTime;
extern int32_t tsMaxStreamComputDelay; extern int32_t tsMaxStreamComputDelay;
...@@ -120,11 +123,23 @@ extern char tsCompressor[]; ...@@ -120,11 +123,23 @@ extern char tsCompressor[];
extern int32_t tsDiskCfgNum; extern int32_t tsDiskCfgNum;
extern SDiskCfg tsDiskCfg[]; extern SDiskCfg tsDiskCfg[];
// udf
extern bool tsStartUdfd;
// schemaless
extern char tsSmlChildTableName[];
extern bool tsSmlDataFormat;
// internal
extern int32_t tsTransPullupInterval;
extern int32_t tsMqRebalanceInterval;
#define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize) #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char *envFile, int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char **envCmd,
const char *apolloUrl, SArray *pArgs, bool tsc); const char *envFile, char *apolloUrl, SArray *pArgs, bool tsc);
int32_t taosInitCfg(const char *cfgDir, const char *envFile, const char *apolloUrl, SArray *pArgs, bool tsc); int32_t taosInitCfg(const char *cfgDir, const char **envCmd, const char *envFile, char *apolloUrl, SArray *pArgs,
bool tsc);
void taosCleanupCfg(); void taosCleanupCfg();
void taosCfgDynamicOptions(const char *option, const char *value); void taosCfgDynamicOptions(const char *option, const char *value);
void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary); void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary);
......
include/common/tmsg.h
浏览文件 @ 2393e536
此差异已折叠。
include/common/tmsgcb.h
浏览文件 @ 2393e536
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
extern "C" { extern "C" {
#endif #endif
typedef struct SRpcMsg SRpcMsg; typedef struct SRpcMsg SRpcMsg;
typedef struct SEpSet SEpSet; typedef struct SEpSet SEpSet;
typedef struct SMgmtWrapper SMgmtWrapper; typedef struct SMgmtWrapper SMgmtWrapper;
typedef struct SRpcHandleInfo SRpcHandleInfo;
typedef enum { typedef enum {
QUERY_QUEUE, QUERY_QUEUE,
...@@ -37,33 +38,36 @@ typedef enum { ...@@ -37,33 +38,36 @@ typedef enum {
QUEUE_MAX, QUEUE_MAX,
} EQueueType; } EQueueType;
typedef int32_t (*PutToQueueFp)(SMgmtWrapper* pWrapper, SRpcMsg* pReq); typedef int32_t (*PutToQueueFp)(void* pMgmt, SRpcMsg* pMsg);
typedef int32_t (*GetQueueSizeFp)(SMgmtWrapper* pWrapper, int32_t vgId, EQueueType qtype); typedef int32_t (*GetQueueSizeFp)(void* pMgmt, int32_t vgId, EQueueType qtype);
typedef int32_t (*SendReqFp)(SMgmtWrapper* pWrapper, const SEpSet* epSet, SRpcMsg* pReq); typedef int32_t (*SendReqFp)(const SEpSet* pEpSet, SRpcMsg* pMsg);
typedef int32_t (*SendMnodeReqFp)(SMgmtWrapper* pWrapper, SRpcMsg* pReq); typedef void (*SendRspFp)(SRpcMsg* pMsg);
typedef void (*SendRspFp)(SMgmtWrapper* pWrapper, const SRpcMsg* pRsp); typedef void (*SendRedirectRspFp)(SRpcMsg* pMsg, const SEpSet* pNewEpSet);
typedef void (*RegisterBrokenLinkArgFp)(SMgmtWrapper* pWrapper, SRpcMsg* pMsg); typedef void (*RegisterBrokenLinkArgFp)(SRpcMsg* pMsg);
typedef void (*ReleaseHandleFp)(SMgmtWrapper* pWrapper, void* handle, int8_t type); typedef void (*ReleaseHandleFp)(SRpcHandleInfo* pHandle, int8_t type);
typedef void (*ReportStartup)(SMgmtWrapper* pWrapper, const char* name, const char* desc); typedef void (*ReportStartup)(const char* name, const char* desc);
typedef struct { typedef struct {
SMgmtWrapper* pWrapper; void* mgmt;
void* clientRpc;
PutToQueueFp queueFps[QUEUE_MAX]; PutToQueueFp queueFps[QUEUE_MAX];
GetQueueSizeFp qsizeFp; GetQueueSizeFp qsizeFp;
SendReqFp sendReqFp; SendReqFp sendReqFp;
SendRspFp sendRspFp; SendRspFp sendRspFp;
SendRedirectRspFp sendRedirectRspFp;
RegisterBrokenLinkArgFp registerBrokenLinkArgFp; RegisterBrokenLinkArgFp registerBrokenLinkArgFp;
ReleaseHandleFp releaseHandleFp; ReleaseHandleFp releaseHandleFp;
ReportStartup reportStartupFp; ReportStartup reportStartupFp;
} SMsgCb; } SMsgCb;
void tmsgSetDefaultMsgCb(const SMsgCb* pMsgCb); void tmsgSetDefaultMsgCb(const SMsgCb* pMsgCb);
int32_t tmsgPutToQueue(const SMsgCb* pMsgCb, EQueueType qtype, SRpcMsg* pReq); int32_t tmsgPutToQueue(const SMsgCb* pMsgCb, EQueueType qtype, SRpcMsg* pMsg);
int32_t tmsgGetQueueSize(const SMsgCb* pMsgCb, int32_t vgId, EQueueType qtype); int32_t tmsgGetQueueSize(const SMsgCb* pMsgCb, int32_t vgId, EQueueType qtype);
int32_t tmsgSendReq(const SMsgCb* pMsgCb, const SEpSet* epSet, SRpcMsg* pReq); int32_t tmsgSendReq(const SEpSet* epSet, SRpcMsg* pMsg);
void tmsgSendRsp(const SRpcMsg* pRsp); void tmsgSendRsp(SRpcMsg* pMsg);
void tmsgRegisterBrokenLinkArg(const SMsgCb* pMsgCb, SRpcMsg* pMsg); void tmsgSendRedirectRsp(SRpcMsg* pMsg, const SEpSet* pNewEpSet);
void tmsgReleaseHandle(void* handle, int8_t type); void tmsgRegisterBrokenLinkArg(SRpcMsg* pMsg);
void tmsgReleaseHandle(SRpcHandleInfo* pHandle, int8_t type);
void tmsgReportStartup(const char* name, const char* desc); void tmsgReportStartup(const char* name, const char* desc);
#ifdef __cplusplus #ifdef __cplusplus
......
include/common/tmsgdef.h
浏览文件 @ 2393e536
...@@ -85,6 +85,7 @@ enum { ...@@ -85,6 +85,7 @@ enum {
TD_DEF_MSG_TYPE(TDMT_DND_DROP_VNODE, "dnode-drop-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_DROP_VNODE, "dnode-drop-vnode", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_DND_CONFIG_DNODE, "dnode-config-dnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_CONFIG_DNODE, "dnode-config-dnode", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_DND_SERVER_STATUS, "dnode-server-status", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_SERVER_STATUS, "dnode-server-status", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_DND_NET_TEST, "dnode-net-test", NULL, NULL)
// Requests handled by MNODE // Requests handled by MNODE
TD_NEW_MSG_SEG(TDMT_MND_MSG) TD_NEW_MSG_SEG(TDMT_MND_MSG)
...@@ -144,9 +145,11 @@ enum { ...@@ -144,9 +145,11 @@ enum {
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_GET_SUB_EP, "mnode-get-sub-ep", SMqCMGetSubEpReq, SMqCMGetSubEpRsp) TD_DEF_MSG_TYPE(TDMT_MND_MQ_ASK_EP, "mnode-mq-ask-ep", SMqAskEpReq, SMqAskEpRsp)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_TIMER, "mnode-mq-tmr", SMTimerReq, SMTimerReq) TD_DEF_MSG_TYPE(TDMT_MND_MQ_TIMER, "mnode-mq-tmr", SMTimerReq, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_DO_REBALANCE, "mnode-mq-do-rebalance", SMqDoRebalanceMsg, SMqDoRebalanceMsg) TD_DEF_MSG_TYPE(TDMT_MND_MQ_CONSUMER_LOST, "mnode-mq-consumer-lost", SMqConsumerLostMsg, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_CONSUMER_RECOVER, "mnode-mq-consumer-recover", SMqConsumerRecoverMsg, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_DO_REBALANCE, "mnode-mq-do-rebalance", SMqDoRebalanceMsg, NULL)
TD_DEF_MSG_TYPE(TDMT_MND_MQ_COMMIT_OFFSET, "mnode-mq-commit-offset", SMqCMCommitOffsetReq, SMqCMCommitOffsetRsp) 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_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_ALTER_STREAM, "mnode-alter-stream", NULL, NULL)
...@@ -167,17 +170,15 @@ enum { ...@@ -167,17 +170,15 @@ enum {
TD_DEF_MSG_TYPE(TDMT_VND_UPDATE_TAG_VAL, "vnode-update-tag-val", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_UPDATE_TAG_VAL, "vnode-update-tag-val", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_TABLE_META, "vnode-table-meta", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_TABLE_META, "vnode-table-meta", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_TABLES_META, "vnode-tables-meta", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_TABLES_META, "vnode-tables-meta", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_CREATE_STB, "vnode-create-stb", SVCreateTbReq, SVCreateTbRsp) TD_DEF_MSG_TYPE(TDMT_VND_CREATE_STB, "vnode-create-stb", SVCreateStbReq, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_ALTER_STB, "vnode-alter-stb", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_ALTER_STB, "vnode-alter-stb", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_DROP_STB, "vnode-drop-stb", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_DROP_STB, "vnode-drop-stb", SVDropStbReq, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONSUME, "vnode-mq-consume", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONSUME, "vnode-mq-consume", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_QUERY, "vnode-mq-query", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_MQ_QUERY, "vnode-mq-query", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONNECT, "vnode-mq-connect", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_MQ_CONNECT, "vnode-mq-connect", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_DISCONNECT, "vnode-mq-disconnect", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_MQ_DISCONNECT, "vnode-mq-disconnect", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_SET_CONN, "vnode-mq-set-conn", SMqSetCVgReq, SMqSetCVgRsp) TD_DEF_MSG_TYPE(TDMT_VND_MQ_VG_CHANGE, "vnode-mq-vg-change", SMqRebVgReq, SMqRebVgRsp)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_REB, "vnode-mq-mv-rebalance", SMqMVRebReq, SMqMVRebRsp) TD_DEF_MSG_TYPE(TDMT_VND_MQ_VG_DELETE, "vnode-mq-vg-delete", SMqVDeleteReq, SMqVDeleteRsp)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_CANCEL_CONN, "vnode-mq-mv-cancel-conn", SMqCancelConnReq, SMqCancelConnRsp)
TD_DEF_MSG_TYPE(TDMT_VND_MQ_SET_CUR, "vnode-mq-set-cur", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_RES_READY, "vnode-res-ready", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_RES_READY, "vnode-res-ready", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_TASKS_STATUS, "vnode-tasks-status", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_TASKS_STATUS, "vnode-tasks-status", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_TASK, "vnode-cancel-task", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_TASK, "vnode-cancel-task", NULL, NULL)
...@@ -202,7 +203,23 @@ enum { ...@@ -202,7 +203,23 @@ enum {
TD_DEF_MSG_TYPE(TDMT_VND_CREATE_SMA, "vnode-create-sma", NULL, NULL) 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_CANCEL_SMA, "vnode-cancel-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SUBMIT_RSMA, "vnode-submit-rsma", SSubmitReq, SSubmitRsp)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_TIMEOUT, "vnode-sync-timeout", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_PING, "vnode-sync-ping", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_PING_REPLY, "vnode-sync-ping-reply", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_CLIENT_REQUEST, "vnode-sync-client-request", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_CLIENT_REQUEST_REPLY, "vnode-sync-client-request-reply", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_REQUEST_VOTE, "vnode-sync-request-vote", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_REQUEST_VOTE_REPLY, "vnode-sync-request-vote-reply", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_APPEND_ENTRIES, "vnode-sync-append-entries", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_APPEND_ENTRIES_REPLY, "vnode-sync-append-entries-reply", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_NOOP, "vnode-sync-noop", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_UNKNOWN, "vnode-sync-unknown", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_COMMON_RESPONSE, "vnode-sync-common-response", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_APPLY_MSG, "vnode-sync-apply-msg", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_CONFIG_CHANGE, "vnode-sync-config-change", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SYNC_VNODE, "vnode-sync-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_SYNC_VNODE, "vnode-sync-vnode", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_ALTER_VNODE, "vnode-alter-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_ALTER_VNODE, "vnode-alter-vnode", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_COMPACT_VNODE, "vnode-compact-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_COMPACT_VNODE, "vnode-compact-vnode", NULL, NULL)
......
include/common/tname.h
浏览文件 @ 2393e536
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#ifndef _TD_COMMON_NAME_H_ #ifndef _TD_COMMON_NAME_H_
#define _TD_COMMON_NAME_H_ #define _TD_COMMON_NAME_H_
#include "tarray.h"
#include "tdef.h" #include "tdef.h"
#ifdef __cplusplus #ifdef __cplusplus
...@@ -62,9 +63,21 @@ int32_t tNameSetAcctId(SName* dst, int32_t acctId); ...@@ -62,9 +63,21 @@ int32_t tNameSetAcctId(SName* dst, int32_t acctId);
bool tNameDBNameEqual(SName* left, SName* right); bool tNameDBNameEqual(SName* left, SName* right);
typedef struct {
// input
SArray* tags; // element is SSmlKv
const char* sTableName; // super table name
uint8_t sTableNameLen; // the length of super table name
// output
char* childTableName; // must have size of TSDB_TABLE_NAME_LEN;
uint64_t uid; // child table uid, may be useful
} RandTableName;
void buildChildTableName(RandTableName* rName);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /*_TD_COMMON_NAME_H_*/ #endif /*_TD_COMMON_NAME_H_*/
include/common/trow.h
浏览文件 @ 2393e536
此差异已折叠。
include/common/tschema.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
/*
* 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_SCHEMA_H_
#define _TD_COMMON_SCHEMA_H_
#include "os.h"
#include "tarray.h"
#include "ttypes.h"
#ifdef __cplusplus
extern "C" {
#endif
#if 0
typedef struct STColumn {
/// column name
char *cname;
union {
/// for encode purpose
uint64_t info;
struct {
uint64_t sma : 1;
/// column data type
uint64_t type : 7;
/// column id
uint64_t cid : 16;
/// max bytes of the column
uint64_t bytes : 32;
/// reserved
uint64_t reserve : 8;
};
};
/// comment about the column
char *comment;
} STColumn;
typedef struct STSchema {
/// schema version
uint16_t sver;
/// number of columns
uint16_t ncols;
/// sma attributes
struct {
bool sma;
SArray *smaArray;
};
/// column info
STColumn cols[];
} STSchema;
typedef struct {
uint64_t size;
STSchema *pSchema;
} STShemaBuilder;
#define tSchemaBuilderInit(target, capacity) \
{ .size = (capacity), .pSchema = (target) }
void tSchemaBuilderSetSver(STShemaBuilder *pSchemaBuilder, uint16_t sver);
void tSchemaBuilderSetSMA(bool sma, SArray *smaArray);
int32_t tSchemaBuilderPutColumn(char *cname, bool sma, uint8_t type, col_id_t cid, uint32_t bytes, char *comment);
#endif
#ifdef __cplusplus
}
#endif
#endif /*_TD_COMMON_SCHEMA_H_*/
\ No newline at end of file
include/common/ttime.h
浏览文件 @ 2393e536
...@@ -59,10 +59,11 @@ static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) { ...@@ -59,10 +59,11 @@ static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) {
* precision == TSDB_TIME_PRECISION_NANO, it returns timestamp in nanosecond. * precision == TSDB_TIME_PRECISION_NANO, it returns timestamp in nanosecond.
*/ */
static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) { static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
int64_t factor = (precision == TSDB_TIME_PRECISION_MILLI) ? 1000 : int64_t factor = (precision == TSDB_TIME_PRECISION_MILLI) ? 1000
(precision == TSDB_TIME_PRECISION_MICRO) ? 1000000 : 1000000000; : (precision == TSDB_TIME_PRECISION_MICRO) ? 1000000
time_t t = taosTime(NULL); : 1000000000;
struct tm * tm= taosLocalTime(&t, NULL); time_t t = taosTime(NULL);
struct tm* tm = taosLocalTime(&t, NULL);
tm->tm_hour = 0; tm->tm_hour = 0;
tm->tm_min = 0; tm->tm_min = 0;
tm->tm_sec = 0; tm->tm_sec = 0;
...@@ -79,13 +80,13 @@ int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* durati ...@@ -79,13 +80,13 @@ int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* durati
int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t dayligth); int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t dayligth);
void deltaToUtcInitOnce(); void deltaToUtcInitOnce();
char getPrecisionUnit(int32_t precision); char getPrecisionUnit(int32_t precision);
int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision); int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision);
int64_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit); int64_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit);
int32_t convertStringToTimestamp(int16_t type, char *inputData, int64_t timePrec, int64_t *timeVal); int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec, int64_t* timeVal);
void taosFormatUtcTime(char *buf, int32_t bufLen, int64_t time, int32_t precision); void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t time, int32_t precision);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/common/ttokendef.h
浏览文件 @ 2393e536
此差异已折叠。
include/common/ttypes.h
浏览文件 @ 2393e536
...@@ -50,6 +50,7 @@ typedef struct { ...@@ -50,6 +50,7 @@ typedef struct {
#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_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR) || ((t) == TSDB_DATA_TYPE_JSON)) #define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR) || ((t) == TSDB_DATA_TYPE_JSON))
#define IS_STR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_VARCHAR) || ((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))
...@@ -186,14 +187,14 @@ typedef struct { ...@@ -186,14 +187,14 @@ typedef struct {
#define IS_NUMERIC_TYPE(_t) ((IS_SIGNED_NUMERIC_TYPE(_t)) || (IS_UNSIGNED_NUMERIC_TYPE(_t)) || (IS_FLOAT_TYPE(_t))) #define IS_NUMERIC_TYPE(_t) ((IS_SIGNED_NUMERIC_TYPE(_t)) || (IS_UNSIGNED_NUMERIC_TYPE(_t)) || (IS_FLOAT_TYPE(_t)))
#define IS_MATHABLE_TYPE(_t) (IS_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL) || (_t) == (TSDB_DATA_TYPE_TIMESTAMP)) #define IS_MATHABLE_TYPE(_t) (IS_NUMERIC_TYPE(_t) || (_t) == (TSDB_DATA_TYPE_BOOL) || (_t) == (TSDB_DATA_TYPE_TIMESTAMP))
#define IS_VALID_TINYINT(_t) ((_t) > INT8_MIN && (_t) <= INT8_MAX) #define IS_VALID_TINYINT(_t) ((_t) >= INT8_MIN && (_t) <= INT8_MAX)
#define IS_VALID_SMALLINT(_t) ((_t) > INT16_MIN && (_t) <= INT16_MAX) #define IS_VALID_SMALLINT(_t) ((_t) >= INT16_MIN && (_t) <= INT16_MAX)
#define IS_VALID_INT(_t) ((_t) > INT32_MIN && (_t) <= INT32_MAX) #define IS_VALID_INT(_t) ((_t) >= INT32_MIN && (_t) <= INT32_MAX)
#define IS_VALID_BIGINT(_t) ((_t) > INT64_MIN && (_t) <= INT64_MAX) #define IS_VALID_BIGINT(_t) ((_t) >= INT64_MIN && (_t) <= INT64_MAX)
#define IS_VALID_UTINYINT(_t) ((_t) >= 0 && (_t) < UINT8_MAX) #define IS_VALID_UTINYINT(_t) ((_t) >= 0 && (_t) <= UINT8_MAX)
#define IS_VALID_USMALLINT(_t) ((_t) >= 0 && (_t) < UINT16_MAX) #define IS_VALID_USMALLINT(_t) ((_t) >= 0 && (_t) <= UINT16_MAX)
#define IS_VALID_UINT(_t) ((_t) >= 0 && (_t) < UINT32_MAX) #define IS_VALID_UINT(_t) ((_t) >= 0 && (_t) <= UINT32_MAX)
#define IS_VALID_UBIGINT(_t) ((_t) >= 0 && (_t) < UINT64_MAX) #define IS_VALID_UBIGINT(_t) ((_t) >= 0 && (_t) <= UINT64_MAX)
#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)
......
include/common/tvariant.h
浏览文件 @ 2393e536
...@@ -36,12 +36,11 @@ typedef struct SVariant { ...@@ -36,12 +36,11 @@ typedef struct SVariant {
}; };
} 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);
int32_t toUInteger(const char *z, int32_t n, int32_t base, uint64_t *value);
bool taosVariantIsValid(SVariant *pVar); bool taosVariantIsValid(SVariant *pVar);
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);
void taosVariantDestroy(SVariant *pV); void taosVariantDestroy(SVariant *pV);
...@@ -59,10 +58,10 @@ int32_t taosVariantDumpEx(SVariant *pVariant, char *payload, int16_t type, bool ...@@ -59,10 +58,10 @@ int32_t taosVariantDumpEx(SVariant *pVariant, char *payload, int16_t type, bool
#endif #endif
int32_t taosVariantTypeSetType(SVariant *pVariant, char type); int32_t taosVariantTypeSetType(SVariant *pVariant, char type);
char * taosVariantGet(SVariant *pVar, int32_t type); char *taosVariantGet(SVariant *pVar, int32_t type);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /*_TD_COMMON_VARIANT_H_*/ #endif /*_TD_COMMON_VARIANT_H_*/
include/dnode/bnode/bnode.h
浏览文件 @ 2393e536
...@@ -26,6 +26,9 @@ extern "C" { ...@@ -26,6 +26,9 @@ extern "C" {
typedef struct SBnode SBnode; typedef struct SBnode SBnode;
typedef struct { typedef struct {
#ifdef WINDOWS
size_t avoidCompilationErrors;
#endif
} SBnodeLoad; } SBnodeLoad;
typedef struct { typedef struct {
......
include/dnode/mgmt/dnode.h
浏览文件 @ 2393e536
...@@ -22,66 +22,28 @@ ...@@ -22,66 +22,28 @@
extern "C" { extern "C" {
#endif #endif
/* ------------------------ TYPES EXPOSED ---------------- */
typedef struct SDnode SDnode;
/** /**
* @brief Initialize the environment * @brief Initialize the dnode
* *
* @param rtype for internal debug usage, default is 0
* @return int32_t 0 for success and -1 for failure * @return int32_t 0 for success and -1 for failure
*/ */
int32_t dmInit(); int32_t dmInit(int8_t rtype);
/** /**
* @brief Clear the environment * @brief Cleanup the dnode
*/ */
void dmCleanup(); void dmCleanup();
/* ------------------------ SDnode ----------------------- */
typedef struct {
int32_t numOfSupportVnodes;
uint16_t serverPort;
char dataDir[PATH_MAX];
char localEp[TSDB_EP_LEN];
char localFqdn[TSDB_FQDN_LEN];
char firstEp[TSDB_EP_LEN];
char secondEp[TSDB_EP_LEN];
SDiskCfg *disks;
int32_t numOfDisks;
int8_t ntype;
} SDnodeOpt;
typedef enum { DND_EVENT_START = 0, DND_EVENT_STOP = 1, DND_EVENT_CHILD = 2 } EDndEvent;
/** /**
* @brief Initialize and start the dnode. * @brief Run dnode.
*
* @param pOption Option of the dnode.
* @return SDnode* The dnode object.
*/ */
SDnode *dmCreate(const SDnodeOpt *pOption); int32_t dmRun();
/** /**
* @brief Stop and cleanup the dnode. * @brief Stop dnode.
*
* @param pDnode The dnode object to close.
*/
void dmClose(SDnode *pDnode);
/**
* @brief Run dnode until specific event is receive.
*
* @param pDnode The dnode object to run.
*/
int32_t dmRun(SDnode *pDnode);
/**
* @brief Handle event in the dnode.
*
* @param pDnode The dnode object to close.
* @param event The event to handle.
*/ */
void dmSetEvent(SDnode *pDnode, EDndEvent event); void dmStop();
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/dnode/mnode/mnode.h
浏览文件 @ 2393e536
...@@ -88,7 +88,7 @@ int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad); ...@@ -88,7 +88,7 @@ int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad);
* @param pMsg The request msg. * @param pMsg The request msg.
* @return int32_t 0 for success, -1 for failure. * @return int32_t 0 for success, -1 for failure.
*/ */
int32_t mndProcessMsg(SNodeMsg *pMsg); int32_t mndProcessMsg(SRpcMsg *pMsg);
/** /**
* @brief Generate machine code * @brief Generate machine code
......
include/dnode/mnode/sdb/sdb.h
浏览文件 @ 2393e536
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
#include "os.h" #include "os.h"
#include "thash.h"
#include "tlockfree.h"
#include "tlog.h"
#include "tmsg.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -92,14 +97,19 @@ extern "C" { ...@@ -92,14 +97,19 @@ extern "C" {
typedef struct SMnode SMnode; typedef struct SMnode SMnode;
typedef struct SSdbRaw SSdbRaw; typedef struct SSdbRaw SSdbRaw;
typedef struct SSdbRow SSdbRow; typedef struct SSdbRow SSdbRow;
typedef enum { SDB_KEY_BINARY = 1, SDB_KEY_INT32 = 2, SDB_KEY_INT64 = 3 } EKeyType;
typedef enum {
SDB_KEY_BINARY = 1,
SDB_KEY_INT32 = 2,
SDB_KEY_INT64 = 3,
} EKeyType;
typedef enum { typedef enum {
SDB_STATUS_INIT = 0, SDB_STATUS_INIT = 0,
SDB_STATUS_CREATING = 1, SDB_STATUS_CREATING = 1,
SDB_STATUS_UPDATING = 2, SDB_STATUS_DROPPING = 2,
SDB_STATUS_DROPPING = 3, SDB_STATUS_DROPPED = 3,
SDB_STATUS_READY = 4, SDB_STATUS_READY = 4,
SDB_STATUS_DROPPED = 5
} ESdbStatus; } ESdbStatus;
typedef enum { typedef enum {
...@@ -129,7 +139,7 @@ typedef enum { ...@@ -129,7 +139,7 @@ typedef enum {
typedef struct SSdb SSdb; typedef struct SSdb SSdb;
typedef int32_t (*SdbInsertFp)(SSdb *pSdb, void *pObj); typedef int32_t (*SdbInsertFp)(SSdb *pSdb, void *pObj);
typedef int32_t (*SdbUpdateFp)(SSdb *pSdb, void *pSrcObj, void *pDstObj); typedef int32_t (*SdbUpdateFp)(SSdb *pSdb, void *pSrcObj, void *pDstObj);
typedef int32_t (*SdbDeleteFp)(SSdb *pSdb, void *pObj); typedef int32_t (*SdbDeleteFp)(SSdb *pSdb, void *pObj, bool callFunc);
typedef int32_t (*SdbDeployFp)(SMnode *pMnode); typedef int32_t (*SdbDeployFp)(SMnode *pMnode);
typedef SSdbRow *(*SdbDecodeFp)(SSdbRaw *pRaw); typedef SSdbRow *(*SdbDecodeFp)(SSdbRaw *pRaw);
typedef SSdbRaw *(*SdbEncodeFp)(void *pObj); typedef SSdbRaw *(*SdbEncodeFp)(void *pObj);
...@@ -215,7 +225,7 @@ int32_t sdbWrite(SSdb *pSdb, SSdbRaw *pRaw); ...@@ -215,7 +225,7 @@ int32_t sdbWrite(SSdb *pSdb, SSdbRaw *pRaw);
* @param pRaw The raw data. * @param pRaw The raw data.
* @return int32_t 0 for success, -1 for failure. * @return int32_t 0 for success, -1 for failure.
*/ */
int32_t sdbWriteNotFree(SSdb *pSdb, SSdbRaw *pRaw); int32_t sdbWriteWithoutFree(SSdb *pSdb, SSdbRaw *pRaw);
/** /**
* @brief Acquire a row from sdb * @brief Acquire a row from sdb
...@@ -320,9 +330,28 @@ int32_t sdbGetRawSoftVer(SSdbRaw *pRaw, int8_t *sver); ...@@ -320,9 +330,28 @@ int32_t sdbGetRawSoftVer(SSdbRaw *pRaw, int8_t *sver);
int32_t sdbGetRawTotalSize(SSdbRaw *pRaw); int32_t sdbGetRawTotalSize(SSdbRaw *pRaw);
SSdbRow *sdbAllocRow(int32_t objSize); SSdbRow *sdbAllocRow(int32_t objSize);
void sdbFreeRow(SSdb *pSdb, SSdbRow *pRow);
void *sdbGetRowObj(SSdbRow *pRow); void *sdbGetRowObj(SSdbRow *pRow);
typedef struct SSdb {
SMnode *pMnode;
char *currDir;
char *syncDir;
char *tmpDir;
int64_t lastCommitVer;
int64_t curVer;
int64_t tableVer[SDB_MAX];
int64_t maxId[SDB_MAX];
EKeyType keyTypes[SDB_MAX];
SHashObj *hashObjs[SDB_MAX];
SRWLatch locks[SDB_MAX];
SdbInsertFp insertFps[SDB_MAX];
SdbUpdateFp updateFps[SDB_MAX];
SdbDeleteFp deleteFps[SDB_MAX];
SdbDeployFp deployFps[SDB_MAX];
SdbEncodeFp encodeFps[SDB_MAX];
SdbDecodeFp decodeFps[SDB_MAX];
} SSdb;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
include/libs/catalog/catalog.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/executor/dataSinkMgt.h
浏览文件 @ 2393e536
...@@ -45,6 +45,7 @@ typedef struct SInputData { ...@@ -45,6 +45,7 @@ typedef struct SInputData {
typedef struct SOutputData { typedef struct SOutputData {
int32_t numOfRows; int32_t numOfRows;
int32_t numOfCols;
int8_t compressed; int8_t compressed;
char* pData; char* pData;
bool queryEnd; bool queryEnd;
......
include/libs/executor/executor.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/function/function.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/function/functionMgt.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/function/tudf.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
include/libs/index/index.h
浏览文件 @ 2393e536
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define _TD_INDEX_H_ #define _TD_INDEX_H_
#include "os.h" #include "os.h"
#include "taoserror.h"
#include "tarray.h" #include "tarray.h"
#ifdef __cplusplus #ifdef __cplusplus
...@@ -41,11 +42,23 @@ typedef enum { ...@@ -41,11 +42,23 @@ typedef enum {
UPDATE_VALUE, // update index column value UPDATE_VALUE, // update index column value
ADD_INDEX, // add index on specify column ADD_INDEX, // add index on specify column
DROP_INDEX, // drop existed index DROP_INDEX, // drop existed index
DROP_SATBLE // drop stable DROP_SATBLE, // drop stable
DEFAULT // query
} SIndexOperOnColumn; } SIndexOperOnColumn;
typedef enum { MUST = 0, SHOULD = 1, NOT = 2 } EIndexOperatorType; typedef enum { MUST = 0, SHOULD, NOT } EIndexOperatorType;
typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2, QUERY_REGEX = 3, QUERY_RANGE = 4 } EIndexQueryType; typedef enum {
QUERY_TERM = 0,
QUERY_PREFIX,
QUERY_SUFFIX,
QUERY_REGEX,
QUERY_LESS_THAN,
QUERY_LESS_EQUAL,
QUERY_GREATER_THAN,
QUERY_GREATER_EQUAL,
QUERY_RANGE,
QUERY_MAX
} EIndexQueryType;
/* /*
* create multi query * create multi query
......
include/libs/nodes/cmdnodes.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/nodes/nodes.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/nodes/plannodes.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/nodes/querynodes.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/parser/parser.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/planner/planner.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/qcom/query.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/scalar/scalar.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/scheduler/scheduler.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/stream/tstream.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/stream/tstreamUpdate.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
include/libs/sync/sync.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/sync/syncTools.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
include/libs/transport/trpc.h
浏览文件 @ 2393e536
此差异已折叠。
include/libs/wal/wal.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/os.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osAtomic.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osDef.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osDir.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osEnv.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osFile.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osLz4.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osMath.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osMemory.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osSemaphore.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osSocket.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osString.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osSystem.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osThread.h
浏览文件 @ 2393e536
此差异已折叠。
include/os/osTime.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/talgo.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/taoserror.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tarray.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tcache.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tcoding.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tconfig.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tdef.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tencode.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/thash.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tjson.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tlog.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tprocess.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
include/util/tqueue.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/tskiplist.h
浏览文件 @ 2393e536
此差异已折叠。
include/util/ttimer.h
浏览文件 @ 2393e536
此差异已折叠。
packaging/cfg/nginxd.service 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/cfg/taos.cfg 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/cfg/taosd.service 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/cfg/tarbitratord.service 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/check_package.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/DEBIAN/control 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/DEBIAN/postinst 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/DEBIAN/postrm 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/DEBIAN/preinst 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/DEBIAN/prerm 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/makedeb.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/taosd 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/deb/tarbitratord 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/Dockerfile 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/README.md 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/bin/entrypoint.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/bin/env-to-cfg 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/docker-compose.yml 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/dockerManifest.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/dockerbuild.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/docker/dockerbuildi.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/release.bat 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/release.sh
浏览文件 @ 2393e536
此差异已折叠。
packaging/rpm/makerpm.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/rpm/taosd 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/rpm/tarbitratord 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/rpm/tdengine.spec 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/check_os.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/get_client.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/get_os.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/get_version.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/install_arbi.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/install_client.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/makearbi.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/makeclient.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/makepkg.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/post.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/preun.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/release_note 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/remove_arbi.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/remove_client.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/repair_link.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/run_taosd_and_taosadapter.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/set_core.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/startPre.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
packaging/tools/taosd-dump-cfg.gdb 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/client/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/client/inc/clientInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/client/inc/clientStmt.h
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientEnv.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientHb.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientImpl.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientMain.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientSml.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/clientStmt.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/taos.def 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/taos.rc.in 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/client/src/tmq.c
浏览文件 @ 2393e536
此差异已折叠。
source/client/test/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/client/test/clientTests.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/client/test/smlTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/client/test/tmqTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/common/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/systable.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tdatablock.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tdataformat.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tglobal.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tmsg.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tmsgcb.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tname.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/trow.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/ttime.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/ttypes.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/src/tvariant.c
浏览文件 @ 2393e536
此差异已折叠。
source/common/test/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/common/test/commonTests.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/common/test/dataformatTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/common/test/trowTest.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/test/tschemaTest.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeBigint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeBinary.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeBlob.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeBool.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeDecimal.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeDouble.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeFloat.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeInt.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeJson.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeLongblob.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeNchar.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeNull.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeSmallint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeTimestamp.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeTinyint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeUBigint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeUSmallint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeUTinyint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeUint.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/common/type/typeVarchar.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/exe/dmMain.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/implement/inc/dmImp.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/implement/src/dmHandle.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/implement/src/dmMonitor.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/implement/src/dmObj.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/interface/inc/dmDef.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/interface/inc/dmInt.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/mgmt/mgmt_dnode/CMakeLists.txt 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/mgmt_dnode/src/dmInt.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/mgmt_dnode/src/dmMonitor.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/node_mgmt/inc/dmMgmt.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/node_mgmt/src/dmEnv.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/node_mgmt/src/dmMgmt.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/node_mgmt/src/dmProc.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mgmt/node_util/inc/dmUtil.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/impl/src/mnode.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/impl/test/sdb/CMakeLists.txt 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/impl/test/sdb/sdbTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/impl/test/trans/trans2.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/sdb/inc/sdbInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/sdb/src/sdb.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/sdb/src/sdbRaw.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/mnode/sdb/src/sdbRow.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/qnode/inc/qndInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/qnode/src/qnode.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/snode/src/snode.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/inc/vnode.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/inc/meta.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/inc/sma.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/inc/tq.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/inc/tsdb.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/inc/vnd.h
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/meta/metaBDBImpl.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/meta/metaCommit.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/meta/metaEntry.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/meta/metaQuery.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/meta/metaSma.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/meta/metaTDBImpl.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/sma/sma.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/sma/smaEnv.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/sma/smaOpen.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/sma/smaRollup.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/sma/smaTDBImpl.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/sma/smaTimeRange.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tq/tq.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tq/tqPush.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tq/tqRead.c
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbCompact.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbMain.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbMemTable2.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbOpen.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbOptions.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/vnd/vnodeBufferPool.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/dnode/vnode/src/vnd/vnodeSync.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/libs/catalog/src/catalog.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/command/src/command.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/command/src/explain.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/inc/executil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/inc/tfill.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/inc/tsort.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/executil.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/executor.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/joinoperator.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/sortoperator.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/tfill.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/timewindowoperator.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/src/tsort.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/executor/test/index_executor_tests.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/inc/builtins.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/inc/fnLog.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/inc/tudf.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/function/inc/tudfInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/inc/udfc.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/src/builtins.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/src/texpr.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/src/tudf.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/src/udfd.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/test/runUdf.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/test/udf1.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/function/test/udf2.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/inc/indexCache.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/inc/indexComm.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/inc/indexFst.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/inc/indexInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/inc/indexUtil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/src/index.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/src/indexCache.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/src/indexComm.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/src/indexFst.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/src/indexTfile.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/test/fstTest.cc
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/test/jsonUT.cc
浏览文件 @ 2393e536
此差异已折叠。
source/libs/index/test/utilUT.cc
浏览文件 @ 2393e536
此差异已折叠。
source/libs/monitor/src/monMsg.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/nodes/inc/nodesUtil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/inc/parAst.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/inc/parInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/inc/parToken.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/inc/parUtil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/inc/sql.y
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/src/parAuthenticator.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/src/parInsert.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/src/parUtil.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/src/parser.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/src/sql.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parExplainToSyncdbTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parInitialATest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parInitialCTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parSelectTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parShowToUse.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parTestUtil.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parTestUtil.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/parser/test/parserAstTest.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/planner/inc/planInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/src/planUtil.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/src/planner.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planBasicTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planDistinctTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planGroupByTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planIntervalTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planJoinTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planLimitTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planOptimizeTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planOrderByTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planPartByTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planSessionTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planSetOpTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/planSubqueryTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/planner/test/plannerTest.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/qcom/src/queryUtil.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/qcom/src/querymsg.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/qworker/src/qworker.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/inc/filterInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/inc/sclInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/inc/sclvector.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/src/filter.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/src/scalar.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/src/sclfunc.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/scalar/src/sclvector.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/stream/src/tstream.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/stream/src/tstreamUpdate.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/stream/test/tstreamUpdateTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncEnv.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncIndexMgr.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncMessage.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncRaftLog.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncRespMgr.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncSnapshot.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/inc/syncUtil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncCommit.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncElection.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncEnv.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncIO.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncIndexMgr.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncMain.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncMessage.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncRaftCfg.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncRaftLog.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncRespMgr.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/src/syncUtil.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/syncApplyMsgTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/syncConfigChangeTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/syncElectTest2.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/sync/test/syncElectTest3.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/sync/test/syncRaftCfgTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/syncReplicateTest3.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/sync/test/syncRespMgrTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/syncTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/libs/sync/test/test.sh 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/inc/tdb.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbBtree.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbDb.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbEnv.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbOs.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbPCache.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbPage.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbPager.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/db/tdbUtil.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/inc/tdbBtree.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/tdb/src/inc/tdbInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/src/inc/tdbPage.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/tdb/src/inc/tdbPager.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/libs/tdb/src/inc/tdbUtil.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tdb/test/tdbTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/libs/tfs/src/tfs.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/transport/src/trans.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/inc/walInt.h
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/src/walMeta.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/src/walMgmt.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/src/walRead.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/src/walSeek.c
浏览文件 @ 2393e536
此差异已折叠。
source/libs/wal/src/walWrite.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osAtomic.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osDir.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osEnv.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osFile.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osLocale.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osLz4.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osMemory.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osProc.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osRand.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSemaphore.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osShm.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSignal.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSleep.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSocket.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osString.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osStrptime.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSysinfo.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osSystem.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osThread.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osTime.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osTimer.c
浏览文件 @ 2393e536
此差异已折叠。
source/os/src/osTimezone.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/talgo.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tarray.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tbloomfilter.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tcache.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tcompare.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tconfig.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tencode.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tenv.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/terror.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/thash.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/thashutil.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tjson.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tlog.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tprocess.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/util/src/tqueue.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tscalablebf.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tsched.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tskiplist.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/ttimer.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tuuid.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/src/tworker.c
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/bloomFilterTest.cpp 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/cacheTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/cfgTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/encodeTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/freelistTest.cpp 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
source/util/test/procTest.cpp
浏览文件 @ 2393e536
此差异已折叠。
source/util/test/trefTest.c
浏览文件 @ 2393e536
此差异已折叠。
tests/parallel_test/collect_cases.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/parallel_test/container_build.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/parallel_test/run.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/parallel_test/run_case.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/parallel_test/run_container.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/pytest/insert/binary.py
浏览文件 @ 2393e536
此差异已折叠。
tests/pytest/util/dnodes.py
浏览文件 @ 2393e536
此差异已折叠。
tests/pytest/util/sql.py
浏览文件 @ 2393e536
此差异已折叠。
tests/requirements.txt 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/api/batchprepare.c
浏览文件 @ 2393e536
此差异已折叠。
tests/script/api/makefile
浏览文件 @ 2393e536
此差异已折叠。
tests/script/general/stable/testSuite.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/general/user/authority.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/general/user/user_create.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/jenkins/basic.txt
浏览文件 @ 2393e536
此差异已折叠。
tests/script/runAllSimCases.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/script/sh/checkValgrind.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/script/sh/copy_udf.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/script/sh/deploy.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/script/sh/exec.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/script/test.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tmp/data.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/db/basic6.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/db/taosdlog.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/insert/basic0.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/query/crash_sql.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/query/explain.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/query/scalarNull.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/query/session.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/query/udf.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/show/basic.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/sma/rsmaCreateInsertQuery.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/snode/basic1.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/stable/alter1.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/stable/disk.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/table/basic1.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/basic1.sim
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic1Of2Cons.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic2.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic2Of2Cons.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic2Of2ConsOverlap.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic3.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic3Of2Cons.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic4.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/basic4Of2Cons.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/clearConsume.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/consume.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/insertDataV1.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/insertDataV4.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/insertFixedDataV2.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/insertFixedDataV4.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/multiTopic.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/oneTopic.sim 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tmq/topic.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/trans/create_db.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tstream/basic0.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/tstream/basic1.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/user/privilege1.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/user/privilege2.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/script/tsim/valgrind/checkError.sim 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/taosShell.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/taosShellError.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/taosShellNetChk.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/taosdMonitor.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/taosdlog.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/telemetry.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/udfTest.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/0-others/user_control.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/1-insert/insertWithMoreVgroup.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/1-insert/manyVgroups.json 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/1-insert/mutipythonnodebugtaosd.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/Now.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/Timediff.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/To_iso8601.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/To_unixtimestamp.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/Today.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/abs.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/arccos.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/arcsin.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/arctan.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/cast.py
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/ceil.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/char_length.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/concat.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/concat_ws.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/cos.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/count.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/diff.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/distinct.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/floor.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/join.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/last.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/length.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/log.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/lower.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/ltrim.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/max.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/min.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/nestedQuery.py 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/pow.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/query_cols_tags_and_or.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/round.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/rtrim.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/sin.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/smaTest.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/sqrt.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/substr.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/sum.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/tan.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/timetruncate.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/timezone.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/union.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/union2.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/union3.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/union4.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/2-query/upper.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/7-tmq/basic5.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/7-tmq/subscribeDb.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/7-tmq/subscribeDb1.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/99-TDcase/TD-15517.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/99-TDcase/TD-15554.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/99-TDcase/TD-15557.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/99-TDcase/TD-15563.py 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/fulltest.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/system-test/insert.json 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tests/test-all.sh
浏览文件 @ 2393e536
此差异已折叠。
tests/test/c/create_table.c
浏览文件 @ 2393e536
此差异已折叠。
tests/test/c/tmqDemo.c
浏览文件 @ 2393e536
此差异已折叠。
tests/test/c/tmqSim.c
浏览文件 @ 2393e536
此差异已折叠。
tests/tsim/src/simExe.c
浏览文件 @ 2393e536
此差异已折叠。
tests/tsim/src/simSystem.c
浏览文件 @ 2393e536
此差异已折叠。
tests/unit-test/test.sh 0 → 100755
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/CMakeLists.txt
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/inc/shell.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/inc/shellCommand.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/inc/shellInt.h 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/inc/syncMsg.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/inc/tsync.h 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/src/backup/shellCheck.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/src/backup/shellDarwin.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/src/backup/shellImport.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/src/backup/shellWindows.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
tools/shell/src/shellArguments.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/shellCommand.c
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/shellEngine.c
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/shellMain.c
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/shellNettest.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/shellUtil.c 0 → 100644
浏览文件 @ 2393e536
此差异已折叠。
tools/shell/src/tnettest.c 已删除 100644 → 0
浏览文件 @ 1fe2abc8
此差异已折叠。
taos-tools @ 0aad27d7
比较 bf6c7669...0aad27d7
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或