tdbPager.c 27.6 KB
Newer Older
H
Hongze Cheng 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13
/*
 * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
 *
 * 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 <http://www.gnu.org/licenses/>.
H
refact  
Hongze Cheng 已提交
14 15
 */

H
Hongze Cheng 已提交
16
#include "tdbInt.h"
17
/*
H
Hongze Cheng 已提交
18
#pragma pack(push, 1)
wafwerar's avatar
wafwerar 已提交
19
typedef struct {
H
Hongze Cheng 已提交
20 21 22 23 24
  u8    hdrString[16];
  u16   pageSize;
  SPgno freePage;
  u32   nFreePages;
  u8    reserved[102];
H
Hongze Cheng 已提交
25
} SFileHdr;
wafwerar's avatar
wafwerar 已提交
26
#pragma pack(pop)
H
Hongze Cheng 已提交
27

H
Hongze Cheng 已提交
28
TDB_STATIC_ASSERT(sizeof(SFileHdr) == 128, "Size of file header is not correct");
29
*/
30
struct hashset_st {
M
Minglei Jin 已提交
31 32 33
  size_t  nbits;
  size_t  mask;
  size_t  capacity;
34
  size_t *items;
M
Minglei Jin 已提交
35 36
  size_t  nitems;
  double  load_factor;
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
};

static const unsigned int prime = 39;
static const unsigned int prime2 = 5009;

hashset_t hashset_create(void) {
  hashset_t set = tdbOsCalloc(1, sizeof(struct hashset_st));
  if (!set) {
    return NULL;
  }

  set->nbits = 4;
  set->capacity = (size_t)(1 << set->nbits);
  set->items = tdbOsCalloc(set->capacity, sizeof(size_t));
  if (!set->items) {
    tdbOsFree(set);
    return NULL;
  }
  set->mask = set->capacity - 1;
  set->nitems = 0;

  set->load_factor = 0.75;

  return set;
}

void hashset_destroy(hashset_t set) {
  if (set) {
    tdbOsFree(set->items);
    tdbOsFree(set);
  }
}

int hashset_add_member(hashset_t set, void *item) {
M
Minglei Jin 已提交
71
  size_t value = (size_t)item;
72 73 74
  size_t h;

  if (value == 0) {
M
Minglei Jin 已提交
75
    return -1;
76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
  }

  for (h = set->mask & (prime * value); set->items[h] != 0; h = set->mask & (h + prime2)) {
    if (set->items[h] == value) {
      return 0;
    }
  }

  set->items[h] = value;
  ++set->nitems;
  return 1;
}

int hashset_add(hashset_t set, void *item) {
  int ret = hashset_add_member(set, item);

  size_t old_capacity = set->capacity;
  if (set->nitems >= (double)old_capacity * set->load_factor) {
    size_t *old_items = set->items;
    ++set->nbits;
    set->capacity = (size_t)(1 << set->nbits);
    set->mask = set->capacity - 1;

    set->items = tdbOsCalloc(set->capacity, sizeof(size_t));
    if (!set->items) {
      return -1;
    }

    set->nitems = 0;
    for (size_t i = 0; i < old_capacity; ++i) {
M
Minglei Jin 已提交
106
      hashset_add_member(set, (void *)old_items[i]);
107 108 109 110 111 112 113 114
    }
    tdbOsFree(old_items);
  }

  return ret;
}

int hashset_remove(hashset_t set, void *item) {
M
Minglei Jin 已提交
115
  size_t value = (size_t)item;
116 117 118 119 120 121 122 123 124 125 126 127 128

  for (size_t h = set->mask & (prime * value); set->items[h] != 0; h = set->mask & (h + prime2)) {
    if (set->items[h] == value) {
      set->items[h] = 0;
      --set->nitems;
      return 1;
    }
  }

  return 0;
}

int hashset_contains(hashset_t set, void *item) {
M
Minglei Jin 已提交
129
  size_t value = (size_t)item;
130 131 132 133 134 135 136 137 138 139

  for (size_t h = set->mask & (prime * value); set->items[h] != 0; h = set->mask & (h + prime2)) {
    if (set->items[h] == value) {
      return 1;
    }
  }

  return 0;
}

H
Hongze Cheng 已提交
140 141
#define TDB_PAGE_INITIALIZED(pPage) ((pPage)->pPager != NULL)

H
Hongze Cheng 已提交
142 143
static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage *, void *, int), void *arg,
                            u8 loadPage);
H
Hongze Cheng 已提交
144
static int tdbPagerWritePageToJournal(SPager *pPager, SPage *pPage);
145
static int tdbPagerPWritePageToDB(SPager *pPager, SPage *pPage);
H
Hongze Cheng 已提交
146

H
Hongze Cheng 已提交
147 148 149
static FORCE_INLINE int32_t pageCmpFn(const SRBTreeNode *lhs, const SRBTreeNode *rhs) {
  SPage *pPageL = (SPage *)(((uint8_t *)lhs) - offsetof(SPage, node));
  SPage *pPageR = (SPage *)(((uint8_t *)rhs) - offsetof(SPage, node));
150 151 152 153 154 155 156 157 158 159 160 161 162

  SPgno pgnoL = TDB_PAGE_PGNO(pPageL);
  SPgno pgnoR = TDB_PAGE_PGNO(pPageR);

  if (pgnoL < pgnoR) {
    return -1;
  } else if (pgnoL > pgnoR) {
    return 1;
  } else {
    return 0;
  }
}

H
refact  
Hongze Cheng 已提交
163
int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
H
more  
Hongze Cheng 已提交
164
  uint8_t *pPtr;
H
Hongze Cheng 已提交
165
  SPager  *pPager;
H
more  
Hongze Cheng 已提交
166 167
  int      fsize;
  int      zsize;
H
Hongze Cheng 已提交
168
  int      ret;
H
more  
Hongze Cheng 已提交
169

H
refact  
Hongze Cheng 已提交
170
  *ppPager = NULL;
