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

fix: commit id string have return line

This commit is contained in:
Alex Duan 2025-02-11 11:26:24 +08:00
parent d0d97ce892
commit 6df1d5ad05
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/taos-tools/inc/dump.h
View File

@ -65,18 +65,6 @@
#endif #endif
#endif #endif
// get taosdump commit number version
#ifndef TAOSDUMP_COMMIT_SHA1
#define TAOSDUMP_COMMIT_SHA1 "unknown"
#endif
#ifndef TAOSDUMP_TAG
#define TAOSDUMP_TAG "0.1.0"
#endif
#ifndef TAOSDUMP_STATUS
#define TAOSDUMP_STATUS "unknown"
#endif
// use 256 as normal buffer length // use 256 as normal buffer length
#define BUFFER_LEN 256 #define BUFFER_LEN 256

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

@ -56,14 +56,12 @@ IF(GIT_FOUND)
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND git log -1 --format=%H COMMAND git log -1 --format=%H
WORKING_DIRECTORY ${TD_COMMUNITY_DIR} WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_ID OUTPUT_VARIABLE GIT_COMMIT_ID
) )
EXECUTE_PROCESS(
COMMAND git log -1 --format=%H STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
WORKING_DIRECTORY ${TD_COMMUNITY_DIR} STRING(SUBSTRING "${TAOSDUMP_COMMIT_ID}" 0 40 GIT_COMMIT_ID)
OUTPUT_VARIABLE TAOSDUMP_COMMIT_ID
)
# show # show
MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}") MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}") MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")

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

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

6
tools/taos-tools/src/taosdump.c
View File

@ -8919,8 +8919,8 @@ static int dumpExtraInfoHead(void *taos, FILE *fp) {
errno, strerror(errno)); errno, strerror(errno));
} }
char taostools_ver[] = TAOSDUMP_TAG; char taostools_ver[] = TD_VER_NUMBER;
char taosdump_commit[] = TAOSDUMP_COMMIT_SHA1; char taosdump_commit[] = TAOSDUMP_COMMIT_ID;
snprintf(buffer, BUFFER_LEN, "#!"CUS_PROMPT"dump_ver: %s_%s\n", snprintf(buffer, BUFFER_LEN, "#!"CUS_PROMPT"dump_ver: %s_%s\n",
taostools_ver, taosdump_commit); taostools_ver, taosdump_commit);
@ -9439,7 +9439,7 @@ static int dumpInDbs(const char *dbPath) {
} }
#endif #endif
int taosToolsMajorVer = atoi(TAOSDUMP_TAG); int taosToolsMajorVer = atoi(TD_VER_NUMBER);
if ((g_dumpInDataMajorVer > 1) && (1 == taosToolsMajorVer)) { if ((g_dumpInDataMajorVer > 1) && (1 == taosToolsMajorVer)) {
errorPrint("\tThe data file was generated by version %d\n" errorPrint("\tThe data file was generated by version %d\n"
"\tCannot be restored by current version: %d\n\n" "\tCannot be restored by current version: %d\n\n"