refactor and rename
This commit is contained in:
Hongze Cheng
parent
c1e9959b08
commit
760b66e574
|
|
@ -27,16 +27,21 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define STR_TO_VARSTR(x, str) do {VarDataLenT __len = strlen(str); \
|
||||
#define STR_TO_VARSTR(x, str) \
|
||||
do { \
|
||||
VarDataLenT __len = strlen(str); \
|
||||
*(VarDataLenT *)(x) = __len; \
|
||||
strncpy(varDataVal(x), (str), __len);} while(0);
|
||||
strncpy(varDataVal(x), (str), __len); \
|
||||
} while (0);
|
||||
|
||||
#define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs) do {\
|
||||
#define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs) \
|
||||
do { \
|
||||
char *_e = stpncpy(varDataVal(x), (str), (_maxs)); \
|
||||
varDataSetLen(x, (_e - (x)-VARSTR_HEADER_SIZE)); \
|
||||
} while (0)
|
||||
|
||||
#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) do {\
|
||||
#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) \
|
||||
do { \
|
||||
*(VarDataLenT *)(x) = (_size); \
|
||||
strncpy(varDataVal(x), (str), (_size)); \
|
||||
} while (0);
|
||||
|
|
@ -73,9 +78,9 @@ typedef struct {
|
|||
#define schemaTLen(s) ((s)->tlen)
|
||||
#define schemaFLen(s) ((s)->flen)
|
||||
#define schemaColAt(s, i) ((s)->columns + i)
|
||||
#define tdFreeSchema(s) tfree((s))
|
||||
|
||||
STSchema *tdNewSchema(int32_t nCols);
|
||||
#define tdFreeSchema(s) tfree((s))
|
||||
int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes);
|
||||
STSchema *tdDupSchema(STSchema *pSchema);
|
||||
int tdGetSchemaEncodeSize(STSchema *pSchema);
|
||||
|
|
@ -189,7 +194,6 @@ static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
typedef struct {
|
||||
int maxRowSize;
|
||||
int maxCols; // max number of columns
|
||||
|
|
@ -218,7 +222,6 @@ void tdPopDataColsPoints(SDataCols *pCols, int pointsToPop); //!!!!
|
|||
int tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge);
|
||||
void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows);
|
||||
|
||||
|
||||
// ----------------- K-V data row structure
|
||||
/*
|
||||
* +----------+----------+---------------------------------+---------------------------------+
|
||||
|
|
@ -227,29 +230,29 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
|
|||
* | len | ncols | cols index | data part |
|
||||
* +----------+----------+---------------------------------+---------------------------------+
|
||||
*/
|
||||
typedef void *SKVDataRow;
|
||||
typedef void *SKVRow;
|
||||
|
||||
typedef struct {
|
||||
int16_t colId;
|
||||
int16_t offset;
|
||||
} SColIdx;
|
||||
|
||||
#define TD_KV_DATA_ROW_HEAD_SIZE 2*sizeof(int16_t)
|
||||
#define TD_KV_ROW_HEAD_SIZE 2 * sizeof(int16_t)
|
||||
|
||||
#define kvDataRowLen(r) (*(int16_t *)(r))
|
||||
#define kvDataRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
|
||||
#define kvDataRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE)
|
||||
#define kvDataRowValues(r) POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE + sizeof(SColIdx) * kvDataRowNCols(r))
|
||||
#define kvDataRowCpy(dst, r) memcpy((dst), (r), kvDataRowLen(r))
|
||||
#define kvDataRowColVal(r, colIdx) POINTER_SHIFT(kvDataRowValues(r), (colIdx)->offset)
|
||||
#define kvDataRowSetLen(r, len) kvDataRowLen(r) = (len)
|
||||
#define kvDataRowSetNCols(r, n) kvDataRowNCols(r) = (n)
|
||||
#define kvDataRowColIdxAt(r, i) (kvDataRowColIdx(r) + (i))
|
||||
#define kvRowLen(r) (*(int16_t *)(r))
|
||||
#define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
|
||||
#define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
|
||||
#define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
|
||||
#define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
|
||||
#define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
|
||||
#define kvRowSetLen(r, len) kvRowLen(r) = (len)
|
||||
#define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
|
||||
#define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
|
||||
|
||||
SKVDataRow tdKVDataRowDup(SKVDataRow row);
|
||||
SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value);
|
||||
void * tdEncodeKVDataRow(void *buf, SKVDataRow row);
|
||||
void * tdDecodeKVDataRow(void *buf, SKVDataRow *row);
|
||||
SKVRow tdKVRowDup(SKVRow row);
|
||||
SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value);
|
||||
void * tdEncodeKVRow(void *buf, SKVRow row);
|
||||
void * tdDecodeKVRow(void *buf, SKVRow *row);
|
||||
|
||||
static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
|
||||
if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
|
||||
|
|
@ -261,10 +264,10 @@ static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
|
|||
}
|
||||
}
|
||||
|
||||
static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVDataRow row, int16_t colId) {
|
||||
void *ret = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
|
||||
static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVRow row, int16_t colId) {
|
||||
void *ret = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
|
||||
if (ret == NULL) return NULL;
|
||||
return kvDataRowColVal(row, (SColIdx *)ret);
|
||||
return kvRowColVal(row, (SColIdx *)ret);
|
||||
}
|
||||
|
||||
// ----------------- K-V data row builder
|
||||
|
|
@ -275,13 +278,13 @@ typedef struct {
|
|||
int16_t alloc;
|
||||
int16_t size;
|
||||
void * buf;
|
||||
} SKVDataRowBuilder;
|
||||
} SKVRowBuilder;
|
||||
|
||||
int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
|
||||
void tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
|
||||
void tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
|
||||
SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder);
|
||||
int tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
|
||||
int tdInitKVRowBuilder(SKVRowBuilder *pBuilder);
|
||||
void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder);
|
||||
void tdResetKVRowBuilder(SKVRowBuilder *pBuilder);
|
||||
SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
|
||||
int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
|
||||
|
||||
// ----------------- Tag row structure
|
||||
|
||||
|
|
@ -297,7 +300,6 @@ pData
|
|||
|
||||
*/
|
||||
|
||||
|
||||
#define TD_TAG_ROW_HEAD_SIZE sizeof(int16_t)
|
||||
|
||||
#define tagRowNum(r) (*(int16_t *)(r))
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "tdataformat.h"
|
||||
#include "wchar.h"
|
||||
#include "talgo.h"
|
||||
#include "wchar.h"
|
||||
|
||||
/**
|
||||
* Create a SSchema object with nCols columns
|
||||
|
|
@ -152,7 +152,8 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
|
|||
return row;
|
||||
}
|
||||
|
||||
int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert/update tag value and update all the information
|
||||
int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type,
|
||||
int16_t colId) { // insert/update tag value and update all the information
|
||||
ASSERT(((STagRow *)row)->pData != NULL);
|
||||
// STagCol * stCol = tdQueryTagColByID()
|
||||
|
||||
|
|
@ -330,7 +331,6 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
|
|||
pDataCol->pData = *pBuf;
|
||||
*pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void dataColAppendVal(SDataCol *pCol, void *value, int numOfRows, int maxPoints) {
|
||||
|
|
@ -596,26 +596,25 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol
|
|||
}
|
||||
}
|
||||
|
||||
SKVDataRow tdKVDataRowDup(SKVDataRow row) {
|
||||
SKVDataRow trow = malloc(kvDataRowLen(row));
|
||||
SKVRow tdKVRowDup(SKVRow row) {
|
||||
SKVRow trow = malloc(kvRowLen(row));
|
||||
if (trow == NULL) return NULL;
|
||||
|
||||
kvDataRowCpy(trow, row);
|
||||
kvRowCpy(trow, row);
|
||||
return trow;
|
||||
}
|
||||
|
||||
SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value) {
|
||||
SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value) {
|
||||
// TODO
|
||||
return NULL;
|
||||
// SColIdx *pColIdx = NULL;
|
||||
// SKVDataRow rrow = row;
|
||||
// SKVDataRow nrow = NULL;
|
||||
// SKVRow rrow = row;
|
||||
// SKVRow nrow = NULL;
|
||||
// void *ptr = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(row), sizeof(SColIdx), comparTagId, TD_GE);
|
||||
|
||||
// if (ptr == NULL || ((SColIdx *)ptr)->colId < colId) { // need to add a column value to the row
|
||||
// int tlen = kvDataRowLen(row) + sizeof(SColIdx) + (IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type]);
|
||||
// nrow = malloc(tlen);
|
||||
// if (nrow == NULL) return NULL;
|
||||
// int tlen = kvDataRowLen(row) + sizeof(SColIdx) + (IS_VAR_DATA_TYPE(type) ? varDataTLen(value) :
|
||||
// TYPE_BYTES[type]); nrow = malloc(tlen); if (nrow == NULL) return NULL;
|
||||
|
||||
// kvDataRowSetNCols(nrow, kvDataRowNCols(row)+1);
|
||||
// kvDataRowSetLen(nrow, tlen);
|
||||
|
|
@ -670,18 +669,18 @@ SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void
|
|||
// return rrow;
|
||||
}
|
||||
|
||||
void *tdEncodeKVDataRow(void *buf, SKVDataRow row) {
|
||||
void *tdEncodeKVRow(void *buf, SKVRow row) {
|
||||
// May change the encode purpose
|
||||
kvDataRowCpy(buf, row);
|
||||
return POINTER_SHIFT(buf, kvDataRowLen(row));
|
||||
kvRowCpy(buf, row);
|
||||
return POINTER_SHIFT(buf, kvRowLen(row));
|
||||
}
|
||||
|
||||
void *tdDecodeKVDataRow(void *buf, SKVDataRow *row) {
|
||||
*row = tdKVDataRowDup(buf);
|
||||
return POINTER_SHIFT(buf, kvDataRowLen(*row));
|
||||
void *tdDecodeKVRow(void *buf, SKVRow *row) {
|
||||
*row = tdKVRowDup(buf);
|
||||
return POINTER_SHIFT(buf, kvRowLen(*row));
|
||||
}
|
||||
|
||||
int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
|
||||
int tdInitKVRowBuilder(SKVRowBuilder *pBuilder) {
|
||||
pBuilder->tCols = 128;
|
||||
pBuilder->nCols = 0;
|
||||
pBuilder->pColIdx = (SColIdx *)malloc(sizeof(SColIdx) * pBuilder->tCols);
|
||||
|
|
@ -696,33 +695,33 @@ int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
void tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
|
||||
void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder) {
|
||||
tfree(pBuilder->pColIdx);
|
||||
tfree(pBuilder->buf);
|
||||
}
|
||||
|
||||
void tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
|
||||
void tdResetKVRowBuilder(SKVRowBuilder *pBuilder) {
|
||||
pBuilder->nCols = 0;
|
||||
pBuilder->size = 0;
|
||||
}
|
||||
|
||||
SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder) {
|
||||
SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder) {
|
||||
int tlen = sizeof(SColIdx) * pBuilder->nCols + pBuilder->size;
|
||||
if (tlen == 0) return NULL;
|
||||
|
||||
SKVDataRow row = malloc(TD_KV_DATA_ROW_HEAD_SIZE + tlen);
|
||||
SKVRow row = malloc(TD_KV_ROW_HEAD_SIZE + tlen);
|
||||
if (row == NULL) return NULL;
|
||||
|
||||
kvDataRowSetNCols(row, pBuilder->nCols);
|
||||
kvDataRowSetLen(row, TD_KV_DATA_ROW_HEAD_SIZE + tlen);
|
||||
kvRowSetNCols(row, pBuilder->nCols);
|
||||
kvRowSetLen(row, TD_KV_ROW_HEAD_SIZE + tlen);
|
||||
|
||||
memcpy(kvDataRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
|
||||
memcpy(kvDataRowValues(row), pBuilder->buf, pBuilder->size);
|
||||
memcpy(kvRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
|
||||
memcpy(kvRowValues(row), pBuilder->buf, pBuilder->size);
|
||||
|
||||
return row;
|
||||
}
|
||||
|
||||
int tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
|
||||
int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
|
||||
ASSERT(pBuilder->nCols == 0 || colId > pBuilder->pColIdx[pBuilder->nCols - 1].colId);
|
||||
|
||||
if (pBuilder->nCols >= pBuilder->tCols) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue