fix(query): fix countAlwaysReturnValue param not taking effect for

count and hyperloglog function TD-20140

fix(query): fix countAlwaysReturnValue param not taking effect for
count and hyperloglog function TD-20140
5fffeba2 · Ganlin Zhao · 794bca79 · 5fffeba2 · 5fffeba2
隐藏空白更改
内联并排

Showing with 6 addition and 2 deletion

source/libs/function/src/builtinsimpl.c source/libs/function/src/builtinsimpl.c +1 -1

source/libs/function/src/functionMgt.c source/libs/function/src/functionMgt.c +5 -1

未找到文件。
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -551,7 +551,7 @@ int32_t countFunction(SqlFunctionCtx* pCtx) {
  if (tsCountAlwaysReturnValue) {
    pResInfo->numOfRes = 1;
  } else {
-    SET_VAL(pResInfo, 1, 1);
+    SET_VAL(pResInfo, *((int64_t*)buf), 1);
  }

  return TSDB_CODE_SUCCESS;

--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -241,7 +241,11 @@ bool fmIsNotNullOutputFunc(int32_t funcId) {
         FUNCTION_TYPE_LAST_MERGE == funcMgtBuiltins[funcId].type ||
         FUNCTION_TYPE_FIRST == funcMgtBuiltins[funcId].type ||
         FUNCTION_TYPE_FIRST_PARTIAL == funcMgtBuiltins[funcId].type ||
-         FUNCTION_TYPE_FIRST_MERGE == funcMgtBuiltins[funcId].type;
+         FUNCTION_TYPE_FIRST_MERGE == funcMgtBuiltins[funcId].type ||
+         FUNCTION_TYPE_COUNT == funcMgtBuiltins[funcId].type ||
+         FUNCTION_TYPE_HYPERLOGLOG == funcMgtBuiltins[funcId].type ||
+         FUNCTION_TYPE_HYPERLOGLOG_PARTIAL == funcMgtBuiltins[funcId].type ||
+         FUNCTION_TYPE_HYPERLOGLOG_MERGE == funcMgtBuiltins[funcId].type;
 }

 bool fmIsSelectValueFunc(int32_t funcId) {