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

more code

This commit is contained in:
Hongze Cheng 2022-11-28 10:28:07 +08:00
parent e90e0ff81c
commit 51e513a340
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,13 +535,17 @@ static int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int32_t iStart, int3
for (int32_t iRow = 0; iRow < nRow; iRow++) { for (int32_t iRow = 0; iRow < nRow; iRow++) {
SColVal *pColValT = tRowIterNext(aIter[iRow]); SColVal *pColValT = tRowIterNext(aIter[iRow]);
// todo: take value according to flag // todo: take strategy according to the flag
if (pColVal == NULL || COL_VAL_IS_VALUE(pColValT)) { if (COL_VAL_IS_VALUE(pColValT)) {
pColVal = pColValT; pColVal = pColValT;
} else if (COL_VAL_IS_NULL(pColValT)) {
if (pColVal == NULL) {
pColVal = pColValT;
}
} }
} }
taosArrayPush(aColVal, pColVal); if (pColVal) taosArrayPush(aColVal, pColVal);
} }
// build // build