From d9b3c638c3a2a7c5e299793faa1c57b8c3c9ced4 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 29 Mar 2023 21:03:39 +0800 Subject: [PATCH 1/4] fix:add assert for debug --- source/common/src/tdataformat.c | 3 +++ source/libs/parser/src/parInsertUtil.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 34808aa389..9632750a18 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -2453,6 +2453,9 @@ int32_t tColDataAddValueByDataBlock(SColData *pColData, int8_t type, int32_t byt code = tColDataAppendValueImpl[pColData->flag][CV_FLAG_NULL](pColData, NULL, 0); if (code) goto _exit; } else { + if(ASSERT(varDataTLen(data + offset) <= bytes)){ + uError("var data length invalid, varDataTLen(data + offset):%d <= bytes:%d", (int)varDataTLen(data + offset), bytes); + } code = tColDataAppendValueImpl[pColData->flag][CV_FLAG_VALUE](pColData, (uint8_t *)varDataVal(data + offset), varDataLen(data + offset)); } diff --git a/source/libs/parser/src/parInsertUtil.c b/source/libs/parser/src/parInsertUtil.c index 132a3b2618..bbe36e0c80 100644 --- a/source/libs/parser/src/parInsertUtil.c +++ b/source/libs/parser/src/parInsertUtil.c @@ -656,6 +656,9 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate } else { pStart += colLength[j]; } + if(ASSERT(pCol->nVal == numOfRows)){ + uError("tFields is null, pCol->nVal:%d != numOfRows:%d", pCol->nVal, numOfRows); + } } }else{ for (int i = 0; i < numFields; i++) { @@ -684,6 +687,9 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate } else { pStart += colLength[i]; } + if(ASSERT(pCol->nVal == numOfRows)){ + uError("tFields is not null, pCol->nVal:%d != numOfRows:%d", pCol->nVal, numOfRows); + } boundInfo->pColIndex[j] = -1; break; } From c1b4f941997c039d0bfa7de110551c3c689843ca Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 29 Mar 2023 22:12:13 +0800 Subject: [PATCH 2/4] fix:add assert for debug --- source/common/src/tdataformat.c | 2 ++ source/libs/parser/src/parInsertUtil.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 9632750a18..d6ab974c6c 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -2455,6 +2455,8 @@ int32_t tColDataAddValueByDataBlock(SColData *pColData, int8_t type, int32_t byt } else { if(ASSERT(varDataTLen(data + offset) <= bytes)){ uError("var data length invalid, varDataTLen(data + offset):%d <= bytes:%d", (int)varDataTLen(data + offset), bytes); + code = TSDB_CODE_INVALID_PARA; + goto _exit; } code = tColDataAppendValueImpl[pColData->flag][CV_FLAG_VALUE](pColData, (uint8_t *)varDataVal(data + offset), varDataLen(data + offset)); diff --git a/source/libs/parser/src/parInsertUtil.c b/source/libs/parser/src/parInsertUtil.c index bbe36e0c80..132a3b2618 100644 --- a/source/libs/parser/src/parInsertUtil.c +++ b/source/libs/parser/src/parInsertUtil.c @@ -656,9 +656,6 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate } else { pStart += colLength[j]; } - if(ASSERT(pCol->nVal == numOfRows)){ - uError("tFields is null, pCol->nVal:%d != numOfRows:%d", pCol->nVal, numOfRows); - } } }else{ for (int i = 0; i < numFields; i++) { @@ -687,9 +684,6 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate } else { pStart += colLength[i]; } - if(ASSERT(pCol->nVal == numOfRows)){ - uError("tFields is not null, pCol->nVal:%d != numOfRows:%d", pCol->nVal, numOfRows); - } boundInfo->pColIndex[j] = -1; break; } From f93efc8538f4c4eeebc8d5b0ae93492776b0ac7a Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 30 Mar 2023 09:21:34 +0800 Subject: [PATCH 3/4] fix:telemetry.py failed in windows --- tests/system-test/0-others/telemetry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/0-others/telemetry.py b/tests/system-test/0-others/telemetry.py index bc5d276faa..c62e3c2487 100644 --- a/tests/system-test/0-others/telemetry.py +++ b/tests/system-test/0-others/telemetry.py @@ -181,7 +181,7 @@ class TDTestCase: def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring tdSql.prepare() # time.sleep(2) - vgroups = "30" + vgroups = "8" sql = "create database db3 vgroups " + vgroups tdSql.query(sql) From 07171a01b4da0962919ddf8dca19e31181655520 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 30 Mar 2023 10:52:39 +0800 Subject: [PATCH 4/4] fix:taosdMonitor.py failed in windows --- tests/system-test/0-others/taosdMonitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/0-others/taosdMonitor.py b/tests/system-test/0-others/taosdMonitor.py index 944ff52d5b..195f1ba5bc 100644 --- a/tests/system-test/0-others/taosdMonitor.py +++ b/tests/system-test/0-others/taosdMonitor.py @@ -292,7 +292,7 @@ class TDTestCase: def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring tdSql.prepare() # time.sleep(2) - vgroups = "30" + vgroups = "8" sql = "create database db3 vgroups " + vgroups tdSql.query(sql) sql = "create table db3.stb (ts timestamp, f int) tags (t int)"