From 3d73defebad01247446b89b88bb98d2aa9bb3906 Mon Sep 17 00:00:00 2001 From: kailixu Date: Tue, 20 Aug 2024 13:54:11 +0800 Subject: [PATCH 1/2] enh: grant for csv and data sync --- source/common/src/systable.c | 1 + source/dnode/vnode/src/vnd/vnodeSvr.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/common/src/systable.c b/source/common/src/systable.c index 3f27ab2b2b..2f3ffecf61 100644 --- a/source/common/src/systable.c +++ b/source/common/src/systable.c @@ -427,6 +427,7 @@ static const SSysDbTableSchema userMachinesSchema[] = { {.name = "id", .bytes = TSDB_CLUSTER_ID_LEN + 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, {.name = "dnode_num", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true}, {.name = "machine", .bytes = 7552 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, + {.name = "version", .bytes = 32 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, }; static const SSysDbTableSchema encryptionsSchema[] = { diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c index dc84b73c10..b232f2832c 100644 --- a/source/dnode/vnode/src/vnd/vnodeSvr.c +++ b/source/dnode/vnode/src/vnd/vnodeSvr.c @@ -250,11 +250,6 @@ static int32_t vnodePreProcessSubmitTbData(SVnode *pVnode, SDecoder *pCoder, int version = (submitTbData.flags >> 8) & 0xff; submitTbData.flags = submitTbData.flags & 0xff; - if (submitTbData.flags & SUBMIT_REQ_FROM_FILE) { - code = grantCheck(TSDB_GRANT_CSV); - TSDB_CHECK_CODE(code, lino, _exit); - } - int64_t uid; if (submitTbData.flags & SUBMIT_REQ_AUTO_CREATE_TABLE) { code = vnodePreprocessCreateTableReq(pVnode, pCoder, btimeMs, &uid); From a5a1b5e5099249002c83531935a6309bcbec8af8 Mon Sep 17 00:00:00 2001 From: kailixu Date: Thu, 22 Aug 2024 16:40:21 +0800 Subject: [PATCH 2/2] enh: adjust number of ins_columns --- tests/system-test/0-others/information_schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/0-others/information_schema.py b/tests/system-test/0-others/information_schema.py index 616cd034ab..b342bc7b0e 100644 --- a/tests/system-test/0-others/information_schema.py +++ b/tests/system-test/0-others/information_schema.py @@ -222,7 +222,7 @@ class TDTestCase: tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'") tdLog.info(len(tdSql.queryResult)) - tdSql.checkEqual(True, len(tdSql.queryResult) in range(261, 271)) + tdSql.checkEqual(True, len(tdSql.queryResult) in range(271, 272)) tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'") tdSql.checkEqual(56, len(tdSql.queryResult))