提交 9d6dbf47 编写于 作者: L Liu Jicong

[TD-5694]<fix>: fix

上级 7b1fce48
...@@ -25,7 +25,7 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i ...@@ -25,7 +25,7 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i
int tdAllocMemForCol(SDataCol *pCol, int maxPoints) { int tdAllocMemForCol(SDataCol *pCol, int maxPoints) {
int spaceNeeded = pCol->bytes * maxPoints; int spaceNeeded = pCol->bytes * maxPoints;
if(IS_VAR_DATA_TYPE(pCol->type)) { if(IS_VAR_DATA_TYPE(pCol->type)) {
spaceNeeded += sizeof(VarDataOffsetT) * maxPoints + sizeof(VarDataLenT) * maxPoints; spaceNeeded += sizeof(VarDataOffsetT) * maxPoints;
} }
if(pCol->spaceSize < spaceNeeded) { if(pCol->spaceSize < spaceNeeded) {
void* ptr = realloc(pCol->pData, spaceNeeded); void* ptr = realloc(pCol->pData, spaceNeeded);
...@@ -37,11 +37,11 @@ int tdAllocMemForCol(SDataCol *pCol, int maxPoints) { ...@@ -37,11 +37,11 @@ int tdAllocMemForCol(SDataCol *pCol, int maxPoints) {
} else { } else {
pCol->pData = ptr; pCol->pData = ptr;
pCol->spaceSize = spaceNeeded; pCol->spaceSize = spaceNeeded;
if(IS_VAR_DATA_TYPE(pCol->type)) {
pCol->dataOff = POINTER_SHIFT(ptr, pCol->bytes * maxPoints);
}
} }
} }
if(IS_VAR_DATA_TYPE(pCol->type)) {
pCol->dataOff = POINTER_SHIFT(pCol->pData, pCol->bytes * maxPoints);
}
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册