H
more  
Hongze Cheng 已提交
171 172

  fsize = strlen(fileName);
H
refact  
Hongze Cheng 已提交
173
  zsize = sizeof(*pPager)  /* SPager */
H
more  
Hongze Cheng 已提交
174 175
          + fsize + 1      /* dbFileName */
          + fsize + 8 + 1; /* jFileName */
H
Hongze Cheng 已提交
176
  pPtr = (uint8_t *)tdbOsCalloc(1, zsize);
H
more  
Hongze Cheng 已提交
177 178 179 180
  if (pPtr == NULL) {
    return -1;
  }

H
refact  
Hongze Cheng 已提交
181 182 183 184 185 186
  pPager = (SPager *)pPtr;
  pPtr += sizeof(*pPager);
  // pPager->dbFileName
  pPager->dbFileName = (char *)pPtr;
  memcpy(pPager->dbFileName, fileName, fsize);
  pPager->dbFileName[fsize] = '\0';
H
more  
Hongze Cheng 已提交
187
  pPtr += fsize + 1;
H
refact  
Hongze Cheng 已提交
188 189 190 191 192 193 194 195
  // pPager->jFileName
  pPager->jFileName = (char *)pPtr;
  memcpy(pPager->jFileName, fileName, fsize);
  memcpy(pPager->jFileName + fsize, "-journal", 8);
  pPager->jFileName[fsize + 8] = '\0';
  // pPager->pCache
  pPager->pCache = pCache;

H
Hongze Cheng 已提交
196
  pPager->fd = tdbOsOpen(pPager->dbFileName, TDB_O_CREAT | TDB_O_RDWR, 0755);
M
Minglei Jin 已提交
197 198
  if (TDB_FD_INVALID(pPager->fd)) {
    // if (pPager->fd < 0) {
H
more  
Hongze Cheng 已提交
199 200 201
    return -1;
  }

wafwerar's avatar
wafwerar 已提交
202
  ret = tdbGnrtFileID(pPager->fd, pPager->fid, false);
H
Hongze Cheng 已提交
203 204 205 206
  if (ret < 0) {
    return -1;
  }

H
Hongze Cheng 已提交
207
  // pPager->jfd = -1;
H
Hongze Cheng 已提交
208
  pPager->pageSize = tdbPCacheGetPageSize(pCache);
H
Hongze Cheng 已提交
209 210
  // pPager->dbOrigSize
  ret = tdbGetFileSize(pPager->fd, pPager->pageSize, &(pPager->dbOrigSize));
H
Hongze Cheng 已提交
211
  pPager->dbFileSize = pPager->dbOrigSize;
H
more  
Hongze Cheng 已提交
212

213
  tdbTrace("pager/open reset dirty tree: %p", &pPager->rbt);
214 215
  tRBTreeCreate(&pPager->rbt, pageCmpFn);

H
refact  
Hongze Cheng 已提交
216
  *ppPager = pPager;
H
more  
Hongze Cheng 已提交
217 218 219
  return 0;
}

H
refact  
Hongze Cheng 已提交
220
int tdbPagerClose(SPager *pPager) {
H
Hongze Cheng 已提交
221
  if (pPager) {
M
Minglei Jin 已提交
222
    /*
H
Hongze Cheng 已提交
223 224 225
    if (pPager->inTran) {
      tdbOsClose(pPager->jfd);
    }
M
Minglei Jin 已提交
226
    */
H
Hongze Cheng 已提交
227 228 229
    tdbOsClose(pPager->fd);
    tdbOsFree(pPager);
  }
H
more  
Hongze Cheng 已提交
230 231
  return 0;
}
H
Hongze Cheng 已提交
232

H
refact  
Hongze Cheng 已提交
233
int tdbPagerWrite(SPager *pPager, SPage *pPage) {
H
Hongze Cheng 已提交
234 235
  int     ret;
  SPage **ppPage;
H
more  
Hongze Cheng 已提交
236

H
Hongze Cheng 已提交
237
  if (pPage->isDirty) return 0;
H
more  
Hongze Cheng 已提交
238

H
Hongze Cheng 已提交
239
  // ref page one more time so the page will not be release
H
Hongze Cheng 已提交
240
  tdbRefPage(pPage);
241
  tdbTrace("pager/mdirty page %p/%d/%d", pPage, TDB_PAGE_PGNO(pPage), pPage->id);
242

H
Hongze Cheng 已提交
243 244
  // Set page as dirty
  pPage->isDirty = 1;
245

246
  tdbTrace("tdb/pager-write: put page: %p %d to dirty tree: %p", pPage, TDB_PAGE_PGNO(pPage), &pPager->rbt);
247
  tRBTreePut(&pPager->rbt, (SRBTreeNode *)pPage);
H
Hongze Cheng 已提交
248

H
Hongze Cheng 已提交
249
  // Write page to journal if neccessary
M
Minglei Jin 已提交
250
  if (TDB_PAGE_PGNO(pPage) <= pPager->dbOrigSize &&
M
Minglei Jin 已提交
251 252
      (pPager->pActiveTxn->jPageSet == NULL ||
       !hashset_contains(pPager->pActiveTxn->jPageSet, (void *)((long)TDB_PAGE_PGNO(pPage))))) {
H
Hongze Cheng 已提交
253 254
    ret = tdbPagerWritePageToJournal(pPager, pPage);
    if (ret < 0) {
255
      tdbError("failed to write page to journal since %s", tstrerror(terrno));
H
Hongze Cheng 已提交
256
      return -1;
H
Hongze Cheng 已提交
257
    }
258

M
Minglei Jin 已提交
259 260
    if (pPager->pActiveTxn->jPageSet) {
      hashset_add(pPager->pActiveTxn->jPageSet, (void *)((long)TDB_PAGE_PGNO(pPage)));
261
    }
H
more  
Hongze Cheng 已提交
262
  }
H
Hongze Cheng 已提交
263

H
Hongze Cheng 已提交
264 265 266
  return 0;
}

