From 77b54b570d8351a4fe5ae8e944222b38712bdc44 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Sun, 10 Apr 2022 15:33:14 +0800 Subject: [PATCH] [TS-238](tsdb): undo no use code and need not modify code --- src/client/src/tscSQLParser.c | 2 +- src/client/src/tscSql.c | 1 - src/common/inc/tglobal.h | 4 --- src/common/src/tglobal.c | 1 - src/dnode/src/dnodeSystem.c | 6 ----- src/dnode/src/dnodeVMgmt.c | 11 -------- src/inc/tsdb.h | 5 +--- src/inc/vnode.h | 2 -- src/mnode/inc/mnodeDef.h | 3 +-- src/mnode/src/mnodeVgroup.c | 8 +----- src/query/src/qSqlParser.c | 16 ------------ src/tsdb/inc/tsdbFile.h | 1 - src/tsdb/inc/tsdbMeta.h | 2 +- src/tsdb/inc/tsdbReadImpl.h | 2 +- src/tsdb/src/tsdbMain.c | 2 +- src/tsdb/src/tsdbRead.c | 2 +- src/tsdb/src/tsdbReadImpl.c | 4 --- src/vnode/src/vnodeMain.c | 49 +---------------------------------- src/vnode/src/vnodeMgmt.c | 1 - 19 files changed, 9 insertions(+), 113 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index ed3585715b..1dbd5f00ab 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -560,7 +560,7 @@ int32_t handleUserDefinedFunc(SSqlObj* pSql, struct SSqlInfo* pInfo) { return TSDB_CODE_SUCCESS; } -int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { +int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { if (pInfo == NULL || pSql == NULL) { return TSDB_CODE_TSC_APP_ERROR; } diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index fb2a831c1f..0fa78f2c0e 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -440,7 +440,6 @@ int taos_affected_tables(TAOS_RES *tres) { return pSql->res.numOfTables; } - TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) { SSqlObj *pSql = (SSqlObj *)res; SSqlRes *pRes = &pSql->res; diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index 0b5fc6fca6..3add0b566d 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -22,9 +22,6 @@ extern "C" { #endif -// global definition -extern bool isBigEndian; - // cluster extern char tsFirst[]; extern char tsSecond[]; @@ -118,7 +115,6 @@ extern int8_t tsCacheLastRow; // tsdb extern bool tsdbForceKeepFile; -extern bool tsdbForceTruncateFile; extern bool tsdbForceCompactFile; extern int32_t tsdbWalFlushSize; diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index ff828ccff1..616c5fba89 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -161,7 +161,6 @@ int32_t tsTsdbMetaCompactRatio = TSDB_META_COMPACT_RATIO; // For backward compatibility bool tsdbForceKeepFile = false; bool tsdbForceCompactFile = false; // compact TSDB fileset forcibly -bool tsdbForceTruncateFile = false; int32_t tsdbWalFlushSize = TSDB_DEFAULT_WAL_FLUSH_SIZE; // MB // balance diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c index 8ef5728e6f..d41a2c6a8a 100644 --- a/src/dnode/src/dnodeSystem.c +++ b/src/dnode/src/dnodeSystem.c @@ -24,14 +24,10 @@ static tsem_t exitSem; static void siguser1Handler(int32_t signum, void *sigInfo, void *context); static void siguser2Handler(int32_t signum, void *sigInfo, void *context); static void sigintHandler(int32_t signum, void *sigInfo, void *context); -static const int __TEST_NUMBER__ = 1; -bool isBigEndian = false; int32_t main(int32_t argc, char *argv[]) { int dump_config = 0; - isBigEndian = (*(char *)&__TEST_NUMBER__) == 0; - // Set global configuration file for (int32_t i = 1; i < argc; ++i) { if (strcmp(argv[i], "-c") == 0) { @@ -47,8 +43,6 @@ int32_t main(int32_t argc, char *argv[]) { } } else if (strcmp(argv[i], "-C") == 0) { dump_config = 1; - } else if (strcmp(argv[i], "--force-truncate-file") == 0) { - tsdbForceTruncateFile = true; } else if (strcmp(argv[i], "--force-compact-file") == 0) { tsdbForceCompactFile = true; } else if (strcmp(argv[i], "--force-keep-file") == 0) { diff --git a/src/dnode/src/dnodeVMgmt.c b/src/dnode/src/dnodeVMgmt.c index 16c77eeaf3..c1bfb1460b 100644 --- a/src/dnode/src/dnodeVMgmt.c +++ b/src/dnode/src/dnodeVMgmt.c @@ -191,22 +191,11 @@ static int32_t dnodeProcessSyncVnodeMsg(SRpcMsg *rpcMsg) { return vnodeSync(pSyncVnode->vgId); } -#ifdef __TRUNCATE_TEST__ static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *rpcMsg) { SCompactVnodeMsg *pCompactVnode = rpcMsg->pCont; pCompactVnode->vgId = htonl(pCompactVnode->vgId); return vnodeCompact(pCompactVnode->vgId); } -#else -static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *rpcMsg) { - STruncateTblMsg *pTruncateMsg = rpcMsg->pCont; - return vnodeTruncateTbl(pTruncateMsg); -} -// static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *rpcMsg) { -// SDeleteDataMsg *pDeleteDataMsg = rpcMsg->pCont; -// return vnodeDeleteData(pDeleteDataMsg); -// } -#endif static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) { SDropVnodeMsg *pDrop = rpcMsg->pCont; diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index fbde9e0853..73820ebef2 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -96,7 +96,7 @@ int tsdbCloseRepo(STsdbRepo *repo, int toCommit); int32_t tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg); int tsdbGetState(STsdbRepo *repo); int8_t tsdbGetCompactState(STsdbRepo *repo); -int8_t tsdbGetTruncateState(STsdbRepo *repo); +int8_t tsdbGetDeleteState(STsdbRepo *repo); // --------- TSDB TABLE DEFINITION typedef struct { uint64_t uid; // the unique table ID @@ -421,9 +421,6 @@ int tsdbSyncRecv(void *pRepo, SOCKET socketFd); // For TSDB Compact int tsdbCompact(STsdbRepo *pRepo); -// For TSDB truncate table -int tsdbTruncateTbl(STsdbRepo *pRepo, void *param); - // For TSDB delete data int tsdbDeleteData(STsdbRepo *pRepo, void *param); diff --git a/src/inc/vnode.h b/src/inc/vnode.h index acc21ed348..48ac7e627d 100644 --- a/src/inc/vnode.h +++ b/src/inc/vnode.h @@ -77,8 +77,6 @@ int32_t vnodeAlter(void *pVnode, SCreateVnodeMsg *pVnodeCfg); int32_t vnodeSync(int32_t vgId); int32_t vnodeClose(int32_t vgId); int32_t vnodeCompact(int32_t vgId); -int32_t vnodeTruncateTbl(STruncateTblMsg *pMsg); -int32_t vnodeDeleteData(SDeleteDataMsg *pMsg); // vnodeMgmt int32_t vnodeInitMgmt(); diff --git a/src/mnode/inc/mnodeDef.h b/src/mnode/inc/mnodeDef.h index 3e80dbbd65..5acc8dd85e 100644 --- a/src/mnode/inc/mnodeDef.h +++ b/src/mnode/inc/mnodeDef.h @@ -146,8 +146,7 @@ typedef struct SVgObj { SVnodeGid vnodeGid[TSDB_MAX_REPLICA]; int32_t vgCfgVersion; int8_t compact; - int8_t truncate; - int8_t reserved1[6]; + int8_t reserved1[8]; int8_t updateEnd[4]; int32_t refCount; int32_t numOfTables; diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c index c2f3ba109c..751a06ecb4 100644 --- a/src/mnode/src/mnodeVgroup.c +++ b/src/mnode/src/mnodeVgroup.c @@ -352,8 +352,7 @@ void mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVl pVgroup->pDb->dbCfgVersion, pVgroup->vgCfgVersion, pVgroup->numOfVnodes); mnodeSendAlterVgroupMsg(pVgroup,NULL); } - pVgroup->compact = (int8_t)pVload->compact; - pVgroup->truncate = (int8_t)pVload->truncate; + pVgroup->compact = pVload->compact; } static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) { @@ -849,11 +848,6 @@ static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, v pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; *(int8_t *)pWrite = pVgroup->compact; cols++; - - // pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - // *(int8_t *)pWrite = pVgroup->truncate; - // cols++; - mnodeDecVgroupRef(pVgroup); numOfRows++; } diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c index 6bd1eb1ce3..2a79bfb434 100644 --- a/src/query/src/qSqlParser.c +++ b/src/query/src/qSqlParser.c @@ -1310,22 +1310,6 @@ void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrTo pInfo->pMiscInfo->tableType = tableType; } -void setTruncateTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck, int16_t dbType, int16_t tableType) { - pInfo->type = type; - - if (pInfo->pMiscInfo == NULL) { - pInfo->pMiscInfo = (SMiscInfo *)calloc(1, sizeof(SMiscInfo)); - pInfo->pMiscInfo->a = taosArrayInit(4, sizeof(SStrToken)); - } - - taosArrayPush(pInfo->pMiscInfo->a, pToken); - - pInfo->pMiscInfo->existsCheck = (existsCheck->n == 1); - pInfo->pMiscInfo->dbType = dbType; - pInfo->pMiscInfo->tableType = tableType; -} - - void setDropFuncInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken) { pInfo->type = type; diff --git a/src/tsdb/inc/tsdbFile.h b/src/tsdb/inc/tsdbFile.h index 109b3f894b..6d1e0cf246 100644 --- a/src/tsdb/inc/tsdbFile.h +++ b/src/tsdb/inc/tsdbFile.h @@ -18,7 +18,6 @@ #define TSDB_FILE_HEAD_SIZE 512 #define TSDB_FILE_DELIMITER 0xF00AFA0F -#define TSDB_FILE_DELIMITER_DELETE 0xF00AFA1F #define TSDB_FILE_INIT_MAGIC 0xFFFFFFFF #define TSDB_IVLD_FID INT_MIN #define TSDB_FILE_STATE_OK 0 diff --git a/src/tsdb/inc/tsdbMeta.h b/src/tsdb/inc/tsdbMeta.h index d0d30a6a49..169e09acab 100644 --- a/src/tsdb/inc/tsdbMeta.h +++ b/src/tsdb/inc/tsdbMeta.h @@ -48,9 +48,9 @@ typedef struct STable { SDataCol *lastCols; int16_t maxColNum; int16_t restoreColumnNum; - int16_t cacheLastConfigVersion; bool hasRestoreLastColumn; int lastColSVersion; + int16_t cacheLastConfigVersion; T_REF_DECLARE() // int32_t } STable; diff --git a/src/tsdb/inc/tsdbReadImpl.h b/src/tsdb/inc/tsdbReadImpl.h index 5e034d95df..20d8b88c83 100644 --- a/src/tsdb/inc/tsdbReadImpl.h +++ b/src/tsdb/inc/tsdbReadImpl.h @@ -153,7 +153,7 @@ static FORCE_INLINE uint32_t tsdbGetBlockColOffset(SBlockCol *pBlockCol) { } typedef struct { - int32_t delimiter; // For recovery usage(not included when calculating checksum) + int32_t delimiter; // For recovery usage int32_t numOfCols; // For recovery usage uint64_t uid; // For recovery usage SBlockCol cols[]; diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index 7355205f57..bc26be5828 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -214,7 +214,7 @@ int tsdbGetState(STsdbRepo *repo) { return repo->state; } int8_t tsdbGetCompactState(STsdbRepo *repo) { return (int8_t)(repo->compactState); } -int8_t tsdbGetTruncateState(STsdbRepo *repo) { return (int8_t)(repo->deleteState); } +int8_t tsdbGetDeleteState(STsdbRepo *repo) { return (int8_t)(repo->deleteState); } void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int64_t *compStorage) { ASSERT(repo != NULL); diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 2a68ef7175..8fd22e44d2 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -639,7 +639,7 @@ static int32_t lazyLoadCacheLast(STsdbQueryHandle* pQueryHandle) { initTableMemIterator(pQueryHandle, pCheckInfo); } - code = tsdbLoadLastCache(pRepo, pTable); + code = tsdbLoadLastCache(pRepo, pTable, false); if (code != 0) { tsdbError("%p uid:%" PRId64 ", tid:%d, failed to load last cache since %s", pQueryHandle, pTable->tableId.uid, pTable->tableId.tid, tstrerror(terrno)); diff --git a/src/tsdb/src/tsdbReadImpl.c b/src/tsdb/src/tsdbReadImpl.c index 79de0b0ad5..10727ecf0f 100644 --- a/src/tsdb/src/tsdbReadImpl.c +++ b/src/tsdb/src/tsdbReadImpl.c @@ -449,8 +449,6 @@ static int tsdbLoadBlockStatisFromDFile(SReadH *pReadh, SBlock *pBlock) { return -1; } - pReadh->pBlkData->delimiter = TSDB_FILE_DELIMITER; // reset in case of TSDB_FILE_DELIMITER_DELETE - if (!taosCheckChecksumWhole((uint8_t *)(pReadh->pBlkData), (uint32_t)size)) { terrno = TSDB_CODE_TDB_FILE_CORRUPTED; tsdbError("vgId:%d block statis part in file %s is corrupted since wrong checksum, offset:%" PRId64 " len :%" PRIzu, @@ -653,8 +651,6 @@ static int tsdbLoadBlockDataImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *pDat return -1; } - pBlockData->delimiter = TSDB_FILE_DELIMITER; // reset in case of TSDB_FILE_DELIMITER_DELETE - int32_t tsize = (int32_t)tsdbBlockStatisSize(pBlock->numOfCols, (uint32_t)pBlock->blkVer); if (!taosCheckChecksumWhole((uint8_t *)TSDB_READ_BUF(pReadh), tsize)) { terrno = TSDB_CODE_TDB_FILE_CORRUPTED; diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 339666c724..0936113d56 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -120,7 +120,7 @@ int32_t vnodeDrop(int32_t vgId) { int32_t vnodeCompact(int32_t vgId) { void *pVnode = vnodeAcquire(vgId); if (pVnode != NULL) { - printf("vgId:%d, compact vnode msg is received\n", vgId); + vDebug("vgId:%d, compact vnode msg is received\n", vgId); //not care success or not tsdbCompact(((SVnodeObj*)pVnode)->tsdb); vnodeRelease(pVnode); @@ -128,56 +128,9 @@ int32_t vnodeCompact(int32_t vgId) { vInfo("vgId:%d, vnode not exist, can't compact it", vgId); return TSDB_CODE_VND_INVALID_VGROUP_ID; } - printf("vgId:%d, compact vnode msg is finished\n", vgId); return TSDB_CODE_SUCCESS; } -int32_t vnodeTruncateTbl(STruncateTblMsg *pMsg) { - int32_t vgId = 2; - void * pVnode = vnodeAcquire(vgId); - if (pVnode != NULL) { - vDebug("vgId:%d, truncate table %s msg is received", vgId, pMsg->tableFname); - // not care success or not - STruncateTblMsg *param = (STruncateTblMsg *)calloc(1, sizeof(STruncateTblMsg) + pMsg->nSpan * sizeof(STimeWindow)); - param->vgId = 2; - param->uid = 562949986978880; - param->nSpan = 1; - param->span[0].skey = 1634701320001; - param->span[0].ekey = 1634701320001; - //if (tsdbTruncateTbl(((SVnodeObj *)pVnode)->tsdb, param) < 0) { - // tfree(param); - //} - vnodeRelease(pVnode); - } else { - vInfo("vgId:%d, vnode not exist, can't truncate table %s in it", vgId, pMsg->tableFname); - return TSDB_CODE_VND_INVALID_VGROUP_ID; - } - return TSDB_CODE_SUCCESS; -} - -int32_t vnodeDeleteData(SDeleteDataMsg *pMsg) { - int32_t vgId = 2; - void * pVnode = vnodeAcquire(vgId); - if (pVnode != NULL) { - vDebug("vgId:%d, truncate table %s msg is received", vgId, pMsg->tableFname); - // not care success or not - SDeleteDataMsg *param = (SDeleteDataMsg *)calloc(1, sizeof(STruncateTblMsg) + pMsg->nSpan * sizeof(STimeWindow)); - param->vgId = 2; - param->uid = 562949986978880; - param->nSpan = 1; - param->span[0].skey = 1634701320001; - param->span[0].ekey = 1634701320001; - //if (tsdbDeleteData(((SVnodeObj *)pVnode)->tsdb, param) < 0) { - // tfree(param); - //} - vnodeRelease(pVnode); - } else { - vInfo("vgId:%d, vnode not exist, can't truncate table %s in it", vgId, pMsg->tableFname); - return TSDB_CODE_VND_INVALID_VGROUP_ID; - } - return TSDB_CODE_SUCCESS; -} - static int32_t vnodeAlterImp(SVnodeObj *pVnode, SCreateVnodeMsg *pVnodeCfg) { STsdbCfg tsdbCfg = pVnode->tsdbCfg; SSyncCfg syncCfg = pVnode->syncCfg; diff --git a/src/vnode/src/vnodeMgmt.c b/src/vnode/src/vnodeMgmt.c index 50dbe060c0..8d699cb100 100644 --- a/src/vnode/src/vnodeMgmt.c +++ b/src/vnode/src/vnodeMgmt.c @@ -163,7 +163,6 @@ static void vnodeBuildVloadMsg(SVnodeObj *pVnode, SStatusMsg *pStatus) { pLoad->role = pVnode->role; pLoad->replica = pVnode->syncCfg.replica; pLoad->compact = (pVnode->tsdb != NULL) ? tsdbGetCompactState(pVnode->tsdb) : 0; - pLoad->truncate = (pVnode->tsdb != NULL) ? tsdbGetCompactState(pVnode->tsdb) : 0; } int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes) { -- GitLab