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

fix: set statis to 0 when all col is normal

This commit is contained in:
Cary Xu 2022-08-03 16:23:27 +08:00
parent 92b2d62a31
commit 0c4454c077
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/trow.h
View File

@ -38,7 +38,7 @@ typedef struct {
uint16_t type : 2; uint16_t type : 2;
uint16_t del : 1; uint16_t del : 1;
uint16_t endian : 1; uint16_t endian : 1;
uint16_t normal : 1; // all norm uint16_t statis : 1; // 0 all normal, 1 has null or none
uint16_t reserve : 11; uint16_t reserve : 11;
uint16_t sver; uint16_t sver;
}; };

4
source/common/src/trow.c
View File

@ -881,7 +881,7 @@ int32_t tdGetKvRowValOfCol(SCellVal *output, STSRow *pRow, void *pBitmap, int32_
int32_t tdGetTpRowValOfCol(SCellVal *output, STSRow *pRow, void *pBitmap, int8_t colType, int32_t offset, int32_t tdGetTpRowValOfCol(SCellVal *output, STSRow *pRow, void *pBitmap, int8_t colType, int32_t offset,
int16_t colIdx) { int16_t colIdx) {
if (pRow->normal) { if (pRow->statis == 0) {
if (IS_VAR_DATA_TYPE(colType)) { if (IS_VAR_DATA_TYPE(colType)) {
output->val = POINTER_SHIFT(pRow, *(VarDataOffsetT *)POINTER_SHIFT(TD_ROW_DATA(pRow), offset)); output->val = POINTER_SHIFT(pRow, *(VarDataOffsetT *)POINTER_SHIFT(TD_ROW_DATA(pRow), offset));
} else { } else {
@ -1097,7 +1097,7 @@ int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t nBou
int32_t tdSRowEnd(SRowBuilder *pBuilder) { int32_t tdSRowEnd(SRowBuilder *pBuilder) {
STSRow *pRow = (STSRow *)pBuilder->pBuf; STSRow *pRow = (STSRow *)pBuilder->pBuf;
if (pBuilder->nNone || pBuilder->nNull) { if (pBuilder->nNone || pBuilder->nNull) {
pRow->normal = 1; pRow->statis = 1;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }