From 552051da5a6c7075cadf00918006afa0e59cf6d4 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Nov 2021 13:37:26 +0800
Subject: [PATCH] refact

---
 include/server/vnode/meta/impl/metaImpl.h        |  2 ++
 include/server/vnode/meta/meta.h                 | 16 ++++++++--------
 source/dnode/vnode/meta/src/metaDB.c             |  1 +
 source/dnode/vnode/meta/src/metaIdx.c            |  1 +
 source/dnode/vnode/meta/src/metaTable.c          |  2 +-
 .../meta/test/{metaTests.cpp => metaAPITest.cpp} |  2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)
 rename source/dnode/vnode/meta/test/{metaTests.cpp => metaAPITest.cpp} (100%)

diff --git a/include/server/vnode/meta/impl/metaImpl.h b/include/server/vnode/meta/impl/metaImpl.h
index a9d70500cb..7987ddf203 100644
--- a/include/server/vnode/meta/impl/metaImpl.h
+++ b/include/server/vnode/meta/impl/metaImpl.h
@@ -29,6 +29,7 @@ struct SMetaOptions {
   size_t lruCacheSize; // LRU cache size
 };
 
+#if 0
 typedef enum { META_INIT_TABLE = 0, META_SUPER_TABLE = 1, META_CHILD_TABLE = 2, META_NORMAL_TABLE = 3 } EMetaTableT;
 typedef struct SSuperTableOpts {
   tb_uid_t  uid;
@@ -54,6 +55,7 @@ struct STableOptions {
     SNormalTableOpts normalOpts;
   };
 };
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/include/server/vnode/meta/meta.h b/include/server/vnode/meta/meta.h
index f1d18e27ff..b94ffc7a5d 100644
--- a/include/server/vnode/meta/meta.h
+++ b/include/server/vnode/meta/meta.h
@@ -23,15 +23,15 @@ extern "C" {
 #endif
 
 // Types exported
-typedef struct SMeta         SMeta;
-typedef struct SMetaOptions  SMetaOptions;
-typedef struct STableOptions STableOptions;
+typedef struct SMeta        SMeta;
+typedef struct SMetaOptions SMetaOptions;
+typedef struct STbOptions   STbOptions;
 
 // SMeta operations
 SMeta *metaOpen(const char *path, const SMetaOptions *);
 void   metaClose(SMeta *);
 void   metaRemove(const char *path);
-int    metaCreateTable(SMeta *pMeta, const STableOptions *);
+int    metaCreateTable(SMeta *pMeta, const STbOptions *);
 int    metaDropTable(SMeta *pMeta, tb_uid_t uid);
 int    metaCommit(SMeta *);
 
@@ -41,11 +41,11 @@ void metaOptionsClear(SMetaOptions *);
 
 // STableOpts
 #define META_TABLE_OPTS_DECLARE(name) STableOpts name = {0}
-void metaNormalTableOptsInit(STableOptions *, const char *name, const STSchema *pSchema);
-void metaSuperTableOptsInit(STableOptions *, const char *name, tb_uid_t uid, const STSchema *pSchema,
+void metaNormalTableOptsInit(STbOptions *, const char *name, const STSchema *pSchema);
+void metaSuperTableOptsInit(STbOptions *, const char *name, tb_uid_t uid, const STSchema *pSchema,
                             const STSchema *pTagSchema);
-void metaChildTableOptsInit(STableOptions *, const char *name, tb_uid_t suid, const SKVRow tags);
-void metaTableOptsClear(STableOptions *);
+void metaChildTableOptsInit(STbOptions *, const char *name, tb_uid_t suid, const SKVRow tags);
+void metaTableOptsClear(STbOptions *);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/meta/src/metaDB.c b/source/dnode/vnode/meta/src/metaDB.c
index 04c43d343e..1dbb88587a 100644
--- a/source/dnode/vnode/meta/src/metaDB.c
+++ b/source/dnode/vnode/meta/src/metaDB.c
@@ -27,6 +27,7 @@ int metaOpenDB(SMeta *pMeta) {
   if (pMeta->pCache) {
     rocksdb_options_set_row_cache(options, pMeta->pCache);
   }
+  rocksdb_options_set_create_if_missing(options, 1);
 
   pMeta->pDB = rocksdb_open(options, dbDir, &err);
   if (pMeta->pDB == NULL) {
diff --git a/source/dnode/vnode/meta/src/metaIdx.c b/source/dnode/vnode/meta/src/metaIdx.c
index 786b2d1018..29353cd511 100644
--- a/source/dnode/vnode/meta/src/metaIdx.c
+++ b/source/dnode/vnode/meta/src/metaIdx.c
@@ -27,6 +27,7 @@ int metaOpenIdx(SMeta *pMeta) {
   if (pMeta->pCache) {
     rocksdb_options_set_row_cache(options, pMeta->pCache);
   }
+  rocksdb_options_set_create_if_missing(options, 1);
 
   pMeta->pIdx = rocksdb_open(options, idxDir, &err);
   if (pMeta->pIdx == NULL) {
diff --git a/source/dnode/vnode/meta/src/metaTable.c b/source/dnode/vnode/meta/src/metaTable.c
index 029d43dc85..de1f8bba90 100644
--- a/source/dnode/vnode/meta/src/metaTable.c
+++ b/source/dnode/vnode/meta/src/metaTable.c
@@ -15,7 +15,7 @@
 
 #include "meta.h"
 
-int metaCreateTable(SMeta *pMeta, const STableOptions *pTbOptions) {
+int metaCreateTable(SMeta *pMeta, const STbOptions *pTbOptions) {
   // TODO
   return 0;
 }
diff --git a/source/dnode/vnode/meta/test/metaTests.cpp b/source/dnode/vnode/meta/test/metaAPITest.cpp
similarity index 100%
rename from source/dnode/vnode/meta/test/metaTests.cpp
rename to source/dnode/vnode/meta/test/metaAPITest.cpp
index 49d6b99c9f..0d79882018 100644
--- a/source/dnode/vnode/meta/test/metaTests.cpp
+++ b/source/dnode/vnode/meta/test/metaAPITest.cpp
@@ -1,10 +1,10 @@
+#if 0
 #include <gtest/gtest.h>
 #include <string.h>
 #include <iostream>
 
 #include "meta.h"
 
-#if 0
 static STSchema *metaGetSimpleSchema() {
   STSchema *      pSchema = NULL;
   STSchemaBuilder sb = {0};