From f5e16f968d47aa222f068ac5c3f2ccda6ac24e0e Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 25 Apr 2022 08:39:10 +0000 Subject: [PATCH] fix problems --- source/libs/tdb/src/db/tdbPCache.c | 4 ++++ source/libs/tdb/test/tdbTest.cpp | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c index e9d8e7a59b..0ccf7f5f92 100644 --- a/source/libs/tdb/src/db/tdbPCache.c +++ b/source/libs/tdb/src/db/tdbPCache.c @@ -193,6 +193,10 @@ static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, TXN *pTxn) memcpy(pPage->pData, pPageH->pData, pPage->pageSize); tdbPageInit(pPage, pPageH->pPageHdr - pPageH->pData, pPageH->xCellSize); + pPage->kLen = pPageH->kLen; + pPage->vLen = pPageH->vLen; + pPage->maxLocal = pPageH->maxLocal; + pPage->minLocal = pPageH->minLocal; } else { memcpy(&(pPage->pgid), pPgid, sizeof(*pPgid)); pPage->pLruNext = NULL; diff --git a/source/libs/tdb/test/tdbTest.cpp b/source/libs/tdb/test/tdbTest.cpp index 420d1d991f..49763ae937 100644 --- a/source/libs/tdb/test/tdbTest.cpp +++ b/source/libs/tdb/test/tdbTest.cpp @@ -1,5 +1,6 @@ #include +#include "os.h" #include "tdbInt.h" #include @@ -122,6 +123,8 @@ TEST(tdb_test, simple_test) { int nData = 10000000; TXN txn; + taosRemoveDir("tdb"); + // Open Env ret = tdbEnvOpen("tdb", 4096, 64, &pEnv); GTEST_ASSERT_EQ(ret, 0); @@ -235,15 +238,17 @@ TEST(tdb_test, simple_test2) { TENV *pEnv; TDB *pDb; FKeyComparator compFunc; - int nData = 10000; + int nData = 1000000; TXN txn; + taosRemoveDir("tdb"); + // Open Env - ret = tdbEnvOpen("tdb", 1024, 0, &pEnv); + ret = tdbEnvOpen("tdb", 1024, 10, &pEnv); GTEST_ASSERT_EQ(ret, 0); // Create a database - compFunc = tKeyCmpr; + compFunc = tDefaultKeyCmpr; ret = tdbDbOpen("db.db", TDB_VARIANT_LEN, TDB_VARIANT_LEN, compFunc, pEnv, &pDb); GTEST_ASSERT_EQ(ret, 0);