xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix compile problem

This commit is contained in:
Hongze Cheng 2022-05-16 01:47:35 +00:00
parent e0b3e97de6
commit acf1b14b21
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/common/tdataformat.h
View File

@ -94,11 +94,11 @@ struct STSchema {
#define TSROW_HAS_VAL ((uint8_t)0x4U) #define TSROW_HAS_VAL ((uint8_t)0x4U)
#define TSROW_KV_ROW ((uint8_t)0x10U) #define TSROW_KV_ROW ((uint8_t)0x10U)
struct STSRow2 { struct STSRow2 {
TSKEY ts; TSKEY ts;
uint8_t flags; uint8_t flags;
int32_t sver; int32_t sver;
uint32_t nData; uint32_t nData;
uint8_t *pData; const uint8_t *pData;
}; };
struct STSRowBuilder { struct STSRowBuilder {
@ -117,9 +117,9 @@ struct STSRowBuilder {
typedef enum { COL_VAL = 0, COL_NONE = 1, COL_NULL = 2 } EColValT; typedef enum { COL_VAL = 0, COL_NONE = 1, COL_NULL = 2 } EColValT;
struct SColVal { struct SColVal {
EColValT type; EColValT type;
uint32_t nData; uint32_t nData;
uint8_t *pData; const uint8_t *pData;
}; };
#if 1 //==================================== #if 1 //====================================

19
source/common/src/tdataformat.c
View File

@ -96,13 +96,13 @@ static FORCE_INLINE int kvRowCmprFn(const void *p1, const void *p2) {
} }
int32_t tTSRowGet(const STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal) { int32_t tTSRowGet(const STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal) {
uint32_t n; uint32_t n;
uint8_t *p; const uint8_t *p;
uint8_t v; uint8_t v;
int32_t bidx = iCol - 1; int32_t bidx = iCol - 1;
STColumn *pTColumn = &pTSchema->columns[iCol]; STColumn *pTColumn = &pTSchema->columns[iCol];
STSKVRow *pTSKVRow; STSKVRow *pTSKVRow;
SKVIdx *pKVIdx; SKVIdx *pKVIdx;
ASSERT(pTColumn->colId != 0); ASSERT(pTColumn->colId != 0);
@ -132,8 +132,8 @@ int32_t tTSRowGet(const STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal
} }
} else { } else {
// get bitmap // get bitmap
p = pRow->pData;
switch (pRow->flags & 0xf) { switch (pRow->flags & 0xf) {
p = pRow->pData;
case TSROW_HAS_NULL | TSROW_HAS_NONE: case TSROW_HAS_NULL | TSROW_HAS_NONE:
v = GET_BIT1(p, bidx); v = GET_BIT1(p, bidx);
if (v == 0) { if (v == 0) {
@ -181,8 +181,7 @@ int32_t tTSRowGet(const STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal
// get real value // get real value
p = p + pTColumn->offset; p = p + pTColumn->offset;
if (IS_VAR_DATA_TYPE(pTColumn->type)) { if (IS_VAR_DATA_TYPE(pTColumn->type)) {
p = pTSchema->flen + *(int32_t *)p; tGetBinary(p + pTSchema->flen + *(int32_t *)p, &p, &n);
tGetBinary(p, &p, &n);
} else { } else {
n = pTColumn->bytes; n = pTColumn->bytes;
} }