未验证 提交 929aa1f0 编写于 作者: H haojun Liao 提交者: GitHub

Merge pull request #4824 from taosdata/hotfix/TD-2660

[TD-2660]<fix>:taosd crash when queried block has only one NULL record	
...@@ -1667,7 +1667,7 @@ static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pS ...@@ -1667,7 +1667,7 @@ static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pS
_end: _end:
assert(offset >= 0 && tsCols != NULL); assert(offset >= 0 && tsCols != NULL);
if (prevTs != INT64_MIN) { if (prevTs != INT64_MIN && prevTs != *(int64_t*)pRuntimeEnv->prevRow[0]) {
assert(prevRowIndex >= 0); assert(prevRowIndex >= 0);
item->lastKey = prevTs + step; item->lastKey = prevTs + step;
} }
...@@ -7715,4 +7715,4 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) { ...@@ -7715,4 +7715,4 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) {
taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle); taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle);
return 0; return 0;
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册