H
Hongze Cheng 已提交
267
int tdbPagerBegin(SPager *pPager, TXN *pTxn) {
M
Minglei Jin 已提交
268
  /*
H
refact  
Hongze Cheng 已提交
269
  if (pPager->inTran) {
H
more  
Hongze Cheng 已提交
270 271
    return 0;
  }
M
Minglei Jin 已提交
272
  */
H
Hongze Cheng 已提交
273
  // Open the journal
M
Minglei Jin 已提交
274 275 276 277
  char jTxnFileName[TDB_FILENAME_LEN];
  sprintf(jTxnFileName, "%s.%" PRId64, pPager->jFileName, pTxn->txnId);
  pTxn->jfd = tdbOsOpen(jTxnFileName, TDB_O_CREAT | TDB_O_RDWR, 0755);
  if (TDB_FD_INVALID(pTxn->jfd)) {
278 279
    tdbError("failed to open file due to %s. jFileName:%s", strerror(errno), pPager->jFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
H
Hongze Cheng 已提交
280 281 282
    return -1;
  }

M
Minglei Jin 已提交
283
  pTxn->jPageSet = hashset_create();
M
Minglei Jin 已提交
284

M
Minglei Jin 已提交
285
  pPager->pActiveTxn = pTxn;
286 287 288

  tdbDebug("pager/begin: %p, %d/%d, txnId:%" PRId64, pPager, pPager->dbOrigSize, pPager->dbFileSize, pTxn->txnId);

H
Hongze Cheng 已提交
289
  // TODO: write the size of the file
M
Minglei Jin 已提交
290
  /*
H
refact  
Hongze Cheng 已提交
291
  pPager->inTran = 1;
M
Minglei Jin 已提交
292
  */
H
more  
Hongze Cheng 已提交
293 294 295
  return 0;
}

H
Hongze Cheng 已提交
296
int tdbPagerCommit(SPager *pPager, TXN *pTxn) {
H
Hongze Cheng 已提交
297 298 299
  SPage *pPage;
  int    ret;

H
Hongze Cheng 已提交
300
  // sync the journal file
M
Minglei Jin 已提交
301
  ret = tdbOsFSync(pTxn->jfd);
H
Hongze Cheng 已提交
302
  if (ret < 0) {
M
Minglei Jin 已提交
303
    tdbError("failed to fsync: %s. jFileName:%s, %" PRId64, strerror(errno), pPager->jFileName, pTxn->txnId);
304 305
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
H
Hongze Cheng 已提交
306 307
  }

308
  // loop to write the dirty pages to file
309 310 311 312
  SRBTreeIter  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  SRBTreeNode *pNode = NULL;
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
313

314 315 316 317 318
    if (pPage->nOverflow != 0) {
      tdbError("tdb/pager-commit: %p, pPage: %p, ovfl: %d, commit page failed.", pPager, pPage, pPage->nOverflow);
      return -1;
    }

319
    ret = tdbPagerPWritePageToDB(pPager, pPage);
320
    if (ret < 0) {
321
      tdbError("failed to write page to db since %s", tstrerror(terrno));
322 323 324 325
      return -1;
    }
  }

326 327
  tdbDebug("pager/commit: %p, %d/%d, txnId:%" PRId64, pPager, pPager->dbOrigSize, pPager->dbFileSize, pTxn->txnId);

328
  pPager->dbOrigSize = pPager->dbFileSize;
H
Hongze Cheng 已提交
329

H
Hongze Cheng 已提交
330
  // release the page
331 332 333
  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
H
Hongze Cheng 已提交
334 335 336

    pPage->isDirty = 0;

337
    tRBTreeDrop(&pPager->rbt, (SRBTreeNode *)pPage);
M
Minglei Jin 已提交
338 339
    if (pTxn->jPageSet) {
      hashset_remove(pTxn->jPageSet, (void *)((long)TDB_PAGE_PGNO(pPage)));
340
    }
H
Hongze Cheng 已提交
341
    tdbPCacheRelease(pPager->pCache, pPage, pTxn);
H
Hongze Cheng 已提交
342
  }
343

344
  tdbTrace("pager/commit reset dirty tree: %p", &pPager->rbt);
345
  tRBTreeCreate(&pPager->rbt, pageCmpFn);
H
Hongze Cheng 已提交
346 347

  // sync the db file
348 349 350 351 352
  if (tdbOsFSync(pPager->fd) < 0) {
    tdbError("failed to fsync fd due to %s. file:%s", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }
H
Hongze Cheng 已提交
353

354 355 356 357
  return 0;
}

