未验证 提交 1f8c70d4 编写于 作者: S Shengliang Guan 提交者: GitHub

Merge pull request #4383 from taosdata/feature/wal

TD-2276
...@@ -93,17 +93,23 @@ int64_t tfRead(int64_t tfd, void *buf, int64_t count) { ...@@ -93,17 +93,23 @@ int64_t tfRead(int64_t tfd, void *buf, int64_t count) {
return ret; return ret;
} }
int64_t tfFsync(int64_t tfd) { int32_t tfFsync(int64_t tfd) {
void *p = taosAcquireRef(tsFileRsetId, tfd); void *p = taosAcquireRef(tsFileRsetId, tfd);
if (p == NULL) return -1; if (p == NULL) return -1;
int32_t fd = (int32_t)(uintptr_t)p; int32_t fd = (int32_t)(uintptr_t)p;
return fsync(fd); int32_t code = fsync(fd);
taosReleaseRef(tsFileRsetId, tfd);
return code;
} }
bool tfValid(int64_t tfd) { bool tfValid(int64_t tfd) {
void *p = taosAcquireRef(tsFileRsetId, tfd); void *p = taosAcquireRef(tsFileRsetId, tfd);
return p != NULL; if (p == NULL) return false;
taosReleaseRef(tsFileRsetId, tfd);
return true;
} }
int64_t tfLseek(int64_t tfd, int64_t offset, int32_t whence) { int64_t tfLseek(int64_t tfd, int64_t offset, int32_t whence) {
...@@ -111,7 +117,10 @@ int64_t tfLseek(int64_t tfd, int64_t offset, int32_t whence) { ...@@ -111,7 +117,10 @@ int64_t tfLseek(int64_t tfd, int64_t offset, int32_t whence) {
if (p == NULL) return -1; if (p == NULL) return -1;
int32_t fd = (int32_t)(uintptr_t)p; int32_t fd = (int32_t)(uintptr_t)p;
return taosLSeek(fd, offset, whence); int64_t ret = taosLSeek(fd, offset, whence);
taosReleaseRef(tsFileRsetId, tfd);
return ret;
} }
int32_t tfFtruncate(int64_t tfd, int64_t length) { int32_t tfFtruncate(int64_t tfd, int64_t length) {
...@@ -119,5 +128,8 @@ int32_t tfFtruncate(int64_t tfd, int64_t length) { ...@@ -119,5 +128,8 @@ int32_t tfFtruncate(int64_t tfd, int64_t length) {
if (p == NULL) return -1; if (p == NULL) return -1;
int32_t fd = (int32_t)(uintptr_t)p; int32_t fd = (int32_t)(uintptr_t)p;
return taosFtruncate(fd, length); int32_t code = taosFtruncate(fd, length);
taosReleaseRef(tsFileRsetId, tfd);
return code;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册