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

Merge branch 'enh/cv_optimize' of https://github.com/taosdata/TDengine into feat/stream_compression

This commit is contained in:
Hongze Cheng 2022-09-23 19:08:21 +08:00
parent f24c8fbe56 cac18913d5
commit ac0ac3a577
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/common/test/dataformatTest.cpp
View File

@ -134,11 +134,11 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) {
SColVal colVal = {0}; SColVal colVal = {0};
colVal.cid = PRIMARYKEY_TIMESTAMP_COL_ID + i; colVal.cid = PRIMARYKEY_TIMESTAMP_COL_ID + i;
if (strncasecmp(data[i], NONE_CSTR, NONE_LEN) == 0) { if (strncasecmp(data[i], NONE_CSTR, NONE_LEN) == 0) {
colVal.isNone = 1; colVal.flag = CV_FLAG_NONE;
taosArrayPush(*pArray, &colVal); taosArrayPush(*pArray, &colVal);
continue; continue;
} else if (strncasecmp(data[i], NULL_CSTR, NULL_LEN) == 0) { } else if (strncasecmp(data[i], NULL_CSTR, NULL_LEN) == 0) {
colVal.isNull = 1; colVal.flag = CV_FLAG_NULL;
taosArrayPush(*pArray, &colVal); taosArrayPush(*pArray, &colVal);
continue; continue;
} }
@ -205,11 +205,11 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) {
} }
int32_t debugPrintSColVal(SColVal *cv, int8_t type) { int32_t debugPrintSColVal(SColVal *cv, int8_t type) {
if (cv->isNone) { if (COL_VAL_IS_NONE(cv)) {
printf("None "); printf("None ");
return 0; return 0;
} }
if (cv->isNull) { if (COL_VAL_IS_NULL(cv)) {
printf("Null "); printf("Null ");
return 0; return 0;
} }
@ -299,11 +299,11 @@ void debugPrintTSRow(STSRow2 *row, STSchema *pTSchema, const char *tags, int32_t
static int32_t checkSColVal(const char *rawVal, SColVal *cv, int8_t type) { static int32_t checkSColVal(const char *rawVal, SColVal *cv, int8_t type) {
ASSERT(rawVal); ASSERT(rawVal);
if (cv->isNone) { if (COL_VAL_IS_NONE(cv)) {
EXPECT_STRCASEEQ(rawVal, NONE_CSTR); EXPECT_STRCASEEQ(rawVal, NONE_CSTR);
return 0; return 0;
} }
if (cv->isNull) { if (COL_VAL_IS_NULL(cv)) {
EXPECT_STRCASEEQ(rawVal, NULL_CSTR); EXPECT_STRCASEEQ(rawVal, NULL_CSTR);
return 0; return 0;
} }