int tdbPagerPostCommit(SPager *pPager, TXN *pTxn) {
M
Minglei Jin 已提交
358 359 360
  char jTxnFileName[TDB_FILENAME_LEN];
  sprintf(jTxnFileName, "%s.%" PRId64, pPager->jFileName, pTxn->txnId);

361
  // remove the journal file
M
Minglei Jin 已提交
362 363
  if (tdbOsClose(pTxn->jfd) < 0) {
    tdbError("failed to close jfd: %s. file:%s, %" PRId64, strerror(errno), pPager->jFileName, pTxn->txnId);
364 365 366 367
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

M
Minglei Jin 已提交
368 369
  if (tdbOsRemove(jTxnFileName) < 0 && errno != ENOENT) {
    tdbError("failed to remove file due to %s. file:%s", strerror(errno), jTxnFileName);
370 371 372 373
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

M
Minglei Jin 已提交
374
  // pPager->inTran = 0;
375

376 377
  tdbDebug("pager/post-commit:%p, %d/%d", pPager, pPager->dbOrigSize, pPager->dbFileSize);

378 379 380
  return 0;
}

381 382
int tdbPagerPrepareAsyncCommit(SPager *pPager, TXN *pTxn) {
  SPage *pPage;
M
Minglei Jin 已提交
383
  SPgno  maxPgno = pPager->dbOrigSize;
384 385 386
  int    ret;

  // sync the journal file
M
Minglei Jin 已提交
387
  ret = tdbOsFSync(pTxn->jfd);
388
  if (ret < 0) {
M
Minglei Jin 已提交
389
    tdbError("failed to fsync jfd: %s. jfile:%s, %" PRId64, strerror(errno), pPager->jFileName, pTxn->txnId);
390 391 392 393
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

394 395 396 397 398 399
  // loop to write the dirty pages to file
  SRBTreeIter  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  SRBTreeNode *pNode = NULL;
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
    if (pPage->isLocal) continue;
M
Minglei Jin 已提交
400 401 402 403 404

    SPgno pgno = TDB_PAGE_PGNO(pPage);
    if (pgno > maxPgno) {
      maxPgno = pgno;
    }
405
    ret = tdbPagerPWritePageToDB(pPager, pPage);
406 407 408 409 410 411 412
    if (ret < 0) {
      tdbError("failed to write page to db since %s", tstrerror(terrno));
      return -1;
    }
  }

  tdbTrace("tdbttl commit:%p, %d/%d", pPager, pPager->dbOrigSize, pPager->dbFileSize);
M
Minglei Jin 已提交
413 414
  pPager->dbOrigSize = maxPgno;
  //  pPager->dbOrigSize = pPager->dbFileSize;
415 416 417 418 419 420 421 422 423 424 425

  // release the page
  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
    if (pPage->isLocal) continue;
    pPage->isDirty = 0;

    tRBTreeDrop(&pPager->rbt, (SRBTreeNode *)pPage);
    tdbPCacheRelease(pPager->pCache, pPage, pTxn);
  }
M
Minglei Jin 已提交
426

427
  /*
428
  tdbTrace("reset dirty tree: %p", &pPager->rbt);
429
  tRBTreeCreate(&pPager->rbt, pageCmpFn);
430

431 432 433 434 435 436 437
  // sync the db file
  if (tdbOsFSync(pPager->fd) < 0) {
    tdbError("failed to fsync fd due to %s. file:%s", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }
  */
438 439 440
  return 0;
}

441 442 443 444 445 446 447
// recovery dirty pages
int tdbPagerAbort(SPager *pPager, TXN *pTxn) {
  SPage *pPage;
  int    pgIdx;
  SPgno  journalSize = 0;
  int    ret;

448 449 450 451 452
  if (pTxn->jfd == 0) {
    // txn is commited
    return 0;
  }

M
Minglei Jin 已提交
453 454
  // sync the journal file
  ret = tdbOsFSync(pTxn->jfd);
455
  if (ret < 0) {
M
Minglei Jin 已提交
456
    tdbError("failed to fsync jfd: %s. jfile:%s, %" PRId64, strerror(errno), pPager->jFileName, pTxn->txnId);
457 458
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
459 460
  }

M
Minglei Jin 已提交
461
  tdb_fd_t jfd = pTxn->jfd;
462 463 464 465 466 467

  ret = tdbGetFileSize(jfd, pPager->pageSize, &journalSize);
  if (ret < 0) {
    return -1;
  }

468 469 470 471 472 473
  if (tdbOsLSeek(jfd, 0L, SEEK_SET) < 0) {
    tdbError("failed to lseek jfd due to %s. file:%s, offset:0", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

M
Minglei Jin 已提交
474
  u8 *pageBuf = tdbOsCalloc(1, pPager->pageSize);
475 476 477
  if (pageBuf == NULL) {
    return -1;
  }
478

479
  tdbDebug("pager/abort: %p, %d/%d, txnId:%" PRId64, pPager, pPager->dbOrigSize, pPager->dbFileSize, pTxn->txnId);
480

481
  for (int pgIndex = 0; pgIndex < journalSize; ++pgIndex) {
482 483 484 485 486
    // read pgno & the page from journal
    SPgno pgno;

    int ret = tdbOsRead(jfd, &pgno, sizeof(pgno));
    if (ret < 0) {
487
      tdbOsFree(pageBuf);
488 489 490
      return -1;
    }

491 492 493
    tdbTrace("pager/abort: restore pgno:%d,", pgno);

    tdbPCacheInvalidatePage(pPager->pCache, pPager, pgno);
494

495 496
    ret = tdbOsRead(jfd, pageBuf, pPager->pageSize);
    if (ret < 0) {
497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514
      tdbOsFree(pageBuf);
      return -1;
    }

    i64 offset = pPager->pageSize * (pgno - 1);
    if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) {
      tdbError("failed to lseek fd due to %s. file:%s, offset:%" PRId64, strerror(errno), pPager->dbFileName, offset);
      terrno = TAOS_SYSTEM_ERROR(errno);
      tdbOsFree(pageBuf);
      return -1;
    }

    ret = tdbOsWrite(pPager->fd, pageBuf, pPager->pageSize);
    if (ret < 0) {
      tdbError("failed to write buf due to %s. file: %s, bufsize:%d", strerror(errno), pPager->dbFileName,
               pPager->pageSize);
      terrno = TAOS_SYSTEM_ERROR(errno);
      tdbOsFree(pageBuf);
515 516 517
      return -1;
    }
  }
518 519 520 521 522 523 524 525 526 527

  if (tdbOsFSync(pPager->fd) < 0) {
    tdbError("failed to fsync fd due to %s. dbfile:%s", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    tdbOsFree(pageBuf);
    return -1;
  }

  tdbOsFree(pageBuf);

528
  // 3, release the dirty pages
529 530 531 532
  SRBTreeIter  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  SRBTreeNode *pNode = NULL;
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
533 534 535
    SPgno pgno = TDB_PAGE_PGNO(pPage);

    tdbTrace("pager/abort: drop dirty pgno:%d,", pgno);
536 537 538

    pPage->isDirty = 0;

539
    tRBTreeDrop(&pPager->rbt, (SRBTreeNode *)pPage);
M
Minglei Jin 已提交
540
    hashset_remove(pTxn->jPageSet, (void *)((long)TDB_PAGE_PGNO(pPage)));
M
Minglei Jin 已提交
541
    tdbPCacheMarkFree(pPager->pCache, pPage);
542 543 544
    tdbPCacheRelease(pPager->pCache, pPage, pTxn);
  }

545
  tdbTrace("pager/abort: reset dirty tree: %p", &pPager->rbt);
546 547
  tRBTreeCreate(&pPager->rbt, pageCmpFn);

548
  // 4, remove the journal file
M
Minglei Jin 已提交
549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564
  if (tdbOsClose(pTxn->jfd) < 0) {
    tdbError("failed to close jfd: %s. file:%s, %" PRId64, strerror(errno), pPager->jFileName, pTxn->txnId);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

  char jTxnFileName[TDB_FILENAME_LEN];
  sprintf(jTxnFileName, "%s.%" PRId64, pPager->jFileName, pTxn->txnId);

  if (tdbOsRemove(jTxnFileName) < 0 && errno != ENOENT) {
    tdbError("failed to remove file due to %s. file:%s", strerror(errno), jTxnFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

  // pPager->inTran = 0;
H
Hongze Cheng 已提交
565

H
more  
Hongze Cheng 已提交
566 567 568
  return 0;
}

569 570
int tdbPagerFlushPage(SPager *pPager, TXN *pTxn) {
  SPage *pPage;
571 572
  i32    nRef;
  SPgno  maxPgno = pPager->dbOrigSize;
573 574 575 576 577 578 579
  int    ret;

  // loop to write the dirty pages to file
  SRBTreeIter  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  SRBTreeNode *pNode = NULL;
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
580 581 582 583 584 585 586 587 588
    nRef = tdbGetPageRef(pPage);
    if (nRef > 1) {
      continue;
    }

    SPgno pgno = TDB_PAGE_PGNO(pPage);
    if (pgno > maxPgno) {
      maxPgno = pgno;
    }
589
    ret = tdbPagerPWritePageToDB(pPager, pPage);
590 591 592 593 594
    if (ret < 0) {
      tdbError("failed to write page to db since %s", tstrerror(terrno));
      return -1;
    }

595
    tdbTrace("tdb/flush:%p, pgno:%d, %d/%d/%d", pPager, pgno, pPager->dbOrigSize, pPager->dbFileSize, maxPgno);
596 597 598 599
    pPager->dbOrigSize = maxPgno;

    pPage->isDirty = 0;

600
    tdbTrace("pager/flush drop page: %p, pgno:%d, from dirty tree: %p", pPage, TDB_PAGE_PGNO(pPage), &pPager->rbt);
601 602 603 604 605
    tRBTreeDrop(&pPager->rbt, (SRBTreeNode *)pPage);
    tdbPCacheRelease(pPager->pCache, pPage, pTxn);

    break;
  }
606 607 608

  tdbDebug("pager/flush: %p, %d/%d, txnId:%" PRId64, pPager, pPager->dbOrigSize, pPager->dbFileSize, pTxn->txnId);

609 610 611
  /*
  tdbTrace("tdb/flush:%p, %d/%d/%d", pPager, pPager->dbOrigSize, pPager->dbFileSize, maxPgno);
  pPager->dbOrigSize = maxPgno;
612 613 614 615 616

  // release the page
  iter = tRBTreeIterCreate(&pPager->rbt, 1);
  while ((pNode = tRBTreeIterNext(&iter)) != NULL) {
    pPage = (SPage *)pNode;
617 618 619 620
    nRef = tdbGetPageRef(pPage);
    if (nRef > 1) {
      continue;
    }
621 622 623

    pPage->isDirty = 0;

624
    tdbTrace("pager/flush drop page: %p %d from dirty tree: %p", pPage, TDB_PAGE_PGNO(pPage), &pPager->rbt);
625 626 627
    tRBTreeDrop(&pPager->rbt, (SRBTreeNode *)pPage);
    tdbPCacheRelease(pPager->pCache, pPage, pTxn);
  }
628
  */
629 630 631
  return 0;
}

H
Hongze Cheng 已提交
632
int tdbPagerFetchPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPage)(SPage *, void *, int), void *arg,
H
Hongze Cheng 已提交
633
                      TXN *pTxn) {
H
more  
Hongze Cheng 已提交
634 635 636
  SPage *pPage;
  SPgid  pgid;
  int    ret;
H
Hongze Cheng 已提交
637 638
  SPgno  pgno;
  u8     loadPage;
H
more  
Hongze Cheng 已提交
639

H
Hongze Cheng 已提交
640 641
  pgno = *ppgno;
  loadPage = 1;
H
more  
Hongze Cheng 已提交
642

H
Hongze Cheng 已提交
643 644 645 646
  // alloc new page
  if (pgno == 0) {
    loadPage = 0;
    ret = tdbPagerAllocPage(pPager, &pgno);
H
Hongze Cheng 已提交
647
    if (ret < 0) {
648
      tdbError("tdb/pager: %p, ret: %d pgno: %" PRIu32 ", alloc page failed.", pPager, ret, pgno);
H
Hongze Cheng 已提交
649
      return -1;
H
more  
Hongze Cheng 已提交
650
    }
H
more  
Hongze Cheng 已提交
651 652
  }

653 654 655 656
  if (pgno == 0) {
    tdbError("tdb/pager: %p, ret: %d pgno: %" PRIu32 ", alloc page failed.", pPager, ret, pgno);
    return -1;
  }
H
Hongze Cheng 已提交
657

H
Hongze Cheng 已提交
658
  // fetch a page container
H
more  
Hongze Cheng 已提交
659
  memcpy(&pgid, pPager->fid, TDB_FILE_ID_LEN);
H
Hongze Cheng 已提交
660
  pgid.pgno = pgno;
661 662
  while ((pPage = tdbPCacheFetch(pPager->pCache, &pgid, pTxn)) == NULL) {
    tdbPagerFlushPage(pPager, pTxn);
H
more  
Hongze Cheng 已提交
663 664
  }

665
  tdbTrace("tdbttl fetch pager:%p", pPage->pPager);
H
Hongze Cheng 已提交
666 667 668 669
  // init page if need
  if (!TDB_PAGE_INITIALIZED(pPage)) {
    ret = tdbPagerInitPage(pPager, pPage, initPage, arg, loadPage);
    if (ret < 0) {
670
      tdbError("tdb/pager: %p, pPage: %p, init page failed.", pPager, pPage);
H
Hongze Cheng 已提交
671 672
      return -1;
    }
H
Hongze Cheng 已提交
673
  }
H
more  
Hongze Cheng 已提交
674

H
Hongze Cheng 已提交
675 676 677
  // printf("thread %" PRId64 " pager fetch page %d pgno %d ppage %p\n", taosGetSelfPthreadId(), pPage->id,
  //        TDB_PAGE_PGNO(pPage), pPage);

678 679 680 681 682 683 684 685
  if (!TDB_PAGE_INITIALIZED(pPage)) {
    tdbError("tdb/pager: %p, pPage: %p, fetch page uninited.", pPager, pPage);
    return -1;
  }
  if (pPage->pPager != pPager) {
    tdbError("tdb/pager: %p/%p, fetch page failed.", pPager, pPage->pPager);
    return -1;
  }
H
more  
Hongze Cheng 已提交
686

H
Hongze Cheng 已提交
687
  *ppgno = pgno;
H
more  
Hongze Cheng 已提交
688 689 690 691
  *ppPage = pPage;
  return 0;
}

H
Hongze Cheng 已提交
692 693 694 695 696
void tdbPagerReturnPage(SPager *pPager, SPage *pPage, TXN *pTxn) {
  tdbPCacheRelease(pPager->pCache, pPage, pTxn);
  // printf("thread %" PRId64 " pager retun page %d pgno %d ppage %p\n", taosGetSelfPthreadId(), pPage->id,
  //        TDB_PAGE_PGNO(pPage), pPage);
}
H
Hongze Cheng 已提交
697

H
more  
Hongze Cheng 已提交
698 699 700 701 702 703 704 705 706 707
static int tdbPagerAllocFreePage(SPager *pPager, SPgno *ppgno) {
  // TODO: Allocate a page from the free list
  return 0;
}

static int tdbPagerAllocNewPage(SPager *pPager, SPgno *ppgno) {
  *ppgno = ++pPager->dbFileSize;
  return 0;
}

H
Hongze Cheng 已提交
708
int tdbPagerAllocPage(SPager *pPager, SPgno *ppgno) {
H
more  
Hongze Cheng 已提交
709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726
  int ret;

  *ppgno = 0;

  // Try to allocate from the free list of the pager
  ret = tdbPagerAllocFreePage(pPager, ppgno);
  if (ret < 0) {
    return -1;
  }

  if (*ppgno != 0) return 0;

  // Allocate the page by extending the pager
  ret = tdbPagerAllocNewPage(pPager, ppgno);
  if (ret < 0) {
    return -1;
  }

727 728 729 730
  if (*ppgno == 0) {
    tdbError("tdb/pager:%p, alloc new page failed.", pPager);
    return -1;
  }
H
Hongze Cheng 已提交
731 732 733
  return 0;
}

H
Hongze Cheng 已提交
734 735 736 737 738
static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage *, void *, int), void *arg,
                            u8 loadPage) {
  int   ret;
  int   lcode;
  int   nLoops;
739 740
  i64   nRead = 0;
  SPgno pgno = 0;
H
Hongze Cheng 已提交
741
  int   init = 0;
H
Hongze Cheng 已提交
742

H
Hongze Cheng 已提交
743 744
  lcode = TDB_TRY_LOCK_PAGE(pPage);
  if (lcode == P_LOCK_SUCC) {
H
Hongze Cheng 已提交
745 746 747 748 749
    if (TDB_PAGE_INITIALIZED(pPage)) {
      TDB_UNLOCK_PAGE(pPage);
      return 0;
    }

H
Hongze Cheng 已提交
750 751
    pgno = TDB_PAGE_PGNO(pPage);

752
    tdbTrace("tdb/pager:%p, pgno:%d, loadPage:%d, size:%d", pPager, pgno, loadPage, pPager->dbOrigSize);
H
Hongze Cheng 已提交
753 754 755
    if (loadPage && pgno <= pPager->dbOrigSize) {
      init = 1;

H
Hongze Cheng 已提交
756
      nRead = tdbOsPRead(pPager->fd, pPage->pData, pPage->pageSize, ((i64)pPage->pageSize) * (pgno - 1));
757
      tdbTrace("tdb/pager:%p, pgno:%d, nRead:%" PRId64, pPager, pgno, nRead);
H
Hongze Cheng 已提交
758
      if (nRead < pPage->pageSize) {
759 760
        tdbError("tdb/pager:%p, pgno:%d, nRead:%" PRId64 "pgSize:%" PRId32, pPager, pgno, nRead, pPage->pageSize);
        TDB_UNLOCK_PAGE(pPage);
H
Hongze Cheng 已提交
761 762
        return -1;
      }
H
Hongze Cheng 已提交
763 764
    } else {
      init = 0;
H
Hongze Cheng 已提交
765 766
    }

H
Hongze Cheng 已提交
767
    ret = (*initPage)(pPage, arg, init);
H
Hongze Cheng 已提交
768
    if (ret < 0) {
769 770
      tdbError("tdb/pager:%p, pgno:%d, nRead:%" PRId64 "pgSize:%" PRId32 " init page failed.", pPager, pgno, nRead,
               pPage->pageSize);
H
Hongze Cheng 已提交
771 772 773 774 775 776 777
      TDB_UNLOCK_PAGE(pPage);
      return -1;
    }

    pPage->pPager = pPager;

    TDB_UNLOCK_PAGE(pPage);
H
Hongze Cheng 已提交
778
  } else if (lcode == P_LOCK_BUSY) {
H
Hongze Cheng 已提交
779 780 781 782 783 784 785 786 787
    nLoops = 0;
    for (;;) {
      if (TDB_PAGE_INITIALIZED(pPage)) break;
      nLoops++;
      if (nLoops > 1000) {
        sched_yield();
        nLoops = 0;
      }
    }
H
Hongze Cheng 已提交
788
  } else {
789 790
    tdbError("tdb/pager:%p, pgno:%d, nRead:%" PRId64 "pgSize:%" PRId32 " lock page failed.", pPager, pgno, nRead,
             pPage->pageSize);
H
Hongze Cheng 已提交
791
    return -1;
H
Hongze Cheng 已提交
792 793
  }

H
Hongze Cheng 已提交
794 795 796 797 798 799 800 801 802 803
  return 0;
}

