xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: SET function no dot error

This commit is contained in:
Alex Duan 2025-02-11 11:45:09 +08:00
parent 6df1d5ad05
commit f3e3d7d74c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/taos-tools/src/CMakeLists.txt
View File

@ -43,7 +43,7 @@ MESSAGE("collect --version show info:")
# version
IF (DEFINED TD_VER_NUMBER)
ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}")
MESSAGE("-- version:${TD_VER_NUMBER}")
MESSAGE(STATUS "version:${TD_VER_NUMBER}")
ELSE ()
# abort build
MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.")
@ -59,12 +59,12 @@ IF(GIT_FOUND)
OUTPUT_VARIABLE GIT_COMMIT_ID
)
STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
STRING(SUBSTRING "${TAOSDUMP_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
STRING(SUBSTRING "${GIT_COMMIT_ID}" 0 40 TAOSBENCHMARK_COMMIT_ID)
SET(TAOSDUMP_COMMIT_ID "${TAOSBENCHMARK_COMMIT_ID}")
# show
MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
MESSAGE(STATUS "taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
MESSAGE(STATUS "taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
# define
ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}")
ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_COMMIT_ID}")
@ -73,9 +73,9 @@ ELSE()
ENDIF (GIT_FOUND)
# build info
SET(BUILD_INFO, "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
SET(BUILD_INFO "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
ADD_DEFINITIONS(-DBUILD_INFO="${BUILD_INFO}")
MESSAGE("-- build:${BUILD_INFO}")
MESSAGE(STATUS "build:${BUILD_INFO}")
MESSAGE("")

2
tools/taos-tools/src/benchCommandOpt.c
View File

@ -30,7 +30,7 @@ char *g_aggreFunc[] = {"*", "count(*)", "avg(C0)", "sum(C0)",
void printVersion() {
// version, macro define in src/CMakeLists.txt
printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
printf("git: %s\n", TAOSBENCHMAR_COMMIT_ID);
printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
printf("build: %s\n", BUILD_INFO);
}