From a243752b420119bf5a7cf2542915ff94b1dc9b32 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 19 Jan 2022 08:44:38 +0000 Subject: [PATCH] refact --- source/libs/tdb/src/db/tdb_mpfile.c | 14 ++++++++++++++ source/libs/tdb/src/db/tdb_mpool.c | 16 ++++++++++++++++ source/libs/tdb/src/inc/tdb_inc.h | 1 + source/libs/tdb/src/inc/tdb_mpfile.h | 1 - source/libs/tdb/src/inc/tdb_mpool.h | 14 +++++++------- 5 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 source/libs/tdb/src/db/tdb_mpfile.c create mode 100644 source/libs/tdb/src/db/tdb_mpool.c diff --git a/source/libs/tdb/src/db/tdb_mpfile.c b/source/libs/tdb/src/db/tdb_mpfile.c new file mode 100644 index 0000000000..6dea4a4e57 --- /dev/null +++ b/source/libs/tdb/src/db/tdb_mpfile.c @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ \ No newline at end of file diff --git a/source/libs/tdb/src/db/tdb_mpool.c b/source/libs/tdb/src/db/tdb_mpool.c new file mode 100644 index 0000000000..ac4018d348 --- /dev/null +++ b/source/libs/tdb/src/db/tdb_mpool.c @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#include "tdb_mpool.h" \ No newline at end of file diff --git a/source/libs/tdb/src/inc/tdb_inc.h b/source/libs/tdb/src/inc/tdb_inc.h index 1e9c3dd8cc..cce6bc3bda 100644 --- a/source/libs/tdb/src/inc/tdb_inc.h +++ b/source/libs/tdb/src/inc/tdb_inc.h @@ -17,6 +17,7 @@ #define _TD_TDB_INC_H_ #include "os.h" +#include "tlist.h" #ifdef __cplusplus extern "C" { diff --git a/source/libs/tdb/src/inc/tdb_mpfile.h b/source/libs/tdb/src/inc/tdb_mpfile.h index 74593af2f6..cd4823081a 100644 --- a/source/libs/tdb/src/inc/tdb_mpfile.h +++ b/source/libs/tdb/src/inc/tdb_mpfile.h @@ -16,7 +16,6 @@ #ifndef _TD_TDB_MPFILE_H_ #define _TD_TDB_MPFILE_H_ -#include "tdbDef.h" #include "tdb_mpool.h" #ifdef __cplusplus diff --git a/source/libs/tdb/src/inc/tdb_mpool.h b/source/libs/tdb/src/inc/tdb_mpool.h index 1023b14a50..8d113e5edc 100644 --- a/source/libs/tdb/src/inc/tdb_mpool.h +++ b/source/libs/tdb/src/inc/tdb_mpool.h @@ -25,6 +25,12 @@ extern "C" { // Exposed handle typedef struct TDB_MPOOL TDB_MPOOL; +#define TDB_FILE_UID_LEN 20 +typedef struct { + uint8_t fuid[TDB_FILE_UID_LEN]; + pgid_t pgid; +} mp_pgid_t; + // Exposed apis int tdbOpenMP(TDB_MPOOL **mpp, uint64_t cachesize, pgsize_t pgsize); int tdbCloseMP(TDB_MPOOL *mp); @@ -32,15 +38,9 @@ int tdbMPFetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p); int tdbMpUnfetchPage(TDB_MPOOL *mp, mp_pgid_t mpgid, void *p); // Hidden impls -#define TDB_FILE_UID_LEN 20 - -typedef struct { - uint8_t fuid[TDB_FILE_UID_LEN]; - pgid_t pgid; -} mp_pgid_t; typedef struct MP_PAGE { - SRWLatch rwLatch; + // SRWLatch rwLatch; mp_pgid_t mpgid; uint8_t dirty; int32_t pinRef; -- GitLab