From 257069736983ab1b6e549b81d72901bbe893fcf3 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 8 Jan 2022 08:26:53 +0000
Subject: [PATCH] more tsdb integration

---
 source/dnode/vnode/impl/inc/vnodeDef.h    |  1 +
 source/dnode/vnode/impl/src/vnodeMgr.c    |  8 ++++++++
 source/dnode/vnode/tsdb/src/tsdbMain.c    |  6 +++---
 source/dnode/vnode/tsdb/src/tsdbOptions.c | 11 ++++++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/source/dnode/vnode/impl/inc/vnodeDef.h b/source/dnode/vnode/impl/inc/vnodeDef.h
index fdb9837292..a517dda882 100644
--- a/source/dnode/vnode/impl/inc/vnodeDef.h
+++ b/source/dnode/vnode/impl/inc/vnodeDef.h
@@ -23,6 +23,7 @@
 #include "tlockfree.h"
 #include "tmacro.h"
 #include "wal.h"
+#include "tfs.h"
 
 #include "vnode.h"
 
diff --git a/source/dnode/vnode/impl/src/vnodeMgr.c b/source/dnode/vnode/impl/src/vnodeMgr.c
index fae96ae22c..54df6c892d 100644
--- a/source/dnode/vnode/impl/src/vnodeMgr.c
+++ b/source/dnode/vnode/impl/src/vnodeMgr.c
@@ -24,6 +24,13 @@ int vnodeInit(uint16_t nthreads) {
     return 0;
   }
 
+  SDiskCfg dCfg;
+  strcpy(dCfg.dir, tsDataDir);
+  dCfg.level = 0;
+  dCfg.primary = 1;
+
+  tfsInit(&dCfg, 1);
+
   // Start commit handers
   if (nthreads > 0) {
     vnodeMgr.nthreads = nthreads;
@@ -72,6 +79,7 @@ void vnodeClear() {
   tfree(vnodeMgr.threads);
   pthread_cond_destroy(&(vnodeMgr.hasTask));
   pthread_mutex_destroy(&(vnodeMgr.mutex));
+  tfsDestroy();
 }
 
 int vnodeScheduleTask(SVnodeTask* pTask) {
diff --git a/source/dnode/vnode/tsdb/src/tsdbMain.c b/source/dnode/vnode/tsdb/src/tsdbMain.c
index af29e45949..7fec36d500 100644
--- a/source/dnode/vnode/tsdb/src/tsdbMain.c
+++ b/source/dnode/vnode/tsdb/src/tsdbMain.c
@@ -24,9 +24,9 @@ STsdb *tsdbOpen(const char *path, const STsdbCfg *pTsdbCfg, SMemAllocatorFactory
   STsdb *pTsdb = NULL;
 
   // Set default TSDB Options
-  if (pTsdbCfg == NULL) {
-    pTsdbCfg = &defautlTsdbOptions;
-  }
+  // if (pTsdbCfg == NULL) {
+  pTsdbCfg = &defautlTsdbOptions;
+  // }
 
   // Validate the options
   if (tsdbValidateOptions(pTsdbCfg) < 0) {
diff --git a/source/dnode/vnode/tsdb/src/tsdbOptions.c b/source/dnode/vnode/tsdb/src/tsdbOptions.c
index 1c2b3c640a..6bca2e3028 100644
--- a/source/dnode/vnode/tsdb/src/tsdbOptions.c
+++ b/source/dnode/vnode/tsdb/src/tsdbOptions.c
@@ -15,7 +15,16 @@
 
 #include "tsdbDef.h"
 
-const STsdbCfg defautlTsdbOptions = {.lruCacheSize = 0};
+const STsdbCfg defautlTsdbOptions = {.precision = 0,
+                                     .lruCacheSize = 0,
+                                     .daysPerFile = 10,
+                                     .minRowsPerFileBlock = 100,
+                                     .maxRowsPerFileBlock = 4096,
+                                     .keep = 3650,
+                                     .keep1 = 3650,
+                                     .keep2 = 3650,
+                                     .update = 0,
+                                     .compression = TWO_STAGE_COMP};
 
 int tsdbOptionsInit(STsdbCfg *pTsdbOptions) {
   // TODO