From ec4e3f0282ed7c8352f966ba8458a610122a9bf4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 12 Dec 2020 16:34:22 +0800
Subject: [PATCH] [TD-225] refactor.

---
 src/query/inc/qUtil.h |  2 +-
 src/query/src/qUtil.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/query/inc/qUtil.h b/src/query/inc/qUtil.h
index 12024e7697..acba5df2f7 100644
--- a/src/query/inc/qUtil.h
+++ b/src/query/inc/qUtil.h
@@ -29,7 +29,7 @@
 
 int32_t getOutputInterResultBufSize(SQuery* pQuery);
 
-void clearResultRow(SQueryRuntimeEnv* pRuntimeEnv, SResultRow* pRow, int16_t type);
+void clearResultRow(SQueryRuntimeEnv* pRuntimeEnv, SResultRow* pResultRow, int16_t type);
 void copyResultRow(SQueryRuntimeEnv* pRuntimeEnv, SResultRow* dst, const SResultRow* src, int16_t type);
 SResultRowCellInfo* getResultCell(SQueryRuntimeEnv* pRuntimeEnv, const SResultRow* pRow, int32_t index);
 
diff --git a/src/query/src/qUtil.c b/src/query/src/qUtil.c
index 6c845b012f..9b0569d9e6 100644
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
@@ -232,19 +232,19 @@ void closeTimeWindow(SResultRowInfo *pResultRowInfo, int32_t slot) {
   getResultRow(pResultRowInfo, slot)->closed = true;
 }
 
-void clearResultRow(SQueryRuntimeEnv *pRuntimeEnv, SResultRow *pWindowRes, int16_t type) {
-  if (pWindowRes == NULL) {
+void clearResultRow(SQueryRuntimeEnv *pRuntimeEnv, SResultRow *pResultRow, int16_t type) {
+  if (pResultRow == NULL) {
     return;
   }
 
   // the result does not put into the SDiskbasedResultBuf, ignore it.
-  if (pWindowRes->pageId >= 0) {
-    tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes->pageId);
+  if (pResultRow->pageId >= 0) {
+    tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pResultRow->pageId);
 
     for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutput; ++i) {
-      SResultRowCellInfo *pResultInfo = &pWindowRes->pCellInfo[i];
+      SResultRowCellInfo *pResultInfo = &pResultRow->pCellInfo[i];
 
-      char * s = getPosInResultPage(pRuntimeEnv, i, pWindowRes, page);
+      char * s = getPosInResultPage(pRuntimeEnv, i, pResultRow, page);
       size_t size = pRuntimeEnv->pQuery->pExpr1[i].bytes;
       memset(s, 0, size);
 
@@ -252,15 +252,15 @@ void clearResultRow(SQueryRuntimeEnv *pRuntimeEnv, SResultRow *pWindowRes, int16
     }
   }
 
-  pWindowRes->numOfRows = 0;
-  pWindowRes->pageId = -1;
-  pWindowRes->rowId = -1;
-  pWindowRes->closed = false;
+  pResultRow->numOfRows = 0;
+  pResultRow->pageId = -1;
+  pResultRow->rowId = -1;
+  pResultRow->closed = false;
 
   if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-    tfree(pWindowRes->key);
+    tfree(pResultRow->key);
   } else {
-    pWindowRes->win = TSWINDOW_INITIALIZER;
+    pResultRow->win = TSWINDOW_INITIALIZER;
   }
 }
 
-- 
GitLab