From 39dc3c422c95101817e21f3d94818d1055ffc796 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 7 Aug 2020 12:08:42 +0800
Subject: [PATCH] [td-1065]

---
 src/query/src/qResultbuf.c           | 20 ++++++++++++--------
 src/query/tests/resultBufferTest.cpp |  1 -
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/query/src/qResultbuf.c b/src/query/src/qResultbuf.c
index 8235bd7b1f..777210bd11 100644
--- a/src/query/src/qResultbuf.c
+++ b/src/query/src/qResultbuf.c
@@ -7,6 +7,7 @@
 #include "taoserror.h"
 
 #define GET_DATA_PAYLOAD(_p) ((_p)->pData + POINTER_BYTES)
+#define NO_IN_MEM_AVAILABLE_PAGES(_b) (listNEles((_b)->lruList) >= (_b)->inMemPages)
 
 int32_t createDiskbasedResultBuffer(SDiskbasedResultBuf** pResultBuf, int32_t rowSize, int32_t pagesize,
                                     int32_t inMemBufSize, const void* handle) {
@@ -25,7 +26,7 @@ int32_t createDiskbasedResultBuffer(SDiskbasedResultBuf** pResultBuf, int32_t ro
   pResBuf->comp         = true;
   pResBuf->file         = NULL;
   pResBuf->handle       = handle;
-  pResBuf->fileSize = 0;
+  pResBuf->fileSize     = 0;
 
   // at least more than 2 pages must be in memory
   assert(inMemBufSize >= pagesize * 2);
@@ -186,8 +187,6 @@ static char* loadPageFromDisk(SDiskbasedResultBuf* pResultBuf, SPageInfo* pg) {
   return GET_DATA_PAYLOAD(pg);
 }
 
-#define NO_IN_MEM_AVAILABLE_PAGES(_b) (listNEles((_b)->lruList) >= (_b)->inMemPages)
-
 static SIDList addNewGroup(SDiskbasedResultBuf* pResultBuf, int32_t groupId) {
   assert(taosHashGet(pResultBuf->groupSet, (const char*) &groupId, sizeof(int32_t)) == NULL);
 
@@ -211,11 +210,12 @@ static SPageInfo* registerPage(SDiskbasedResultBuf* pResultBuf, int32_t groupId,
   pResultBuf->numOfPages += 1;
 
   SPageInfo* ppi = malloc(sizeof(SPageInfo));//{ .info = PAGE_INFO_INITIALIZER, .pageId = pageId, .pn = NULL};
-  ppi->info     = PAGE_INFO_INITIALIZER;
-  ppi->pageId   = pageId;
-  ppi->pData    = NULL;
-  ppi->pn       = NULL;
-  ppi->used     = true;
+
+  ppi->pageId = pageId;
+  ppi->pData  = NULL;
+  ppi->info   = PAGE_INFO_INITIALIZER;
+  ppi->used   = true;
+  ppi->pn     = NULL;
 
   return *(SPageInfo**) taosArrayPush(list, &ppi);
 }
@@ -246,6 +246,8 @@ static char* evicOneDataPage(SDiskbasedResultBuf* pResultBuf) {
   // all pages are referenced by user, try to allocate new space
   if (pn == NULL) {
     int32_t prev = pResultBuf->inMemPages;
+
+    // increase by 50% of previous mem pages
     pResultBuf->inMemPages = pResultBuf->inMemPages * 1.5;
 
     qWarn("%p in memory buf page not sufficient, expand from %d to %d, page size:%d", pResultBuf, prev,
@@ -353,6 +355,8 @@ tFilePage* getResBufPage(SDiskbasedResultBuf* pResultBuf, int32_t id) {
     ((void**)((*pi)->pData))[0] = (*pi);
 
     lruListPushFront(pResultBuf->lruList, *pi);
+    (*pi)->used = true;
+
     loadPageFromDisk(pResultBuf, *pi);
     return GET_DATA_PAYLOAD(*pi);
   }
diff --git a/src/query/tests/resultBufferTest.cpp b/src/query/tests/resultBufferTest.cpp
index e9611a3232..7b946d8589 100644
--- a/src/query/tests/resultBufferTest.cpp
+++ b/src/query/tests/resultBufferTest.cpp
@@ -130,7 +130,6 @@ void recyclePageTest() {
   ASSERT_TRUE(t4 == pBufPage4);
   ASSERT_TRUE(pageId == 4);
   releaseResBufPage(pResultBuf, t4);
-  releaseResBufPage(pResultBuf, t4);
 
   tFilePage* pBufPage5 = getNewDataBuf(pResultBuf, groupId, &pageId);
   tFilePage* t5 = getResBufPage(pResultBuf, pageId);
-- 
GitLab