more code

source/dnode/vnode/CMakeLists.txt

@@ -57,7 +57,7 @@ target_sources(
     # # dev
     "src/tsdb/dev/tsdbCommit2.c"
     "src/tsdb/dev/tsdbMerge.c"
-    "src/tsdb/dev/tsdbReaderWriter2.c"
+    "src/tsdb/dev/tsdbSttFWriter.c"
 
     # tq
     "src/tq/tq.c"

source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c

@@ -13,15 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tsdb.h"
+#include "tsdbSttFWriter.h"
 
 // extern dependencies
-typedef struct SSttFWriter SSttFWriter;
-
-extern int32_t tsdbSttFWriterOpen(STsdb *pTsdb, const SSttFile *pSttFile, SSttFWriter **ppWriter);
-extern int32_t tsdbSttFWriterClose(SSttFWriter *pWriter);
-extern int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow);
-
 typedef struct {
   STsdb *pTsdb;
   // config
@@ -48,7 +42,7 @@ static int32_t tsdbCommitOpenWriter(SCommitter *pCommitter) {
 
   SSttFile sttFile = {0};  // TODO
 
-  code = tsdbSttFWriterOpen(pCommitter->pTsdb, &sttFile, &pCommitter->pWriter);
+  code = tsdbSttFWriterOpen(NULL /*TODO*/, &pCommitter->pWriter);
   TSDB_CHECK_CODE(code, lino, _exit);
 
 _exit:

source/dnode/vnode/src/tsdb/dev/tsdbReaderWriter2.c → source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c

-#include "tsdb.h"
+/*
+ * 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/>.
+ */
+
+#include "tsdbSttFWriter.h"
+
+int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter) {
+  int32_t code = 0;
+  // TODO
+  return code;
+}
+
+int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter) {
+  int32_t code = 0;
+  // TODO
+  return code;
+}
 
-typedef struct SSttFWriter SSttFWriter;
-typedef struct SSttFReader SSttFReader;
+int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) {
+  int32_t code = 0;
+  // TODO
+  return code;
+}
+
+int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData) {
+  int32_t code = 0;
+  // TODO
+  return code;
+}
 
+#if 0
 extern int32_t tsdbOpenFile(const char *path, int32_t szPage, int32_t flag, STsdbFD **ppFD);
 extern void    tsdbCloseFile(STsdbFD **ppFD);
 struct SSttFWriter {
@@ -104,3 +141,4 @@ int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, int64_t suid, int64_t uid, int
   // TODO write row
   return 0;
 }
+#endif
\ No newline at end of file

source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h

+/*
+ * 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/>.
+ */
+
+#ifndef _TSDB_STT_FILE_WRITER_H
+#define _TSDB_STT_FILE_WRITER_H
+
+#include "tsdb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SSttFWriter     SSttFWriter;
+typedef struct SSttFWriterConf SSttFWriterConf;
+
+int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter);
+int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter);
+int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow);
+int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData);
+
+struct SSttFWriterConf {
+  STsdb  *pTsdb;
+  int32_t maxRow;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TSDB_STT_FILE_WRITER_H*/
\ No newline at end of file