xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix ci build for ret check

This commit is contained in:
wangjiaming0909 2025-03-07 19:43:09 +08:00
parent 98e4064bd5
commit b480ad71c3
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/libs/decimal/src/decimal.c
View File

@ -473,7 +473,7 @@ int32_t decimal64ToStr(const DecimalType* pInt, uint8_t scale, char* pBuf, int32
int32_t code = decimalGetWhole(pInt, DECIMAL_64, scale, &whole);
pos += snprintf(pBuf + pos, bufLen - pos, "%" PRId64, DECIMAL64_GET_VALUE(&whole));
if (scale > 0) {
decimalGetFrac(pInt, DECIMAL_64, scale, &frac);
(void)decimalGetFrac(pInt, DECIMAL_64, scale, &frac);
if (DECIMAL64_GET_VALUE(&frac) != 0 || DECIMAL64_GET_VALUE(&whole) != 0) {
TAOS_STRCAT(pBuf + pos, ".");
pos += 1;
@ -641,11 +641,8 @@ static bool decimal128Lt(const DecimalType* pLeft, const DecimalType* pRight, ui
// TODO wjm pRightDec use const
Decimal128 *pLeftDec = (Decimal128*)pLeft, *pRightDec = (Decimal128*)pRight;
Decimal128 right = {0};
char left_buf[64] = {0}, right_buf[64] = {0}; // TODO wjm remove it
DECIMAL128_CHECK_RIGHT_WORD_NUM(rightWordNum, pRightDec, right, pRight);
decimal128ToStr(pLeftDec, 0, left_buf, 64);
decimal128ToStr(pRightDec, 0, right_buf, 64);
return DECIMAL128_HIGH_WORD(pLeftDec) < DECIMAL128_HIGH_WORD(pRightDec) ||
(DECIMAL128_HIGH_WORD(pLeftDec) == DECIMAL128_HIGH_WORD(pRightDec) &&
DECIMAL128_LOW_WORD(pLeftDec) < DECIMAL128_LOW_WORD(pRightDec));
@ -1367,8 +1364,8 @@ static int64_t int64FromDecimal128(const DecimalType* pDec, uint8_t prec, uint8_
return 0;
}
Decimal128 max = {0}, min = {0};
decimal128FromInt64(&max, TSDB_DECIMAL128_MAX_PRECISION, 0, INT64_MAX);
decimal128FromInt64(&min, TSDB_DECIMAL128_MAX_PRECISION, 0, INT64_MIN);
(void)decimal128FromInt64(&max, TSDB_DECIMAL128_MAX_PRECISION, 0, INT64_MAX);
(void)decimal128FromInt64(&min, TSDB_DECIMAL128_MAX_PRECISION, 0, INT64_MIN);
if (decimal128Gt(&rounded, &max, WORD_NUM(Decimal128)) || decimal128Lt(&rounded, &min, WORD_NUM(Decimal128))) {
overflow = true;
return (int64_t)DECIMAL128_LOW_WORD(&rounded);
@ -1384,7 +1381,7 @@ static uint64_t uint64FromDecimal128(const DecimalType* pDec, uint8_t prec, uint
if (overflow) return 0;
Decimal128 max = {0};
decimal128FromUint64(&max, TSDB_DECIMAL128_MAX_PRECISION, 0, UINT64_MAX);
(void)decimal128FromUint64(&max, TSDB_DECIMAL128_MAX_PRECISION, 0, UINT64_MAX);
if (decimal128Gt(&rounded, &max, WORD_NUM(Decimal128)) ||
decimal128Lt(&rounded, &decimal128Zero, WORD_NUM(Decimal128))) {
overflow = true;

4
tests/ci/scan_file_path.py
View File

@ -117,7 +117,7 @@ def scan_files_path(source_file_path):
# scan_dir_list = ["source", "include", "docs/examples", "tests/script/api", "src/plugins"]
scan_dir_list = ["source", "include", "docs/examples", "src/plugins"]
scan_skip_file_list = ["/root/charles/TDinternal/community/tools/taosws-rs/target/release/build/openssl-sys-7811e597b848e397/out/openssl-build/install/include/openssl",
"/test/", "contrib", "debug", "deps", "/root/charles/TDinternal/community/source/libs/parser/src/sql.c", "/root/charles/TDinternal/community/source/client/jni/windows/win32/bridge/AccessBridgeCalls.c"]
"/test/", "contrib", "debug", "deps", "/root/charles/TDinternal/community/source/libs/parser/src/sql.c", "/root/charles/TDinternal/community/source/client/jni/windows/win32/bridge/AccessBridgeCalls.c", "/root/charles/TDinternal/community/source/libs/decimal/src/detail"]
for root, dirs, files in os.walk(source_file_path):
for file in files:
if any(item in root for item in scan_dir_list):
@ -129,7 +129,7 @@ def scan_files_path(source_file_path):
def input_files(change_files):
# scan_dir_list = ["source", "include", "docs/examples", "tests/script/api", "src/plugins"]
scan_dir_list = ["source", "include", "docs/examples", "src/plugins"]
scan_skip_file_list = ["tools/taosws-rs/target/release/build/openssl-sys-7811e597b848e397/out/openssl-build/install/include/openssl", "/test/", "contrib", "debug", "deps", "source/libs/parser/src/sql.c", "source/libs/azure", "source/client/jni/windows/win32/bridge/AccessBridgeCalls.c"]
scan_skip_file_list = ["tools/taosws-rs/target/release/build/openssl-sys-7811e597b848e397/out/openssl-build/install/include/openssl", "/test/", "contrib", "debug", "deps", "source/libs/parser/src/sql.c", "source/libs/azure", "source/client/jni/windows/win32/bridge/AccessBridgeCalls.c", "/root/charles/TDinternal/community/source/libs/decimal/src/detail"]
with open(change_files, 'r') as file:
for line in file:
file_name = line.strip()