提交 fd16a6b3 编写于 作者: H Hongze Cheng

more code

上级 c6d9a3a4
...@@ -262,6 +262,11 @@ static int32_t open_committer(STsdb *pTsdb, SCommitInfo *pInfo, SCommitter *pCom ...@@ -262,6 +262,11 @@ static int32_t open_committer(STsdb *pTsdb, SCommitInfo *pInfo, SCommitter *pCom
code = TSDB_CODE_OUT_OF_MEMORY; code = TSDB_CODE_OUT_OF_MEMORY;
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
pCommitter->aFileOp = taosArrayInit(10, sizeof(struct SFileOp));
if (pCommitter->aFileOp == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
TSDB_CHECK_CODE(code, lino, _exit);
}
// start loop // start loop
pCommitter->nextKey = pTsdb->imem->minKey; // TODO pCommitter->nextKey = pTsdb->imem->minKey; // TODO
...@@ -277,7 +282,12 @@ _exit: ...@@ -277,7 +282,12 @@ _exit:
static int32_t close_committer(SCommitter *pCommiter, int32_t eno) { static int32_t close_committer(SCommitter *pCommiter, int32_t eno) {
int32_t code = 0; int32_t code = 0;
// TODO int32_t lino;
// code = tsdbFSBegin(pCommiter->pTsdb, pCommiter->aFileOp);
TSDB_CHECK_CODE(code, lino, _exit);
_exit:
return code; return code;
} }
...@@ -327,49 +337,49 @@ _exit: ...@@ -327,49 +337,49 @@ _exit:
return code; return code;
} }
int32_t tsdbCommitCommit(STsdb *pTsdb) { // int32_t tsdbCommitCommit(STsdb *pTsdb) {
int32_t code = 0; // int32_t code = 0;
int32_t lino = 0; // int32_t lino = 0;
SMemTable *pMemTable = pTsdb->imem; // SMemTable *pMemTable = pTsdb->imem;
// lock // // lock
taosThreadRwlockWrlock(&pTsdb->rwLock); // taosThreadRwlockWrlock(&pTsdb->rwLock);
code = tsdbFSCommit(pTsdb); // code = tsdbFSCommit(pTsdb);
if (code) { // if (code) {
taosThreadRwlockUnlock(&pTsdb->rwLock); // taosThreadRwlockUnlock(&pTsdb->rwLock);
TSDB_CHECK_CODE(code, lino, _exit); // TSDB_CHECK_CODE(code, lino, _exit);
} // }
pTsdb->imem = NULL; // pTsdb->imem = NULL;
// unlock // // unlock
taosThreadRwlockUnlock(&pTsdb->rwLock); // taosThreadRwlockUnlock(&pTsdb->rwLock);
if (pMemTable) { // if (pMemTable) {
tsdbUnrefMemTable(pMemTable, NULL, true); // tsdbUnrefMemTable(pMemTable, NULL, true);
} // }
_exit: // _exit:
if (code) { // if (code) {
tsdbError("vgId:%d, %s failed at line %d since %s", TD_VID(pTsdb->pVnode), __func__, lino, tstrerror(code)); // tsdbError("vgId:%d, %s failed at line %d since %s", TD_VID(pTsdb->pVnode), __func__, lino, tstrerror(code));
} else { // } else {
tsdbInfo("vgId:%d, tsdb finish commit", TD_VID(pTsdb->pVnode)); // tsdbInfo("vgId:%d, tsdb finish commit", TD_VID(pTsdb->pVnode));
} // }
return code; // return code;
} // }
int32_t tsdbCommitAbort(STsdb *pTsdb) { // int32_t tsdbCommitAbort(STsdb *pTsdb) {
int32_t code = 0; // int32_t code = 0;
int32_t lino = 0; // int32_t lino = 0;
code = tsdbFSRollback(pTsdb); // code = tsdbFSRollback(pTsdb);
TSDB_CHECK_CODE(code, lino, _exit); // TSDB_CHECK_CODE(code, lino, _exit);
_exit: // _exit:
if (code) { // if (code) {
tsdbError("vgId:%d, %s failed at line %d since %s", TD_VID(pTsdb->pVnode), __func__, lino, tstrerror(code)); // tsdbError("vgId:%d, %s failed at line %d since %s", TD_VID(pTsdb->pVnode), __func__, lino, tstrerror(code));
} else { // } else {
tsdbInfo("vgId:%d, tsdb rollback commit", TD_VID(pTsdb->pVnode)); // tsdbInfo("vgId:%d, tsdb rollback commit", TD_VID(pTsdb->pVnode));
} // }
return code; // return code;
} // }
\ No newline at end of file \ No newline at end of file
...@@ -26,8 +26,11 @@ extern "C" { ...@@ -26,8 +26,11 @@ extern "C" {
struct STFileSystem; struct STFileSystem;
/* Exposed APIs */ /* Exposed APIs */
// open/close
int32_t tsdbOpenFileSystem(STsdb *pTsdb, struct STFileSystem **ppFS, int8_t rollback); int32_t tsdbOpenFileSystem(STsdb *pTsdb, struct STFileSystem **ppFS, int8_t rollback);
int32_t tsdbCloseFileSystem(struct STFileSystem **ppFS); int32_t tsdbCloseFileSystem(struct STFileSystem **ppFS);
// txn
// int32_t tsdb
/* Exposed Structs */ /* Exposed Structs */
struct STFileSystem { struct STFileSystem {
......
...@@ -11,4 +11,18 @@ ...@@ -11,4 +11,18 @@
* *
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
\ No newline at end of file
#include "tsdbSttFReader.h"
int32_t tsdbSttFReaderOpen(const struct SSttFReaderConf *pConf, struct SSttFReader **ppReader) {
int32_t code = 0;
// TODO
return code;
}
int32_t tsdbSttFReaderClose(struct SSttFReader *pReader) {
int32_t code = 0;
// TODO
return code;
}
...@@ -16,15 +16,24 @@ ...@@ -16,15 +16,24 @@
#ifndef _TD_TSDB_STT_FILE_READER_H #ifndef _TD_TSDB_STT_FILE_READER_H
#define _TD_TSDB_STT_FILE_READER_H #define _TD_TSDB_STT_FILE_READER_H
#include "tsdb.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Exposed Handle */ /* Exposed Handle */
struct SSttFReader;
struct SSttFReaderConf;
/* Exposed APIs */ /* Exposed APIs */
int32_t tsdbSttFReaderOpen(const struct SSttFReaderConf *pConf, struct SSttFReader **ppReader);
int32_t tsdbSttFReaderClose(struct SSttFReader *pReader);
/* Exposed Structs */ /* Exposed Structs */
struct SSttFReaderConf {
// TODO
};
#ifdef __cplusplus #ifdef __cplusplus
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册