xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refact

This commit is contained in:
Hongze Cheng 2022-01-07 02:05:51 +00:00
parent 9241af2298
commit b1351da7cd
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/os/os.h
View File

@ -48,6 +48,7 @@ extern "C" {
#include <wchar.h> #include <wchar.h>
#include <wctype.h> #include <wctype.h>
#include <wordexp.h> #include <wordexp.h>
#include <libgen.h>
#include <sys/mman.h> #include <sys/mman.h>

7
source/dnode/vnode/tsdb2/src/tsdbCommit.c
View File

@ -13,6 +13,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "tsdbint.h" #include "tsdbint.h"
#include "ttime.h"
extern int32_t tsTsdbMetaCompactRatio; extern int32_t tsTsdbMetaCompactRatio;
@ -893,9 +894,9 @@ static int tsdbInitCommitH(SCommitH *pCommith, STsdb *pRepo) {
static void tsdbDestroyCommitH(SCommitH *pCommith) { static void tsdbDestroyCommitH(SCommitH *pCommith) {
pCommith->pDataCols = tdFreeDataCols(pCommith->pDataCols); pCommith->pDataCols = tdFreeDataCols(pCommith->pDataCols);
pCommith->aSubBlk = taosArrayDestroy(&pCommith->aSubBlk); pCommith->aSubBlk = taosArrayDestroy(pCommith->aSubBlk);
pCommith->aSupBlk = taosArrayDestroy(&pCommith->aSupBlk); pCommith->aSupBlk = taosArrayDestroy(pCommith->aSupBlk);
pCommith->aBlkIdx = taosArrayDestroy(&pCommith->aBlkIdx); pCommith->aBlkIdx = taosArrayDestroy(pCommith->aBlkIdx);
tsdbDestroyCommitIters(pCommith); tsdbDestroyCommitIters(pCommith);
tsdbDestroyReadH(&(pCommith->readh)); tsdbDestroyReadH(&(pCommith->readh));
tsdbCloseDFileSet(TSDB_COMMIT_WRITE_FSET(pCommith)); tsdbCloseDFileSet(TSDB_COMMIT_WRITE_FSET(pCommith));

6
source/dnode/vnode/tsdb2/src/tsdbCompact.c
View File

@ -316,8 +316,8 @@ static int tsdbCompactMeta(STsdb *pRepo) {
static void tsdbDestroyCompactH(SCompactH *pComph) { static void tsdbDestroyCompactH(SCompactH *pComph) {
pComph->pDataCols = tdFreeDataCols(pComph->pDataCols); pComph->pDataCols = tdFreeDataCols(pComph->pDataCols);
pComph->aSupBlk = taosArrayDestroy(&pComph->aSupBlk); pComph->aSupBlk = taosArrayDestroy(pComph->aSupBlk);
pComph->aBlkIdx = taosArrayDestroy(&pComph->aBlkIdx); pComph->aBlkIdx = taosArrayDestroy(pComph->aBlkIdx);
tsdbDestroyCompTbArray(pComph); tsdbDestroyCompTbArray(pComph);
tsdbDestroyReadH(&(pComph->readh)); tsdbDestroyReadH(&(pComph->readh));
tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph));
@ -370,7 +370,7 @@ static int tsdbCompactMeta(STsdb *pRepo) {
tfree(pTh->pInfo); tfree(pTh->pInfo);
} }
pComph->tbArray = taosArrayDestroy(&pComph->tbArray); pComph->tbArray = taosArrayDestroy(pComph->tbArray);
} }
static int tsdbCacheFSetIndex(SCompactH *pComph) { static int tsdbCacheFSetIndex(SCompactH *pComph) {