// ---------------------------- Journal manipulation
static int tdbPagerWritePageToJournal(SPager *pPager, SPage *pPage) {
  int   ret;
  SPgno pgno;

  pgno = TDB_PAGE_PGNO(pPage);

M
Minglei Jin 已提交
804
  ret = tdbOsWrite(pPager->pActiveTxn->jfd, &pgno, sizeof(pgno));
H
Hongze Cheng 已提交
805
  if (ret < 0) {
M
Minglei Jin 已提交
806 807
    tdbError("failed to write pgno due to %s. file:%s, pgno:%u, txnId:%" PRId64, strerror(errno), pPager->jFileName,
             pgno, pPager->pActiveTxn->txnId);
808
    terrno = TAOS_SYSTEM_ERROR(errno);
H
Hongze Cheng 已提交
809 810 811
    return -1;
  }

M
Minglei Jin 已提交
812
  ret = tdbOsWrite(pPager->pActiveTxn->jfd, pPage->pData, pPage->pageSize);
H
Hongze Cheng 已提交
813
  if (ret < 0) {
M
Minglei Jin 已提交
814 815
    tdbError("failed to write page data due to %s. file:%s, pageSize:%d, txnId:%" PRId64, strerror(errno),
             pPager->jFileName, pPage->pageSize, pPager->pActiveTxn->txnId);
816
    terrno = TAOS_SYSTEM_ERROR(errno);
H
Hongze Cheng 已提交
817 818 819 820 821
    return -1;
  }

  return 0;
}
822
/*
H
Hongze Cheng 已提交
823 824 825 826
static int tdbPagerWritePageToDB(SPager *pPager, SPage *pPage) {
  i64 offset;
  int ret;

827
  offset = (i64)pPage->pageSize * (TDB_PAGE_PGNO(pPage) - 1);
H
Hongze Cheng 已提交
828
  if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) {
829
    tdbError("failed to lseek due to %s. file:%s, offset:%" PRId64, strerror(errno), pPager->dbFileName, offset);
830
    terrno = TAOS_SYSTEM_ERROR(errno);
H
Hongze Cheng 已提交
831 832 833
    return -1;
  }

H
Hongze Cheng 已提交
834
  ret = tdbOsWrite(pPager->fd, pPage->pData, pPage->pageSize);
H
Hongze Cheng 已提交
835
  if (ret < 0) {
M
Minglei Jin 已提交
836
    tdbError("failed to write page data due to %s. file:%s, pageSize:%d", strerror(errno), pPager->dbFileName,
M
Minglei Jin 已提交
837
             pPage->pageSize);
838
    terrno = TAOS_SYSTEM_ERROR(errno);
H
Hongze Cheng 已提交
839 840 841
    return -1;
  }

842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858
  return 0;
}
*/
static int tdbPagerPWritePageToDB(SPager *pPager, SPage *pPage) {
  i64 offset;
  int ret;

  offset = (i64)pPage->pageSize * (TDB_PAGE_PGNO(pPage) - 1);

  ret = tdbOsPWrite(pPager->fd, pPage->pData, pPage->pageSize, offset);
  if (ret < 0) {
    tdbError("failed to pwrite page data due to %s. file:%s, pageSize:%d", strerror(errno), pPager->dbFileName,
             pPage->pageSize);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

H
refact  
Hongze Cheng 已提交
859
  return 0;
860 861
}

862
static int tdbPagerRestore(SPager *pPager, const char *jFileName) {
863
  int   ret = 0;
864
  SPgno journalSize = 0;
865
  u8   *pageBuf = NULL;
866

867
  tdb_fd_t jfd = tdbOsOpen(jFileName, TDB_O_RDWR, 0755);
868
  if (jfd == NULL) {
869 870 871 872 873 874 875 876
    return 0;
  }

  ret = tdbGetFileSize(jfd, pPager->pageSize, &journalSize);
  if (ret < 0) {
    return -1;
  }

M
Minglei Jin 已提交
877 878 879 880 881 882
  if (tdbOsLSeek(jfd, 0L, SEEK_SET) < 0) {
    tdbError("failed to lseek jfd due to %s. file:%s, offset:0", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

883 884 885 886 887
  pageBuf = tdbOsCalloc(1, pPager->pageSize);
  if (pageBuf == NULL) {
    return -1;
  }

888 889
  tdbDebug("pager/restore: %p, %d/%d, txnId:%s", pPager, pPager->dbOrigSize, pPager->dbFileSize, jFileName);

890 891
  for (int pgIndex = 0; pgIndex < journalSize; ++pgIndex) {
    // read pgno & the page from journal
892
    SPgno pgno;
893 894 895

    int ret = tdbOsRead(jfd, &pgno, sizeof(pgno));
    if (ret < 0) {
M
Minglei Jin 已提交
896
      tdbOsFree(pageBuf);
897 898 899
      return -1;
    }

900 901
    tdbTrace("pager/restore: restore pgno:%d,", pgno);

902 903
    ret = tdbOsRead(jfd, pageBuf, pPager->pageSize);
    if (ret < 0) {
M
Minglei Jin 已提交
904
      tdbOsFree(pageBuf);
905 906 907
      return -1;
    }

M
Minglei Jin 已提交
908 909
    i64 offset = pPager->pageSize * (pgno - 1);
    if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) {
910
      tdbError("failed to lseek fd due to %s. file:%s, offset:%" PRId64, strerror(errno), pPager->dbFileName, offset);
911
      terrno = TAOS_SYSTEM_ERROR(errno);
M
Minglei Jin 已提交
912
      tdbOsFree(pageBuf);
M
Minglei Jin 已提交
913 914 915 916 917
      return -1;
    }

    ret = tdbOsWrite(pPager->fd, pageBuf, pPager->pageSize);
    if (ret < 0) {
M
Minglei Jin 已提交
918 919
      tdbError("failed to write buf due to %s. file: %s, bufsize:%d", strerror(errno), pPager->dbFileName,
               pPager->pageSize);
920
      terrno = TAOS_SYSTEM_ERROR(errno);
M
Minglei Jin 已提交
921
      tdbOsFree(pageBuf);
M
Minglei Jin 已提交
922 923
      return -1;
    }
924 925
  }

926 927 928
  if (tdbOsFSync(pPager->fd) < 0) {
    tdbError("failed to fsync fd due to %s. dbfile:%s", strerror(errno), pPager->dbFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
M
Minglei Jin 已提交
929
    tdbOsFree(pageBuf);
930 931
    return -1;
  }
932 933 934

  tdbOsFree(pageBuf);

935 936 937 938 939 940
  if (tdbOsClose(jfd) < 0) {
    tdbError("failed to close jfd due to %s. jFileName:%s", strerror(errno), pPager->jFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }

941
  if (tdbOsRemove(jFileName) < 0 && errno != ENOENT) {
942 943 944 945
    tdbError("failed to remove file due to %s. jFileName:%s", strerror(errno), pPager->jFileName);
    terrno = TAOS_SYSTEM_ERROR(errno);
    return -1;
  }
946 947 948

  return 0;
}
949

950 951 952 953 954 955
static int32_t txnIdCompareDesc(const void *pLeft, const void *pRight) {
  int64_t lhs = *(int64_t *)pLeft;
  int64_t rhs = *(int64_t *)pRight;
  return lhs > rhs ? -1 : 1;
}

956
int tdbPagerRestoreJournals(SPager *pPager) {
957 958 959 960 961 962 963
  tdbDirEntryPtr pDirEntry;
  tdbDirPtr      pDir = taosOpenDir(pPager->pEnv->dbName);
  if (pDir == NULL) {
    tdbError("failed to open %s since %s", pPager->pEnv->dbName, strerror(errno));
    return -1;
  }

964 965
  SArray *pTxnList = taosArrayInit(16, sizeof(int64_t));

966 967 968
  while ((pDirEntry = tdbReadDir(pDir)) != NULL) {
    char *name = tdbDirEntryBaseName(tdbGetDirEntryName(pDirEntry));
    if (strncmp(TDB_MAINDB_NAME "-journal", name, 16) == 0) {
969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986
      int64_t txnId = -1;
      sscanf(name, TDB_MAINDB_NAME "-journal.%" PRId64, &txnId);
      taosArrayPush(pTxnList, &txnId);
    }
  }
  taosArraySort(pTxnList, txnIdCompareDesc);
  for (int i = 0; i < TARRAY_SIZE(pTxnList); ++i) {
    int64_t *pTxnId = taosArrayGet(pTxnList, i);
    char     jname[TD_PATH_MAX] = {0};
    int      dirLen = strlen(pPager->pEnv->dbName);
    memcpy(jname, pPager->pEnv->dbName, dirLen);
    jname[dirLen] = '/';
    sprintf(jname + dirLen + 1, TDB_MAINDB_NAME "-journal.%" PRId64, *pTxnId);
    if (tdbPagerRestore(pPager, jname) < 0) {
      tdbCloseDir(&pDir);

      tdbError("failed to restore file due to %s. jFileName:%s", strerror(errno), jname);
      return -1;
987 988 989
    }
  }

990
  taosArrayDestroy(pTxnList);
991 992 993 994 995
  tdbCloseDir(&pDir);

  return 0;
}

996
int tdbPagerRollback(SPager *pPager) {
997 998 999 1000
  tdbDirEntryPtr pDirEntry;
  tdbDirPtr      pDir = taosOpenDir(pPager->pEnv->dbName);
  if (pDir == NULL) {
    tdbError("failed to open %s since %s", pPager->pEnv->dbName, strerror(errno));
1001 1002 1003
    return -1;
  }

1004 1005 1006 1007
  while ((pDirEntry = tdbReadDir(pDir)) != NULL) {
    char *name = tdbDirEntryBaseName(tdbGetDirEntryName(pDirEntry));

    if (strncmp(TDB_MAINDB_NAME "-journal", name, 16) == 0) {
1008 1009 1010 1011 1012 1013
      char jname[TD_PATH_MAX] = {0};
      int  dirLen = strlen(pPager->pEnv->dbName);
      memcpy(jname, pPager->pEnv->dbName, dirLen);
      jname[dirLen] = '/';
      memcpy(jname + dirLen + 1, name, strlen(name));
      if (tdbOsRemove(jname) < 0 && errno != ENOENT) {
M
Minglei Jin 已提交
1014 1015
        tdbCloseDir(&pDir);

1016 1017 1018 1019 1020 1021 1022 1023 1024
        tdbError("failed to remove file due to %s. jFileName:%s", strerror(errno), name);
        terrno = TAOS_SYSTEM_ERROR(errno);
        return -1;
      }
    }
  }

  tdbCloseDir(&pDir);

1025 1026
  return 0;
}