Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query

src/query/inc/qResultbuf.h

@@ -37,7 +37,6 @@ typedef struct SDiskbasedResultBuf {
   int32_t   numOfPages;
   int64_t   totalBufSize;
   FILE*     file;
-//  int32_t   fd;                  // data file fd
   int32_t   allocateId;          // allocated page id
   int32_t   incStep;             // minimum allocated pages
   void*     pBuf;                // mmap buffer pointer

src/tsdb/src/tsdbRead.c

@@ -995,6 +995,8 @@ static void getQualifiedRowsPos(STsdbQueryHandle* pQueryHandle, int32_t startPos
     int32_t remain = endPos - startPos + 1;
     if (remain + numOfExisted > pQueryHandle->outputCapacity) {
       *end = (pQueryHandle->outputCapacity - numOfExisted) + startPos - 1;
+    } else {
+      *end = endPos;
     }
 
     *start = startPos;
@@ -1002,6 +1004,8 @@ static void getQualifiedRowsPos(STsdbQueryHandle* pQueryHandle, int32_t startPos
     int32_t remain = (startPos - endPos) + 1;
     if (remain + numOfExisted > pQueryHandle->outputCapacity) {
       *end = startPos + 1 - (pQueryHandle->outputCapacity - numOfExisted);
+    } else {
+      *end = endPos;
     }
 
     *start = *end;