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

Merge branch 'mark/3.0' of https://github.com/taosdata/TDengine into mark/3.0

This commit is contained in:
wangmm0220 2024-03-04 14:58:26 +08:00
parent c7d115d8aa 828889a6d8
commit 5d2d8d5f48
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/client/src/clientSmlLine.c
View File

@ -485,8 +485,8 @@ int32_t smlParseInfluxString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLine
if (unlikely(IS_SPACE(tmp,escapeChar))) { if (unlikely(IS_SPACE(tmp,escapeChar))) {
break; break;
} }
if(unlikely(IS_SLASH_LETTER_IN_TAG_FIELD_KEY(sql))){ if(unlikely(IS_SLASH_LETTER_IN_TAG_FIELD_KEY(tmp))){
escapeChar = sql; escapeChar = tmp;
} }
tmp++; tmp++;
} }

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

@ -1079,7 +1079,7 @@ int sml_escape1_Test() {
ASSERT(taos_affected_rows(pRes) == 5); ASSERT(taos_affected_rows(pRes) == 5);
taos_free_result(pRes); taos_free_result(pRes);
pRes = taos_query(taos, "select * from stab order by _ts"); //check stable name pRes = taos_query(taos, "select * from stab"); //check stable name
ASSERT(pRes); ASSERT(pRes);
int fieldNum = taos_field_count(pRes); int fieldNum = taos_field_count(pRes);
ASSERT(fieldNum == 6); ASSERT(fieldNum == 6);
@ -1099,22 +1099,19 @@ int sml_escape1_Test() {
while ((row = taos_fetch_row(pRes)) != NULL) { while ((row = taos_fetch_row(pRes)) != NULL) {
int64_t ts = *(int64_t *)row[0]; int64_t ts = *(int64_t *)row[0];
if (rowIndex == 0) { if (ts == 1661943970000) {
ASSERT(ts == 1661943970000);
ASSERT(*(double *)row[1] == 3); ASSERT(*(double *)row[1] == 3);
ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0); ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0);
ASSERT(row[3] == NULL); ASSERT(row[3] == NULL);
ASSERT(strncmp(row[4], "1", sizeof("1") - 1) == 0); ASSERT(strncmp(row[4], "1", sizeof("1") - 1) == 0);
ASSERT(row[5] == NULL); ASSERT(row[5] == NULL);
}else if (rowIndex == 1) { }else if (ts == 1661943980000) {
ASSERT(ts == 1661943980000);
ASSERT(*(double *)row[1] == 3); ASSERT(*(double *)row[1] == 3);
ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0); ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0);
ASSERT(row[3] == NULL); ASSERT(row[3] == NULL);
ASSERT(row[4] == NULL); ASSERT(row[4] == NULL);
ASSERT(strncmp(row[5], "1\\", sizeof("1\\") - 1) == 0); ASSERT(strncmp(row[5], "1\\", sizeof("1\\") - 1) == 0);
}else if (rowIndex == 2) { }else if (ts == 1661943990000) {
ASSERT(ts == 1661943990000);
ASSERT(row[1] == NULL); ASSERT(row[1] == NULL);
ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0); ASSERT(strncmp(row[2], "32fw", sizeof("32fw") - 1) == 0);
ASSERT(*(double *)row[3] == 3); ASSERT(*(double *)row[3] == 3);