fix:conflicts from 3.0

cb496951 · wmmhello · 6b61d3c2 · cb496951
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

source/libs/executor/src/scanoperator.c source/libs/executor/src/scanoperator.c +1 -1

未找到文件。
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1672,7 +1672,7 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
  return NULL;
 }

-static void destroyRawScanOperatorInfo(void* param, int32_t numOfOutput) {
+static void destroyRawScanOperatorInfo(void* param) {
  SStreamRawScanInfo* pRawScan = (SStreamRawScanInfo*)param;
  tsdbReaderClose(pRawScan->dataReader);
  destroySnapContext(pRawScan->sContext);