提交 14be1790 编写于 作者: H hjxilinx

fix bug #929.[TBASE-1349]

上级 e03f3364
...@@ -267,9 +267,7 @@ typedef struct SQuery { ...@@ -267,9 +267,7 @@ typedef struct SQuery {
int16_t checkBufferInLoop; // check if the buffer is full during scan each block int16_t checkBufferInLoop; // check if the buffer is full during scan each block
SLimitVal limit; SLimitVal limit;
int32_t rowSize; int32_t rowSize;
int32_t dataRowSize; // row size of each loaded data from disk, the value is
// used for prepare buffer
SSqlGroupbyExpr * pGroupbyExpr; SSqlGroupbyExpr * pGroupbyExpr;
SSqlFunctionExpr * pSelectExpr; SSqlFunctionExpr * pSelectExpr;
SColumnInfoEx * colList; SColumnInfoEx * colList;
......
...@@ -40,6 +40,7 @@ typedef struct SQueryLoadBlockInfo { ...@@ -40,6 +40,7 @@ typedef struct SQueryLoadBlockInfo {
int32_t fileId; int32_t fileId;
int32_t slotIdx; int32_t slotIdx;
int32_t sid; int32_t sid;
bool tsLoaded; // if timestamp column of current block is loaded or not
} SQueryLoadBlockInfo; } SQueryLoadBlockInfo;
typedef struct SQueryLoadCompBlockInfo { typedef struct SQueryLoadCompBlockInfo {
......
...@@ -193,8 +193,6 @@ static SQInfo *vnodeAllocateQInfoCommon(SQueryMeterMsg *pQueryMsg, SMeterObj *pM ...@@ -193,8 +193,6 @@ static SQInfo *vnodeAllocateQInfoCommon(SQueryMeterMsg *pQueryMsg, SMeterObj *pM
} else { } else {
pQuery->colList[i].data.filters = NULL; pQuery->colList[i].data.filters = NULL;
} }
pQuery->dataRowSize += colList[i].bytes;
} }
vnodeUpdateQueryColumnIndex(pQuery, pMeterObj); vnodeUpdateQueryColumnIndex(pQuery, pMeterObj);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册