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

fix ci ret check

This commit is contained in:
wangjiaming0909 2025-03-07 19:59:51 +08:00
parent 619af7a945
commit 87095cae94
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/ci/scan_file_path.py
View File

@ -64,7 +64,7 @@ os.makedirs(log_file_path, exist_ok=True)
scan_log_file = f"{log_file_path}/scan_log.txt" scan_log_file = f"{log_file_path}/scan_log.txt"
logger.add(scan_log_file, rotation="10MB", retention="7 days", level="DEBUG") logger.add(scan_log_file, rotation="10MB", retention="7 days", level="DEBUG")
#if error happens, open this to debug # if error happens, open this to debug
# print(self_path,work_path,TD_project_path,log_file_path,change_file_list) # print(self_path,work_path,TD_project_path,log_file_path,change_file_list)
# scan result base path # scan result base path
@ -75,7 +75,7 @@ scan_result_base_path = f"{log_file_path}/clang_scan_result/"
# compile_commands_path = f"{work_path}/debugNoSan/compile_commands.json" # compile_commands_path = f"{work_path}/debugNoSan/compile_commands.json"
compile_commands_path = f"{TD_project_path}/debug/compile_commands.json" compile_commands_path = f"{TD_project_path}/debug/compile_commands.json"
#if error happens, open this to debug # if error happens, open this to debug
# print(f"compile_commands_path:{compile_commands_path}") # print(f"compile_commands_path:{compile_commands_path}")
# # replace the docerk worf path with real work path in compile_commands.json # # replace the docerk worf path with real work path in compile_commands.json
@ -116,8 +116,17 @@ class CommandExecutor:
def scan_files_path(source_file_path): 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", "tests/script/api", "src/plugins"]
scan_dir_list = ["source", "include", "docs/examples", "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", scan_skip_file_list = [
"/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"] "/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",
"/root/charles/TDinternal/community/source/libs/decimal/src/detail",
"/root/charles/TDinternal/community/source/libs/decimal/inc/wideInteger.h",
]
for root, dirs, files in os.walk(source_file_path): for root, dirs, files in os.walk(source_file_path):
for file in files: for file in files:
if any(item in root for item in scan_dir_list): if any(item in root for item in scan_dir_list):
@ -129,7 +138,18 @@ def scan_files_path(source_file_path):
def input_files(change_files): def input_files(change_files):
# scan_dir_list = ["source", "include", "docs/examples", "tests/script/api", "src/plugins"] # scan_dir_list = ["source", "include", "docs/examples", "tests/script/api", "src/plugins"]
scan_dir_list = ["source", "include", "docs/examples", "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", "/root/charles/TDinternal/community/source/libs/decimal/src/detail"] 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",
"/root/charles/TDinternal/community/source/libs/decimal/inc/wideInteger.h",
]
with open(change_files, 'r') as file: with open(change_files, 'r') as file:
for line in file: for line in file:
file_name = line.strip() file_name = line.strip()

9
tests/system-test/2-query/decimal.py
View File

@ -1998,6 +1998,14 @@ class TDTestCase:
), ),
) )
self.check_decimal_binary_expr_with_const_col_results(
self.db_name,
self.stable_name,
self.stb_columns,
Column.get_decimal_oper_const_cols,
DecimalBinaryOperator.get_all_binary_ops,
)
## test decimal column op decimal column ## test decimal column op decimal column
for i in range(operator_test_round): for i in range(operator_test_round):
self.check_decimal_binary_expr_with_col_results( self.check_decimal_binary_expr_with_col_results(
@ -2161,7 +2169,6 @@ class TDTestCase:
res = res[0] res = res[0]
cast_func.check(res, tbname) cast_func.check(res, tbname)
def test_decimal_functions(self): def test_decimal_functions(self):
if not test_decimal_funcs: if not test_decimal_funcs:
return return