From b3ae5df8ac003676fda4d5d46841ead42d1de527 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 27 Feb 2025 14:06:30 +0800 Subject: [PATCH] enh: more code --- source/dnode/vnode/src/inc/vnodeInt.h | 7 ++++--- .../test_new/storage/compact/test_compact_meta.py | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h index 0feb2e8e4f..68eb4c3ce7 100644 --- a/source/dnode/vnode/src/inc/vnodeInt.h +++ b/source/dnode/vnode/src/inc/vnodeInt.h @@ -168,7 +168,7 @@ int metaTtlFindExpired(SMeta* pMeta, int64_t timePointMs, SArray* tb int metaAlterTable(SMeta* pMeta, int64_t version, SVAlterTbReq* pReq, STableMetaRsp* pMetaRsp); int metaUpdateChangeTimeWithLock(SMeta* pMeta, tb_uid_t uid, int64_t changeTimeMs); SSchemaWrapper* metaGetTableSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock); -int64_t metaGetTableCreateTime(SMeta *pMeta, tb_uid_t uid, int lock); +int64_t metaGetTableCreateTime(SMeta* pMeta, tb_uid_t uid, int lock); int32_t metaGetTbTSchemaNotNull(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock, STSchema** ppTSchema); int32_t metaGetTbTSchemaMaybeNull(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock, STSchema** ppTSchema); STSchema* metaGetTbTSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock); @@ -488,8 +488,9 @@ struct SVnode { SVATaskID commitTask; struct { - SMeta* pMeta; - SMeta* pNewMeta; + SMeta* pMeta; + SMeta* pNewMeta; + SVATaskID metaCompactTask; }; SSma* pSma; diff --git a/tests/test_new/storage/compact/test_compact_meta.py b/tests/test_new/storage/compact/test_compact_meta.py index c806567aa2..19aca5ff54 100644 --- a/tests/test_new/storage/compact/test_compact_meta.py +++ b/tests/test_new/storage/compact/test_compact_meta.py @@ -12,6 +12,7 @@ from util.dnodes import tdDnodes from util.sql import * from util.cases import * from util.log import * +import inspect sys.path.append("../tests/pytest") @@ -41,6 +42,8 @@ class TestCompactMeta: 1. Alter child table tags 2. Make sure compact meta works """ + tdLog.info(f'case {inspect.currentframe().f_code.co_name} start') + db_name = 'db1' stb_name = 'stb1' ctb_name_prefix = 'ctb' @@ -59,16 +62,28 @@ class TestCompactMeta: tdSql.execute(sql) # Create child tables + tdLog.info( + f'case {inspect.currentframe().f_code.co_name}: create {num_child_tables} child tables') for i in range(1, num_child_tables+1): + if i % 100 == 0: + tdLog.info( + f'case {inspect.currentframe().f_code.co_name}: create {i} child tables') sql = f'create table {db_name}.{ctb_name_prefix}{i} using {db_name}.{stb_name} tags({i})' tdSql.execute(sql) # Alter child table tags + tdLog.info( + f'case {inspect.currentframe().f_code.co_name}: alter child table tags') for i in range(1, num_child_tables+1): + if i % 100 == 0: + tdLog.info( + f'case {inspect.currentframe().f_code.co_name}: altered {i} child tables') sql = f'alter table {db_name}.{ctb_name_prefix}{i} set tag t1 = {i+1}' tdSql.execute(sql) # Compact meta + tdLog.info( + f'case {inspect.currentframe().f_code.co_name}: start to compact meta') sql = f'compact database {db_name} meta_only' tdSql.execute(sql)