free operator

source/libs/executor/src/aggregateoperator.c

@@ -147,7 +147,10 @@ _error:
   if (pInfo != NULL) {
     destroyAggOperatorInfo(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/cachescanoperator.c

@@ -247,7 +247,10 @@ _error:
   }
   pInfo->pTableList = NULL;
   destroyCacheScanOperator(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }
 

source/libs/executor/src/countwindowoperator.c

@@ -341,7 +341,10 @@ _error:
     destroyCountWindowOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/eventwindowoperator.c

@@ -145,7 +145,10 @@ _error:
     destroyEWindowOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/exchangeoperator.c

@@ -443,7 +443,10 @@ _error:
     doDestroyExchangeOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/filloperator.c

@@ -567,7 +567,10 @@ _error:
   }
 
   pTaskInfo->code = code;
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }
 

source/libs/executor/src/groupcacheoperator.c

@@ -1504,7 +1504,10 @@ _error:
     destroyGroupCacheOperator(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/groupoperator.c

@@ -1246,7 +1246,10 @@ _error:
     destroyPartitionOperatorInfo(pInfo);
   }
   pTaskInfo->code = code;
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   TAOS_RETURN(code);
 }
 
@@ -1792,7 +1795,10 @@ int32_t createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStreamPart
 _error:
   pTaskInfo->code = code;
   if (pInfo != NULL) destroyStreamPartitionOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   return code;
 }

source/libs/executor/src/projectoperator.c

@@ -180,7 +180,10 @@ int32_t createProjectOperatorInfo(SOperatorInfo* downstream, SProjectPhysiNode*
 
 _error:
   destroyProjectOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -529,7 +532,10 @@ int32_t createIndefinitOutputOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
 
 _error:
   destroyIndefinitOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/scanoperator.c

@@ -1432,7 +1432,10 @@ _error:
     destroyTableScanOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -4113,7 +4116,10 @@ _error:
     destroyStreamScanOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -4670,7 +4676,10 @@ _error:
   }
 
   if (pInfo != NULL) destroyTagScanOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }
 
@@ -5915,7 +5924,10 @@ _error:
   pTaskInfo->code = code;
   pInfo->base.pTableListInfo = NULL;
   if (pInfo != NULL) destroyTableMergeScanOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }
 
@@ -6072,7 +6084,10 @@ _error:
   if (pInfo != NULL) {
     destoryTableCountScanOperator(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/sortoperator.c

@@ -164,7 +164,10 @@ _error:
     destroySortOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -836,6 +839,9 @@ _error:
   if (pInfo != NULL) {
     destroyGroupSortOperatorInfo(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }

source/libs/executor/src/streamcountwindowoperator.c

@@ -926,7 +926,10 @@ _error:
     destroyStreamCountAggOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   return code;

source/libs/executor/src/streameventwindowoperator.c

@@ -981,7 +981,10 @@ int32_t createStreamEventAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
 
 _error:
   if (pInfo != NULL) destroyStreamEventOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   return code;

source/libs/executor/src/streamfilloperator.c

@@ -1459,7 +1459,10 @@ _error:
     qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo));
   }
   if (pInfo != NULL) destroyStreamFillOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/streamtimewindowoperator.c

@@ -2013,7 +2013,10 @@ int32_t createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiN
 
 _error:
   if (pInfo != NULL) destroyStreamFinalIntervalOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -3832,7 +3835,10 @@ _error:
     destroyStreamSessionAggOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   return code;
@@ -4088,7 +4094,10 @@ _error:
   if (pInfo != NULL) {
     destroyStreamSessionAggOperatorInfo(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo));
@@ -4978,7 +4987,10 @@ int32_t createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
 
 _error:
   if (pInfo != NULL) destroyStreamStateOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   return code;
@@ -5313,7 +5325,10 @@ int32_t createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
 
 _error:
   if (pInfo != NULL) destroyStreamFinalIntervalOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/sysscanoperator.c

@@ -2209,7 +2209,10 @@ _error:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -2815,6 +2818,9 @@ _error:
     pInfo->pTableListInfo = NULL;
     destroyBlockDistScanOperatorInfo(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   return code;
 }

source/libs/executor/src/timesliceoperator.c

@@ -1208,7 +1208,10 @@ _error:
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   }
   if (pInfo != NULL) destroyTimeSliceOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }

source/libs/executor/src/timewindowoperator.c

@@ -1414,7 +1414,10 @@ _error:
   if (pInfo != NULL) {
     destroyIntervalOperatorInfo(pInfo);
   }
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -1690,7 +1693,10 @@ _error:
     destroyStateWindowOperatorInfo(pInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -1783,7 +1789,10 @@ int32_t createSessionAggOperatorInfo(SOperatorInfo* downstream, SSessionWinodwPh
 
 _error:
   if (pInfo != NULL) destroySWindowOperatorInfo(pInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -2095,7 +2104,10 @@ int32_t createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SMerge
 
 _error:
   destroyMAIOperatorInfo(miaInfo);
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }
@@ -2427,7 +2439,10 @@ _error:
     destroyMergeIntervalOperatorInfo(pMergeIntervalInfo);
   }
 
+  if (pOperator != NULL) {
+    pOperator->info = NULL;
     destroyOperator(pOperator);
+  }
   pTaskInfo->code = code;
   return code;
 }