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

more

This commit is contained in:
Hongze Cheng 2022-06-01 07:28:57 +00:00
parent 62e01aba28
commit c2d95cbc0d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common/tdataformat.h
View File

@ -42,7 +42,10 @@ int32_t tTSchemaCreate(int32_t sver, SSchema *pSchema, int32_t nCols, STSchema *
void tTSchemaDestroy(STSchema *pTSchema); void tTSchemaDestroy(STSchema *pTSchema);
// STSRow2 // STSRow2
int32_t tTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow2 **ppRow); #define COL_VAL_NONE(CID) ((SColVal){.cid = (CID), .isNone = 1})
#define COL_VAL_NULL(CID) ((SColVal){.cid = (CID), .isNull = 1})
#define COL_VAL_VALUE(CID, V) ((SColVal){.cid = (CID), .value = (V)})
int32_t tTSRowClone(const STSRow2 *pRow, STSRow2 **ppRow); int32_t tTSRowClone(const STSRow2 *pRow, STSRow2 **ppRow);
void tTSRowFree(STSRow2 *pRow); void tTSRowFree(STSRow2 *pRow);
void tTSRowGet(STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal); void tTSRowGet(STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);

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

@ -389,11 +389,9 @@ void tTSRowGet(STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal
} }
if (flags == TSROW_HAS_NONE) { if (flags == TSROW_HAS_NONE) {
*pColVal = (SColVal){.isNone = 1, .cid = pTColumn->colId}; goto _return_none;
return;
} else if (flags == TSROW_HAS_NONE) { } else if (flags == TSROW_HAS_NONE) {
*pColVal = (SColVal){.isNull = 1, .cid = pTColumn->colId}; goto _return_null;
return;
} }
ASSERT(pRow->nData && pRow->pData); ASSERT(pRow->nData && pRow->pData);
@ -510,15 +508,15 @@ void tTSRowGet(STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal
} }
_return_none: _return_none:
*pColVal = (SColVal){.cid = pTColumn->colId, .isNone = 1}; *pColVal = COL_VAL_NONE(pTColumn->colId);
return; return;
_return_null: _return_null:
*pColVal = (SColVal){.cid = pTColumn->colId, .isNull = 1}; *pColVal = COL_VAL_NULL(pTColumn->colId);
return; return;
_return_value: _return_value:
*pColVal = (SColVal){.cid = pTColumn->colId, .value = value}; *pColVal = COL_VAL_VALUE(pTColumn->colId, value);
return; return;
} }