From acd60dcc85e0fa91605ba38e5521d9763e78e65e Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 15 Mar 2022 17:40:49 +0800 Subject: [PATCH 1/4] [td-14048] do hide the update attribute of the databases. --- source/dnode/mnode/impl/src/mndDb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index a17a45d46a..6625c7f104 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -1292,11 +1292,11 @@ static int32_t mndGetDbMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMe pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = 1; - pSchema[cols].type = TSDB_DATA_TYPE_TINYINT; - strcpy(pSchema[cols].name, "update"); - pSchema[cols].bytes = pShow->bytes[cols]; - cols++; +// pShow->bytes[cols] = 1; +// pSchema[cols].type = TSDB_DATA_TYPE_TINYINT; +// strcpy(pSchema[cols].name, "update"); +// pSchema[cols].bytes = pShow->bytes[cols]; +// cols++; pMeta->numOfColumns = cols; pShow->numOfColumns = cols; @@ -1432,9 +1432,9 @@ static int32_t mndRetrieveDbs(SMnodeMsg *pReq, SShowObj *pShow, char *data, int3 STR_WITH_SIZE_TO_VARSTR(pWrite, prec, 2); cols++; - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int8_t *)pWrite = pDb->cfg.update; - cols++; +// pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; +// *(int8_t *)pWrite = pDb->cfg.update; +// cols++; numOfRows++; sdbRelease(pSdb, pDb); From 0299126dfe0d96492a3e88d28e06db4339cff116 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 15 Mar 2022 17:50:20 +0800 Subject: [PATCH 2/4] [td-13039] fix compiler error. --- contrib/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 3b7b1f3c10..575a0e6274 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -128,7 +128,12 @@ target_include_directories( set(CMAKE_PROJECT_INCLUDE_BEFORE "${CMAKE_SUPPORT_DIR}/EnableCMP0048.txt.in") add_subdirectory(zlib) target_include_directories( - zlibstatic + zlibstatic + PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib +) +target_include_directories( + zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib ) From 085475acc4a21fb06e0cbd760819cfbd5a5a753c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 15 Mar 2022 18:14:42 +0800 Subject: [PATCH 3/4] [td-13039] update sim. --- tests/script/tsim/table/basic1.sim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/script/tsim/table/basic1.sim b/tests/script/tsim/table/basic1.sim index 09e6ede77d..257c264159 100644 --- a/tests/script/tsim/table/basic1.sim +++ b/tests/script/tsim/table/basic1.sim @@ -253,7 +253,8 @@ endi print =============== query data from normal table after restart dnode sql use ndb sql select * from nt1 -if $rows != 3 then +if $rows != 3 then + print expect 3, actual: $rows return -1 endi From 5fca3e47dadf41096e0ab2eae1a967afb26465b8 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 15 Mar 2022 18:29:37 +0800 Subject: [PATCH 4/4] [td-13039] update the mnode unit test. --- source/dnode/mnode/impl/test/db/db.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/dnode/mnode/impl/test/db/db.cpp b/source/dnode/mnode/impl/test/db/db.cpp index 9dbc1be4e9..0282663b17 100644 --- a/source/dnode/mnode/impl/test/db/db.cpp +++ b/source/dnode/mnode/impl/test/db/db.cpp @@ -27,7 +27,7 @@ Testbase MndTestDb::test; TEST_F(MndTestDb, 01_ShowDb) { test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, ""); - CHECK_META("show databases", 18); + CHECK_META("show databases", 17); CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "name"); CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time"); CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "vgroups"); @@ -45,7 +45,7 @@ TEST_F(MndTestDb, 01_ShowDb) { CHECK_SCHEMA(14, TSDB_DATA_TYPE_TINYINT, 1, "comp"); CHECK_SCHEMA(15, TSDB_DATA_TYPE_TINYINT, 1, "cachelast"); CHECK_SCHEMA(16, TSDB_DATA_TYPE_BINARY, 3 + VARSTR_HEADER_SIZE, "precision"); - CHECK_SCHEMA(17, TSDB_DATA_TYPE_TINYINT, 1, "update"); +// CHECK_SCHEMA(17, TSDB_DATA_TYPE_TINYINT, 1, "update"); test.SendShowRetrieveReq(); EXPECT_EQ(test.GetShowRows(), 0); @@ -85,7 +85,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) { } test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, ""); - CHECK_META("show databases", 18); + CHECK_META("show databases", 17); test.SendShowRetrieveReq(); EXPECT_EQ(test.GetShowRows(), 1); @@ -173,7 +173,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) { test.Restart(); test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, ""); - CHECK_META("show databases", 18); + CHECK_META("show databases", 17); test.SendShowRetrieveReq(); EXPECT_EQ(test.GetShowRows(), 1); @@ -215,7 +215,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) { } test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, ""); - CHECK_META("show databases", 18); + CHECK_META("show databases", 17); test.SendShowRetrieveReq(); EXPECT_EQ(test.GetShowRows(), 0); @@ -255,7 +255,7 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) { } test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, ""); - CHECK_META("show databases", 18); + CHECK_META("show databases", 17); test.SendShowRetrieveReq(); EXPECT_EQ(test.GetShowRows(), 1);