This commit is contained in:
Hongze Cheng 2022-01-20 10:15:07 +00:00
parent a9eeafe319
commit ca25ddc730
1 changed files with 3 additions and 7 deletions

View File

@ -196,16 +196,14 @@ static int tdbGnrtFileID(const char *fname, uint8_t *fileid) {
#define MPF_GET_BUCKETID(fileid) \ #define MPF_GET_BUCKETID(fileid) \
({ \ ({ \
uint64_t *tmp = fileid; \ uint64_t *tmp = (uint64_t *)fileid; \
(tmp[0] + tmp[1] + tmp[2]) % MPF_HASH_BUCKETS; \ (tmp[0] + tmp[1] + tmp[2]) % MPF_HASH_BUCKETS; \
}) })
static void tdbMPoolRegFile(TDB_MPOOL *mp, TDB_MPFILE *mpf) { static void tdbMPoolRegFile(TDB_MPOOL *mp, TDB_MPFILE *mpf) {
int bucketid;
mpf_bucket_t *bktp; mpf_bucket_t *bktp;
bucketid = MPF_GET_BUCKETID(mpf->fileid); bktp = mp->mpfht.buckets + MPF_GET_BUCKETID(mpf->fileid);
bktp = mp->mpfht.buckets + bucketid;
taosWLockLatch(&(bktp->latch)); taosWLockLatch(&(bktp->latch));
@ -217,12 +215,10 @@ static void tdbMPoolRegFile(TDB_MPOOL *mp, TDB_MPFILE *mpf) {
} }
static TDB_MPFILE *tdbMPoolGetFile(TDB_MPOOL *mp, uint8_t *fileid) { static TDB_MPFILE *tdbMPoolGetFile(TDB_MPOOL *mp, uint8_t *fileid) {
int bucketid;
TDB_MPFILE * mpf = NULL; TDB_MPFILE * mpf = NULL;
mpf_bucket_t *bktp; mpf_bucket_t *bktp;
bucketid = MPF_GET_BUCKETID(fileid); bktp = mp->mpfht.buckets + MPF_GET_BUCKETID(fileid);
bktp = mp->mpfht.buckets + bucketid;
taosRLockLatch(&(bktp->latch)); taosRLockLatch(&(bktp->latch));