From b980bb35bc3dc9f3a726e1919a6f668d7a95b63d Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 20 Feb 2025 18:08:20 +0800 Subject: [PATCH] more code --- source/dnode/vnode/CMakeLists.txt | 1 + source/dnode/vnode/src/inc/vnodeInt.h | 6 +- source/dnode/vnode/src/meta/metaOpen.c | 2 +- tests/test_new/storage/test_compact_meta.py | 85 +++++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/test_new/storage/test_compact_meta.py diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt index b90e1844ae..1df28336b5 100644 --- a/source/dnode/vnode/CMakeLists.txt +++ b/source/dnode/vnode/CMakeLists.txt @@ -96,6 +96,7 @@ if(TD_VNODE_PLUGINS) vnode PRIVATE ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c + ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/metaCompact.c ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c ) diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h index 5a61c1c124..27ee54ec70 100644 --- a/source/dnode/vnode/src/inc/vnodeInt.h +++ b/source/dnode/vnode/src/inc/vnodeInt.h @@ -486,7 +486,11 @@ struct SVnode { // commit variables SVATaskID commitTask; - SMeta* pMeta; + struct { + SMeta* pMeta; + SMeta* pNewMeta; + }; + SSma* pSma; STsdb* pTsdb; SWal* pWal; diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c index 35e761e51e..5e185e3bb2 100644 --- a/source/dnode/vnode/src/meta/metaOpen.c +++ b/source/dnode/vnode/src/meta/metaOpen.c @@ -133,7 +133,7 @@ static void doScan(SMeta *pMeta) { } } -static int32_t metaOpenImpl(SVnode *pVnode, SMeta **ppMeta, const char *metaDir, int8_t rollback) { +int32_t metaOpenImpl(SVnode *pVnode, SMeta **ppMeta, const char *metaDir, int8_t rollback) { SMeta *pMeta = NULL; int32_t code = 0; int32_t lino; diff --git a/tests/test_new/storage/test_compact_meta.py b/tests/test_new/storage/test_compact_meta.py new file mode 100644 index 0000000000..e1ee134c6a --- /dev/null +++ b/tests/test_new/storage/test_compact_meta.py @@ -0,0 +1,85 @@ +# tests/test_new/xxx/xxx/test_xxx.py +# import ... + +import random +import taos + + +class TestXxxx: + def init(self): + tdLog.debug("start to execute %s" % __file__) + + def test_template(self): + """用例目标，必填，用一行简短总结 + <空行> + 用例详细描述，必填，允许多行 + <空行> + Since: 用例开始支持的TDengine版本，新增用例必填 + <空行> + Labels: 筛选标签，选填，多个标签用英文逗号分隔 + <空行> + Jira: 相关jira任务id，选填 + <空行> + History: 用例变更历史，选填，每行一次变更信息 + - 日期1 变更人1 变更原因1 + - 日期2 变更人2 变更原因2 + """ + + def test_demo(self): + """测试超级表插入各种数据类型 + + 使用多种数据类型创建超级表，向超级表插入数据， + 包括：常规数据，空数据，边界值等，插入均执行成功 + + Since: v3.3.0.0 + + Labels: stable, data_type + + Jira: TD-12345, TS-1234 + + History: + - 2024-2-6 Feng Chao Created + - 2024-2-7 Huo Hong updated for feature TD-23456 + """ + + def test_case1(self): + dbname = 'db' + super_table = "stb" + child_table_prefix = "ctb" + num_of_child_tables = 10000 + max_alter_times = 100 + + # Create database + tdSql.query(f'create database {dbname} vgroups 1') + + # Create super table + sql = f'create {dbname}.{super_table} (ts timestamp, c1 int) tags (tag1 int)' + tdSql.query(sql) + + # Create child tables + for i in range(num_of_child_tables): + sql = f'create {dbname}.{child_table_prefix}{i} using {dbname}.{super_table} tags ({i})' + tdSql.query(sql) + + # Alter child tables + for i in range(num_of_child_tables): + for j in range(random.randint(1, max_alter_times)): + sql = f'alter table {dbname}.{child_table_prefix}{i} set tag1 = {i + j}' + tdSql.query(sql) + + # Alter super tables + for i in range(random.randint(1, max_alter_times)): + sql = f'alter table {dbname}.{super_table} add column c{i+1} int' + tdSql.query(sql) + + # Compact meta + sql = f'compact database {dbname}' + tdSql.query(sql) + + def run(self): + self.test_template() + self.test_demo() + self.test_case1() + + def stop(self): + tdLog.success("%s successfully executed" % __file__)