From c36491c19cf1fa0af15c7368e95dd1204df703a9 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 11 Feb 2020 11:19:34 +0800
Subject: [PATCH] more

---
 src/vnode/tsdb/inc/tsdbCache.h | 27 +++++++++++++++++++++++----
 src/vnode/tsdb/inc/tsdbMeta.h  |  2 +-
 src/vnode/tsdb/src/tsdb.c      | 10 +++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/vnode/tsdb/inc/tsdbCache.h b/src/vnode/tsdb/inc/tsdbCache.h
index d1d2551683..791d1c7d78 100644
--- a/src/vnode/tsdb/inc/tsdbCache.h
+++ b/src/vnode/tsdb/inc/tsdbCache.h
@@ -6,16 +6,35 @@
 #include "cache.h"
 #include "dlist.h"
 
+#define TSDB_DEFAULT_CACHE_BLOCK_SIZE 16*1024*1024 /* 16M */
+
+typedef struct {
+  int64_t skey;     // start key
+  int64_t ekey;     // end key
+  int32_t numOfRows // numOfRows
+} STableCacheInfo;
+
 typedef struct {
-  int64_t      blockId;
-  SCacheBlock *pBlock
+  char *pData;
+  STableCacheInfo *pTableInfo;
+  SCacheBlock *prev;
+  SCacheBlock *next;
 } STSDBCacheBlock;
 
 // Use a doublely linked list to implement this
 typedef struct STSDBCache {
-  int64_t blockId;  // A block ID counter
+  int32_t numOfBlocks;
   SDList *cacheList;
-} STSDBCache;
+  void *  current;
+} SCacheHandle;
+
+
+// ---- Operation on STSDBCacheBlock
+#define TSDB_CACHE_BLOCK_DATA(pBlock) ((pBlock)->pData)
+#define TSDB_CACHE_AVAIL_SPACE(pBlock) ((char *)((pBlock)->pTableInfo) - ((pBlock)->pData))
+#define TSDB_TABLE_KEY_RANGE_AT_CACHE(pBlock, tableId) ((pBlock)->pTableInfo)[tableId]
+#define TSDB_NEXT_CACHE_BLOCK(pBlock) ((pBlock)->next)
+#define TSDB_PREV_CACHE_BLOCK(pBlock) ((pBlock)->prev)
 
 STSDBCache *tsdbCreateCache();
 
diff --git a/src/vnode/tsdb/inc/tsdbMeta.h b/src/vnode/tsdb/inc/tsdbMeta.h
index 6642e29ad6..49963b3293 100644
--- a/src/vnode/tsdb/inc/tsdbMeta.h
+++ b/src/vnode/tsdb/inc/tsdbMeta.h
@@ -9,7 +9,7 @@
 // Initially, there are 4 tables
 #define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4
 
-typedef enum : uint8_t {
+typedef enum {
   TSDB_SUPER_TABLE,  // super table
   TSDB_NTABLE,       // table not created from super table
   TSDB_STABLE        // table created from super table
diff --git a/src/vnode/tsdb/src/tsdb.c b/src/vnode/tsdb/src/tsdb.c
index 50a46717f6..689121673d 100644
--- a/src/vnode/tsdb/src/tsdb.c
+++ b/src/vnode/tsdb/src/tsdb.c
@@ -3,13 +3,21 @@
 
 #include "tsdb.h"
 #include "disk.h"
-#include "cache.h"
+#include "tsdbMeta.h"
+#include "tsdbCache.h"
 
 typedef struct STSDBRepo
 {
     // TSDB configuration
     STSDBcfg *pCfg;
 
+    // The meter meta handle of this TSDB repository
+    SMetaHandle *pMetaHandle;
+
+    // The cache Handle
+    SCacheHandle *pCacheHandle;
+
+
     /* Disk tier handle for multi-tier storage
      * 
      * The handle is responsible for dealing with object-oriented
-- 
GitLab