提交 259c2043 编写于 作者: wmmhello's avatar wmmhello

fix:merge error

上级 905a61e9
...@@ -205,7 +205,7 @@ void qDestroyBoundColInfo(void* pInfo) { ...@@ -205,7 +205,7 @@ void qDestroyBoundColInfo(void* pInfo) {
taosMemoryFreeClear(pBoundInfo->pColIndex); taosMemoryFreeClear(pBoundInfo->pColIndex);
} }
static int32_t createDataBlock(size_t defaultSize, int32_t rowSize, int32_t startOffset, STableMeta* pTableMeta, static int32_t createTableDataBlock(size_t defaultSize, int32_t rowSize, int32_t startOffset, STableMeta* pTableMeta,
STableDataBlocks** dataBlocks) { STableDataBlocks** dataBlocks) {
STableDataBlocks* dataBuf = (STableDataBlocks*)taosMemoryCalloc(1, sizeof(STableDataBlocks)); STableDataBlocks* dataBuf = (STableDataBlocks*)taosMemoryCalloc(1, sizeof(STableDataBlocks));
if (dataBuf == NULL) { if (dataBuf == NULL) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册