From 2bed98b7b18e9ab4c807ff7ef30a153ca3ab1055 Mon Sep 17 00:00:00 2001 From: wangjiaming0909 Date: Tue, 11 Mar 2025 16:18:09 +0800 Subject: [PATCH] fix(decimal): rebase 3.0 --- include/libs/scalar/scalar.h | 2 +- source/libs/scalar/src/sclfunc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h index 6b8cdf7fab..0a4fad1668 100644 --- a/include/libs/scalar/scalar.h +++ b/include/libs/scalar/scalar.h @@ -44,7 +44,7 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type, SType int32_t vectorGetConvertType(int32_t type1, int32_t type2); int32_t vectorConvertSingleColImpl(const SScalarParam *pIn, SScalarParam *pOut, int32_t *overflow, int32_t startIndex, int32_t numOfRows); -int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, int32_t startIndex, int32_t numOfRows); +int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, STypeMod typeMod, int32_t startIndex, int32_t numOfRows); STypeMod getConvertTypeMod(int32_t type, const SColumnInfo *pCol1, const SColumnInfo *pCol2); /* Math functions */ diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index c7cb2bba27..6df3b0c094 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -4562,7 +4562,7 @@ static int32_t greatestLeastImpl(SScalarParam *pInput, int32_t inputNum, SScalar if (oldType != outputType) { pCovertParams[j].covertParam = (SScalarParam){0}; setTzCharset(&pCovertParams[j].covertParam, pParam->tz, pParam->charsetCxt); - SCL_ERR_JRET(vectorConvertSingleCol(pParam, &pCovertParams[j].covertParam, outputType, 0, pParam->numOfRows)); + SCL_ERR_JRET(vectorConvertSingleCol(pParam, &pCovertParams[j].covertParam, outputType, 0, 0, pParam->numOfRows)); pCovertParams[j].param = &pCovertParams[j].covertParam; pCovertParams[j].converted = true; } else {