From 5c9ff5b7759a40ef0f799a8d317e1350c4690f01 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 7 Feb 2020 09:53:40 +0800 Subject: [PATCH] more --- src/vnode/cache/inc/cache.h | 3 ++- src/vnode/common/data/inc/data.h | 18 +++++++++++++----- src/vnode/tsdb/inc/tsdbCache.h | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/vnode/tsdb/inc/tsdbCache.h diff --git a/src/vnode/cache/inc/cache.h b/src/vnode/cache/inc/cache.h index 45b0e0c800..c90c47a621 100644 --- a/src/vnode/cache/inc/cache.h +++ b/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; diff --git a/src/vnode/common/data/inc/data.h b/src/vnode/common/data/inc/data.h index de9502e709..5ccecd4718 100644 --- a/src/vnode/common/data/inc/data.h +++ b/src/vnode/common/data/inc/data.h @@ -3,16 +3,24 @@ #include +/* 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_ diff --git a/src/vnode/tsdb/inc/tsdbCache.h b/src/vnode/tsdb/inc/tsdbCache.h new file mode 100644 index 0000000000..cafb545606 --- /dev/null +++ b/src/vnode/tsdb/inc/tsdbCache.h @@ -0,0 +1,14 @@ +#if !defined(_TD_TSDBCACHE_H_) +#define _TD_TSDBCACHE_H_ + +#include + +#include "cache.h" + +typedef struct STSDBCache { + int64_t blockId; // A block ID counter + SCacheBlock *blockList; +} STSDBCache; + + +#endif // _TD_TSDBCACHE_H_ -- GitLab