Merge branch 'feature/TD-11208-new' of github.com:taosdata/TDengine into feature/TD-11208-new

src/client/src/tscSQLParser.c

@@ -1113,7 +1113,7 @@ static int32_t addPrimaryTsColumnForTimeWindowQuery(SQueryInfo* pQueryInfo, SSql
 static int32_t checkInvalidExprForTimeWindow(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg1 = "invalid query expression";
   const char* msg2 = "top/bottom query does not support order by value in time window query";
-  const char* msg3 = "unique function does not supportted in time window query";
+//  const char* msg3 = "unique function does not supportted in time window query";
 
   /*
    * invalid sql:
@@ -1126,7 +1126,7 @@ static int32_t checkInvalidExprForTimeWindow(SSqlCmd* pCmd, SQueryInfo* pQueryIn
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
     if (pExpr->base.functionId == TSDB_FUNC_UNIQUE) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      // return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
   }
 
@@ -8384,7 +8384,7 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
   const char* msg4 = "retrieve tags not compatible with group by or interval query";
   const char* msg5 = "functions can not be mixed up";
   const char* msg6 = "TWA/Diff/Derivative/Irate/CSum/MAvg/Elapsed only support group by tbname";
-  const char* msg7 = "unique function does not supportted in state window query";
+//  const char* msg7 = "unique function does not supportted in state window query";
 
   // only retrieve tags, group by is not supportted
   if (tscQueryTags(pQueryInfo)) {
@@ -8465,7 +8465,7 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
       }
 
       if (pQueryInfo->stateWindow && f == TSDB_FUNC_UNIQUE){
-        return invalidOperationMsg(msg, msg7);
+        //return invalidOperationMsg(msg, msg7);
       }
 
       if (IS_MULTIOUTPUT(aAggs[f].status) && f != TSDB_FUNC_TOP && f != TSDB_FUNC_BOTTOM && f != TSDB_FUNC_DIFF &&

src/query/inc/qResultbuf.h

@@ -78,8 +78,8 @@ typedef struct SDiskbasedResultBuf {
 
 #define DEFAULT_INTERN_BUF_PAGE_SIZE  (1024L)                          // in bytes
 #define PAGE_INFO_INITIALIZER         (SPageDiskInfo){-1, -1}
-#define MAX_UNIQUE_RESULT_ROWS (10000)
-#define MAX_UNIQUE_RESULT_SIZE (1024*1024*20)
+#define MAX_UNIQUE_RESULT_ROWS (1000)
+#define MAX_UNIQUE_RESULT_SIZE (1024*1024*1)
 /**
  * create disk-based result buffer
  * @param pResultBuf

src/query/src/qUtil.c

@@ -198,7 +198,13 @@ SResultRowPool* initResultRowPool(size_t size) {
   p->numOfElemPerBlock = 128;
 
   p->elemSize = (int32_t) size;
-  p->blockSize = p->numOfElemPerBlock * p->elemSize;
+  int64_t tmp = p->elemSize;
+  tmp *= p->numOfElemPerBlock;
+  if (tmp > 1024*1024*1024){
+    qError("ResultRow blockSize is too large:%" PRId64, tmp);
+    tmp = 128*1024*1024;
+  }
+  p->blockSize = tmp;
   p->position.pos = 0;
 
   p->pData = taosArrayInit(8, POINTER_BYTES);