Merge pull request #6868 from taosdata/feature/query

Feature/query

src/client/src/tscSql.c

@@ -948,8 +948,6 @@ int taos_load_table_info(TAOS *taos, const char *tableNameList) {
   SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
   pSql->pTscObj = taos;
   pSql->signature = pSql;
-
-  pSql->fp = NULL;        // todo set the correct callback function pointer
   pSql->cmd.pTableMetaMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
 
   int32_t length = (int32_t)strlen(tableNameList);

src/query/src/qAggMain.c

@@ -58,7 +58,7 @@
     for (int32_t _i = 0; _i < (ctx)->tagInfo.numOfTagCols; ++_i) { \
       SQLFunctionCtx *__ctx = (ctx)->tagInfo.pTagCtxList[_i];      \
       if (__ctx->functionId == TSDB_FUNC_TS_DUMMY) {               \
-        __ctx->tag.i64 = (ts);                                  \
+        __ctx->tag.i64 = (ts);                                     \
         __ctx->tag.nType = TSDB_DATA_TYPE_BIGINT;                  \
       }                                                            \
       aAggs[TSDB_FUNC_TAG].xFunction(__ctx);                       \
@@ -520,7 +520,7 @@ int32_t noDataRequired(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
     if ((ctx)->hasNull && isNull((char *)&(list)[i], tsdbType)) { \
       continue;                                                   \
     }                                                             \
-    TSKEY key = GET_TS_DATA(ctx, i);                              \
+    TSKEY key = (ctx)->ptsList != NULL? GET_TS_DATA(ctx, i):0;    \
     UPDATE_DATA(ctx, val, (list)[i], num, sign, key);             \
   }
 
@@ -1463,10 +1463,11 @@ static void first_function(SQLFunctionCtx *pCtx) {
     }
     
     memcpy(pCtx->pOutput, data, pCtx->inputBytes);
-    
-    TSKEY k = GET_TS_DATA(pCtx, i);
-    DO_UPDATE_TAG_COLUMNS(pCtx, k);
-    
+    if (pCtx->ptsList != NULL) {
+      TSKEY k = GET_TS_DATA(pCtx, i);
+      DO_UPDATE_TAG_COLUMNS(pCtx, k);
+    }
+
     SResultRowCellInfo *pInfo = GET_RES_INFO(pCtx);
     pInfo->hasResult = DATA_SET_FLAG;
     pInfo->complete = true;

tests/script/general/parser/nestquery.sim

@@ -334,10 +334,6 @@ sql select top(x, 20) from (select c1 x from nest_tb0);
 
 sql select bottom(x, 20) from (select c1 x from nest_tb0)
 
-print ===================> complex query
-
-
-
 print ===================> group by + having
 
 
@@ -464,6 +460,28 @@ if $data01 != 0.000083333 then
   return -1
 endi
 
+print ======================>TD-5271
+sql select min(val),max(val),first(val),last(val),count(val),sum(val),avg(val) from (select count(*) val from nest_mt0 group by tbname)
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 10000 then
+  return -1
+endi
+
+if $data01 != 10000 then
+  return -1
+endi
+
+if $data04 != 10 then
+  return -1
+endi
+
+if $data05 != 100000 then
+  return -1
+endi
+
 print =================>us database interval query, TD-5039
 sql create database test precision 'us';
 sql use test;