Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0

src/vnode/cache/inc/cache.h

@@ -5,8 +5,9 @@ typedef void cache_pool_t;
 
 typedef struct SCacheBlock
 {
-
     SCacheBlock *next;
+    SCacheBlock *prev;
+    char data[];
 } SCacheBlock;
 
 

src/vnode/common/data/inc/data.h

@@ -3,16 +3,24 @@
 
 #include <stdint.h>
 
+/* The row data should in the form of
+ */
+
 // ---- Row data interface
 typedef struct {
-    int32_t numOfRows;
-    char * data;
+  int32_t numOfRows;
+  char *  data;
 } SRData;
 
 // ---- Column data interface
 typedef struct {
-    int32_t numOfPoints;
-    char *data;
+  int32_t numOfPoints;
+  char *  data;
 } SCData;
 
-#endif // _TD_DATA_H_
+typedef struct {
+  int32_t  numOfCols;
+  SCData **pData;
+} SCDataBlock;
+
+#endif  // _TD_DATA_H_

src/vnode/tsdb/inc/tsdbCache.h

+#if !defined(_TD_TSDBCACHE_H_)
+#define _TD_TSDBCACHE_H_
+
+#include <stdint.h>
+
+#include "cache.h"
+
+typedef struct STSDBCache {
+    int64_t blockId;  // A block ID counter
+    SCacheBlock *blockList;
+} STSDBCache;
+
+
+#endif // _TD_TSDBCACHE_H_