feat(query): add max function scalar version

TD-17344

include/libs/scalar/scalar.h

@@ -99,6 +99,7 @@ int32_t qTbnameFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pO
 int32_t countScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t maxScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 
 #ifdef __cplusplus
 }

source/libs/function/src/builtins.c

@@ -1933,6 +1933,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .getEnvFunc   = getMinmaxFuncEnv,
     .initFunc     = minmaxFunctionSetup,
     .processFunc  = maxFunction,
+    .sprocessFunc = maxScalarFunction,
     .finalizeFunc = minmaxFunctionFinalize,
     .combineFunc  = maxCombine,
     .pPartialFunc = "max",

source/libs/scalar/src/sclfunc.c

@@ -1789,12 +1789,17 @@ int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+static int32_t doMinMaxScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput, bool isMinFunc) {
   SColumnInfoData *pInputData  = pInput->columnData;
   SColumnInfoData *pOutputData = pOutput->columnData;
 
   int32_t type = GET_PARAM_TYPE(pInput);
-  SET_TYPED_DATA_MAX(pOutputData->pData, type);
+
+  if (isMinFunc) {
+    SET_TYPED_DATA_MAX(pOutputData->pData, type);
+  } else {
+    SET_TYPED_DATA_MIN(pOutputData->pData, type);
+  }
 
   for (int32_t i = 0; i < pInput->numOfRows; ++i) {
     if (colDataIsNull_s(pInputData, i)) {
@@ -1807,7 +1812,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_TINYINT: {
         int8_t *in  = (int8_t *)pInputData->pData;
         int8_t *out = (int8_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1815,7 +1820,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_SMALLINT: {
         int16_t *in  = (int16_t *)pInputData->pData;
         int16_t *out = (int16_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1823,7 +1828,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_INT: {
         int32_t *in  = (int32_t *)pInputData->pData;
         int32_t *out = (int32_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1831,7 +1836,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_BIGINT: {
         int64_t *in  = (int64_t *)pInputData->pData;
         int64_t *out = (int64_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1839,7 +1844,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_UTINYINT: {
         uint8_t *in  = (uint8_t *)pInputData->pData;
         uint8_t *out = (uint8_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1847,7 +1852,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_USMALLINT: {
         uint16_t *in  = (uint16_t *)pInputData->pData;
         uint16_t *out = (uint16_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1855,7 +1860,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_UINT: {
         uint32_t *in  = (uint32_t *)pInputData->pData;
         uint32_t *out = (uint32_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1863,7 +1868,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_UBIGINT: {
         uint64_t *in  = (uint64_t *)pInputData->pData;
         uint64_t *out = (uint64_t *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1871,7 +1876,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_FLOAT: {
         float *in  = (float *)pInputData->pData;
         float *out = (float *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1879,7 +1884,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       case TSDB_DATA_TYPE_DOUBLE: {
         double *in  = (double *)pInputData->pData;
         double *out = (double *)pOutputData->pData;
-        if(in[i] < *out) {
+        if((in[i] > *out) ^ isMinFunc) {
           *out = in[i];
         }
         break;
@@ -1890,3 +1895,11 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
   pOutput->numOfRows = pInput->numOfRows;
   return TSDB_CODE_SUCCESS;
 }
+
+int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  return doMinMaxScalarFunction(pInput, inputNum, pOutput, true);
+}
+
+int32_t maxScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  return doMinMaxScalarFunction(pInput, inputNum, pOutput, false);
+}