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

fix(sml): process space in the end if writing raw data in sml & change some log level #30306 

fix(sml): process space in the end if writing raw data in sml & change some log level
This commit is contained in:
WANG MINGMING 2025-03-21 10:46:20 +08:00 committed by GitHub
parent d72e545d64
commit 8cddd7ebfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientSmlTelnet.c
View File

@ -75,7 +75,7 @@ static int32_t smlProcessTagTelnet(SSmlHandle *info, char *data, char *sqlEnd){
const char *sql = data;
while (sql < sqlEnd) {
JUMP_SPACE(sql, sqlEnd)
if (unlikely(*sql == '\0')) break;
if (unlikely(*sql == '\0' || *sql == '\n')) break;
const char *key = sql;
size_t keyLen = 0;

2
source/util/src/tmempool.c
View File

@ -1029,7 +1029,7 @@ void mpUpdateSystemAvailableMemorySize() {
atomic_store_64(&tsCurrentAvailMemorySize, sysAvailSize);
uDebug("system available memory size: %" PRId64, sysAvailSize);
uTrace("system available memory size: %" PRId64, sysAvailSize);
}
void mpSchedTrim(int64_t* loopTimes) {

2
source/util/test/memPoolTest.cpp
View File

@ -729,7 +729,7 @@ int32_t mptGetMemPoolMaxMemSize(void* pHandle, int64_t* maxSize) {
}
if (TSDB_CODE_SUCCESS != code) {
uError("get system avaiable memory size failed, error: 0x%x", code);
uError("get system available memory size failed, error: 0x%x", code);
return code;
}

28
utils/test/c/sml_test.c
View File

@ -87,7 +87,8 @@ int smlProcess_telnet_Test() {
const char *sql1[] = {"sys.if.bytes.out 1479496100 1.3E0 host=web01 interface=eth0",
"sys.if.bytes.out 1479496101 1.3E1 interface=eth0 host=web01 ",
"sys.if.bytes.out 1479496102 1.3E3 network=tcp",
" sys.procs.running 1479496100 42 host=web01 "};
" sys.procs.running 1479496100 42 host=web01 ",
" newline 1479496100 42 host=web\n01 t=fsb\n "};
// for(int i = 0; i < 4; i++){
// strncpy(sql[i], sql1[i], 128);
@ -2355,12 +2356,35 @@ int sml_td17324_Test() {
return code;
}
int smlProcess_34114_Test() {
TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
TAOS_RES *pRes = taos_query(taos, "create database if not exists sml_34114_db schemaless 1");
taos_free_result(pRes);
pRes = taos_query(taos, "use sml_34114_db");
taos_free_result(pRes);
char *sql = {"sys.if.bytes.out 1479496100 1.3E0 host=web01 interface=eth0 \nsys.if.bytes.out 1479496101 1.3E1 interface=eth0 host=web01 "};
int32_t totalRows = 0;
pRes = taos_schemaless_insert_raw(taos, sql, strlen(sql), &totalRows, TSDB_SML_TELNET_PROTOCOL,
TSDB_SML_TIMESTAMP_NANO_SECONDS);
printf("%s result:%s\n", __FUNCTION__, taos_errstr(pRes));
int code = taos_errno(pRes);
taos_free_result(pRes);
taos_close(taos);
return code;
}
int main(int argc, char *argv[]) {
if (argc == 2) {
taos_options(TSDB_OPTION_CONFIGDIR, argv[1]);
}
int ret = smlProcess_json0_Test();
int ret = smlProcess_34114_Test();
ASSERT(!ret);
ret = smlProcess_json0_Test();
ASSERT(!ret);
ret = sml_ts5528_test();
ASSERT(!ret);