refact more
This commit is contained in:
parent
f75f60c84c
commit
a6f0d2b553
|
@ -210,7 +210,6 @@ int tdbPagerCommit(SPager *pPager) {
|
|||
|
||||
tdbOsClose(pPager->jfd);
|
||||
tdbOsRemove(pPager->jFileName);
|
||||
// pPager->jfd = -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -95,7 +95,11 @@ typedef int tdb_fd_t;
|
|||
|
||||
#define tdbOsOpen(PATH, OPTION, MODE) open((PATH), (OPTION), (MODE))
|
||||
|
||||
#define tdbOsClose close
|
||||
#define tdbOsClose(FD) \
|
||||
do { \
|
||||
close(FD); \
|
||||
(FD) = -1; \
|
||||
} while (0)
|
||||
|
||||
i64 tdbOsRead(tdb_fd_t fd, void *pData, i64 nBytes);
|
||||
i64 tdbOsPRead(tdb_fd_t fd, void *pData, i64 nBytes, i64 offset);
|
||||
|
|
|
@ -135,12 +135,6 @@ TEST(tdb_test, simple_test) {
|
|||
|
||||
{ // Insert some data
|
||||
int i = 1;
|
||||
SPoolMem *pPool;
|
||||
int memPoolCapacity = 16 * 1024;
|
||||
|
||||
pPool = openPool();
|
||||
|
||||
tdbTxnBegin(pEnv);
|
||||
|
||||
for (;;) {
|
||||
if (i > nData) break;
|
||||
|
@ -150,18 +144,10 @@ TEST(tdb_test, simple_test) {
|
|||
ret = tdbDbInsert(pDb, key, strlen(key), val, strlen(val));
|
||||
GTEST_ASSERT_EQ(ret, 0);
|
||||
|
||||
if (pPool->size >= memPoolCapacity) {
|
||||
tdbTxnCommit(pEnv);
|
||||
|
||||
clearPool(pPool);
|
||||
|
||||
tdbTxnBegin(pEnv);
|
||||
}
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
closePool(pPool);
|
||||
// tdbPagerCommit()
|
||||
}
|
||||
|
||||
{ // Query the data
|
||||
|
|
Loading…
Reference in New Issue