From 1f8a18d6459ecea15b6ca2b4ec9bcaceef3b2208 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 6 Jan 2025 16:32:02 +0800 Subject: [PATCH 1/2] test/tcs: fix UT for community edition --- source/libs/tcs/test/tcsTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/libs/tcs/test/tcsTest.cpp b/source/libs/tcs/test/tcsTest.cpp index 4b5afc5b85..40d9eac7a0 100644 --- a/source/libs/tcs/test/tcsTest.cpp +++ b/source/libs/tcs/test/tcsTest.cpp @@ -287,12 +287,12 @@ TEST(TcsTest, InterfaceNonBlobTest) { uint8_t *pBlock = NULL; code = tcsGetObjectBlock(object_name, 0, size, check, &pBlock); GTEST_ASSERT_EQ(code, 0); - - for (int i = 0; i < size / 2; ++i) { - GTEST_ASSERT_EQ(pBlock[i * 2], 0); - GTEST_ASSERT_EQ(pBlock[i * 2 + 1], 1); + if (pBlock) { + for (int i = 0; i < size / 2; ++i) { + GTEST_ASSERT_EQ(pBlock[i * 2], 0); + GTEST_ASSERT_EQ(pBlock[i * 2 + 1], 1); + } } - taosMemoryFree(pBlock); code = tcsGetObjectToFile(object_name, path_download); From ad8d38068abe7e58208731614e2901ea9fb0474e Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 6 Jan 2025 17:23:48 +0800 Subject: [PATCH 2/2] test/parser: fix UT for community parser --- .../parser/test/parAlterToBalanceTest.cpp | 15 +++++- source/libs/parser/test/parInitialCTest.cpp | 48 ++++++++++++++++--- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/source/libs/parser/test/parAlterToBalanceTest.cpp b/source/libs/parser/test/parAlterToBalanceTest.cpp index d25435913f..a81076557e 100644 --- a/source/libs/parser/test/parAlterToBalanceTest.cpp +++ b/source/libs/parser/test/parAlterToBalanceTest.cpp @@ -196,14 +196,23 @@ TEST_F(ParserInitialATest, alterDatabase) { setAlterDbFsync(200); setAlterDbWal(1); setAlterDbCacheModel(TSDB_CACHE_MODEL_LAST_ROW); +#ifndef _STORAGE + setAlterDbSttTrigger(-1); +#else setAlterDbSttTrigger(16); +#endif setAlterDbBuffer(16); setAlterDbPages(128); setAlterDbReplica(3); setAlterDbWalRetentionPeriod(10); setAlterDbWalRetentionSize(20); +#ifndef _STORAGE + run("ALTER DATABASE test BUFFER 16 CACHEMODEL 'last_row' CACHESIZE 32 WAL_FSYNC_PERIOD 200 KEEP 10 PAGES 128 " + "REPLICA 3 WAL_LEVEL 1 WAL_RETENTION_PERIOD 10 WAL_RETENTION_SIZE 20"); +#else run("ALTER DATABASE test BUFFER 16 CACHEMODEL 'last_row' CACHESIZE 32 WAL_FSYNC_PERIOD 200 KEEP 10 PAGES 128 " "REPLICA 3 WAL_LEVEL 1 STT_TRIGGER 16 WAL_RETENTION_PERIOD 10 WAL_RETENTION_SIZE 20"); +#endif clearAlterDbReq(); initAlterDb("test"); @@ -286,6 +295,7 @@ TEST_F(ParserInitialATest, alterDatabase) { run("ALTER DATABASE test REPLICA 3"); clearAlterDbReq(); +#ifdef _STORAGE initAlterDb("test"); setAlterDbSttTrigger(1); run("ALTER DATABASE test STT_TRIGGER 1"); @@ -294,6 +304,7 @@ TEST_F(ParserInitialATest, alterDatabase) { setAlterDbSttTrigger(16); run("ALTER DATABASE test STT_TRIGGER 16"); clearAlterDbReq(); +#endif initAlterDb("test"); setAlterDbMinRows(10); @@ -335,9 +346,9 @@ TEST_F(ParserInitialATest, alterDatabaseSemanticCheck) { run("ALTER DATABASE test KEEP 1000000000s", TSDB_CODE_PAR_INVALID_DB_OPTION); run("ALTER DATABASE test KEEP 1w", TSDB_CODE_PAR_INVALID_DB_OPTION); run("ALTER DATABASE test PAGES 63", TSDB_CODE_PAR_INVALID_DB_OPTION); - //run("ALTER DATABASE test WAL_LEVEL 0", TSDB_CODE_PAR_INVALID_DB_OPTION); + // run("ALTER DATABASE test WAL_LEVEL 0", TSDB_CODE_PAR_INVALID_DB_OPTION); run("ALTER DATABASE test WAL_LEVEL 3", TSDB_CODE_PAR_INVALID_DB_OPTION); - //run("ALTER DATABASE test REPLICA 2", TSDB_CODE_PAR_INVALID_DB_OPTION); + // run("ALTER DATABASE test REPLICA 2", TSDB_CODE_PAR_INVALID_DB_OPTION); run("ALTER DATABASE test STT_TRIGGER 0", TSDB_CODE_PAR_INVALID_DB_OPTION); run("ALTER DATABASE test STT_TRIGGER 17", TSDB_CODE_PAR_INVALID_DB_OPTION); // Regardless of the specific sentence diff --git a/source/libs/parser/test/parInitialCTest.cpp b/source/libs/parser/test/parInitialCTest.cpp index 3422ebe028..9e32826057 100644 --- a/source/libs/parser/test/parInitialCTest.cpp +++ b/source/libs/parser/test/parInitialCTest.cpp @@ -249,7 +249,7 @@ TEST_F(ParserInitialCTest, createDatabase) { for (int32_t i = 0; i < expect.numOfRetensions; ++i) { SRetention* pReten = (SRetention*)taosArrayGet(req.pRetensions, i); SRetention* pExpectReten = (SRetention*)taosArrayGet(expect.pRetensions, i); - if(i == 0) { + if (i == 0) { ASSERT_EQ(pReten->freq, 0); } else { ASSERT_EQ(pReten->freq, pExpectReten->freq); @@ -292,10 +292,43 @@ TEST_F(ParserInitialCTest, createDatabase) { setDbWalRetentionSize(-1); setDbWalRollPeriod(10); setDbWalSegmentSize(20); +#ifndef _STORAGE + setDbSstTrigger(1); +#else setDbSstTrigger(16); +#endif setDbHashPrefix(3); setDbHashSuffix(4); setDbTsdbPageSize(32); +#ifndef _STORAGE + run("CREATE DATABASE IF NOT EXISTS wxy_db " + "BUFFER 64 " + "CACHEMODEL 'last_value' " + "CACHESIZE 20 " + "COMP 1 " + "DURATION 100 " + "WAL_FSYNC_PERIOD 100 " + "MAXROWS 1000 " + "MINROWS 100 " + "KEEP 1440 " + "PAGES 96 " + "PAGESIZE 8 " + "PRECISION 'ns' " + "REPLICA 3 " + "RETENTIONS -:7d,1m:21d,15m:500d " + // "STRICT 'on' " + "WAL_LEVEL 2 " + "VGROUPS 100 " + "SINGLE_STABLE 1 " + "SCHEMALESS 1 " + "WAL_RETENTION_PERIOD -1 " + "WAL_RETENTION_SIZE -1 " + "WAL_ROLL_PERIOD 10 " + "WAL_SEGMENT_SIZE 20 " + "TABLE_PREFIX 3 " + "TABLE_SUFFIX 4 " + "TSDB_PAGESIZE 32"); +#else run("CREATE DATABASE IF NOT EXISTS wxy_db " "BUFFER 64 " "CACHEMODEL 'last_value' " @@ -324,6 +357,8 @@ TEST_F(ParserInitialCTest, createDatabase) { "TABLE_PREFIX 3 " "TABLE_SUFFIX 4 " "TSDB_PAGESIZE 32"); + +#endif clearCreateDbReq(); setCreateDbReq("wxy_db", 1); @@ -583,8 +618,6 @@ TEST_F(ParserInitialCTest, createView) { clearCreateStreamReq(); } - - /* * CREATE MNODE ON DNODE dnode_id */ @@ -679,7 +712,7 @@ TEST_F(ParserInitialCTest, createSmaIndex) { ASSERT_EQ(QUERY_NODE_SELECT_STMT, nodeType(pQuery->pPrevRoot)); SCreateIndexStmt* pStmt = (SCreateIndexStmt*)pQuery->pRoot; - SCmdMsgInfo* pCmdMsg = (SCmdMsgInfo*)taosMemoryMalloc(sizeof(SCmdMsgInfo)); + SCmdMsgInfo* pCmdMsg = (SCmdMsgInfo*)taosMemoryMalloc(sizeof(SCmdMsgInfo)); if (NULL == pCmdMsg) FAIL(); pCmdMsg->msgType = TDMT_MND_CREATE_SMA; pCmdMsg->msgLen = tSerializeSMCreateSmaReq(NULL, 0, pStmt->pReq); @@ -1068,7 +1101,8 @@ TEST_F(ParserInitialCTest, createStreamSemanticCheck) { run("CREATE STREAM s2 INTO st1 AS SELECT ts, to_json('{c1:1}') FROM st1 PARTITION BY TBNAME", TSDB_CODE_PAR_INVALID_STREAM_QUERY); run("CREATE STREAM s3 INTO st3 TAGS(tname VARCHAR(10), id INT) SUBTABLE(CONCAT('new-', tbname)) " - "AS SELECT _WSTART wstart, COUNT(*) cnt FROM st1 INTERVAL(10S)", TSDB_CODE_PAR_INVALID_STREAM_QUERY); + "AS SELECT _WSTART wstart, COUNT(*) cnt FROM st1 INTERVAL(10S)", + TSDB_CODE_PAR_INVALID_STREAM_QUERY); } /* @@ -1296,10 +1330,10 @@ TEST_F(ParserInitialCTest, createTopic) { run("CREATE TOPIC IF NOT EXISTS tp1 AS STABLE st1 WHERE tag1 > 0"); clearCreateTopicReq(); - setCreateTopicReq("tp1", 1, "create topic if not exists tp1 with meta as stable st1 where tag1 > 0", nullptr, "test", "st1", 1); + setCreateTopicReq("tp1", 1, "create topic if not exists tp1 with meta as stable st1 where tag1 > 0", nullptr, "test", + "st1", 1); run("CREATE TOPIC IF NOT EXISTS tp1 WITH META AS STABLE st1 WHERE tag1 > 0"); clearCreateTopicReq(); - } /*