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

make windows compile pass

This commit is contained in:
Hongze Cheng 2022-05-19 08:16:06 +00:00
parent f30e6be9e0
commit c49b3f39d9
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/libs/tdb/test/tdbTest.cpp
View File

@ -515,11 +515,11 @@ TEST(tdb_test, multi_thread_query) {
// start a transaction // start a transaction
txnid++; txnid++;
txn = (TXN){.flags = TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED, txn.flags = TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED;
.txnId = -1, txn.txnId = -1;
.xMalloc = poolMalloc, txn.xMalloc = poolMalloc;
.xFree = poolFree, txn.xFree = poolFree;
.xArg = pPool}; txn.xArg = pPool;
// tdbTxnOpen(&txn, txnid, poolMalloc, poolFree, pPool, ); // tdbTxnOpen(&txn, txnid, poolMalloc, poolFree, pPool, );
tdbBegin(pEnv, &txn); tdbBegin(pEnv, &txn);
@ -528,20 +528,6 @@ TEST(tdb_test, multi_thread_query) {
sprintf(val, "value%d", iData); sprintf(val, "value%d", iData);
ret = tdbTbInsert(pDb, key, strlen(key), val, strlen(val), &txn); ret = tdbTbInsert(pDb, key, strlen(key), val, strlen(val), &txn);
GTEST_ASSERT_EQ(ret, 0); GTEST_ASSERT_EQ(ret, 0);
// if pool is full, commit the transaction and start a new one
// if (pPool->size >= poolLimit) {
// break;
// // commit current transaction
// tdbCommit(pEnv, &txn);
// tdbTxnClose(&txn);
// // start a new transaction
// clearPool(pPool);
// txnid++;
// tdbTxnOpen(&txn, txnid, poolMalloc, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
// tdbBegin(pEnv, &txn);
// }
} }
auto f = [](TTB *pDb, int nData) { auto f = [](TTB *pDb, int nData) {
@ -554,7 +540,11 @@ TEST(tdb_test, multi_thread_query) {
TXN txn; TXN txn;
SPoolMem *pPool = openPool(); SPoolMem *pPool = openPool();
txn = (TXN){.flags = 0, .txnId = 0, .xMalloc = poolMalloc, .xFree = poolFree, .xArg = pPool}; txn.flags = 0;
txn.txnId = 0;
txn.xMalloc = poolMalloc;
txn.xFree = poolFree;
txn.xArg = pPool;
ret = tdbTbcOpen(pDb, &pDBC, &txn); ret = tdbTbcOpen(pDb, &pDBC, &txn);
GTEST_ASSERT_EQ(ret, 0); GTEST_ASSERT_EQ(ret, 0);