diff --git a/be/src/apache-orc b/be/src/apache-orc index 2f937bdc76406f1..db01184f765c034 160000 --- a/be/src/apache-orc +++ b/be/src/apache-orc @@ -1 +1 @@ -Subproject commit 2f937bdc76406f150b484b6e57629aa8a03d48b6 +Subproject commit db01184f765c03496e4107bd3ac37c077ac4bc5f diff --git a/regression-test/pipeline/performance/run-clickbench.sh b/regression-test/pipeline/performance/run-clickbench.sh index 6ed29a464f9e57d..98f8e34ffd6e95b 100644 --- a/regression-test/pipeline/performance/run-clickbench.sh +++ b/regression-test/pipeline/performance/run-clickbench.sh @@ -91,6 +91,10 @@ exit_flag=0 cp -f "${teamcity_build_checkoutDir}"/regression-test/pipeline/performance/clickbench/conf/fe_custom.conf "${DORIS_HOME}"/fe/conf/ cp -f "${teamcity_build_checkoutDir}"/regression-test/pipeline/performance/clickbench/conf/be_custom.conf "${DORIS_HOME}"/be/conf/ target_branch="$(echo "${target_branch}" | sed 's| ||g;s|\.||g;s|-||g')" # remove space、dot、hyphen from branch name + if [[ "${target_branch}" == "branch30" ]]; then + # branch-3.0 also use master data + target_branch="master" + fi sed -i "s|^meta_dir=/data/doris-meta-\${branch_name}|meta_dir=/data/doris-meta-${target_branch}|g" "${DORIS_HOME}"/fe/conf/fe_custom.conf sed -i "s|^storage_root_path=/data/doris-storage-\${branch_name}|storage_root_path=/data/doris-storage-${target_branch}|g" "${DORIS_HOME}"/be/conf/be_custom.conf if ! restart_doris; then echo "ERROR: Restart doris failed" && exit 1; fi diff --git a/regression-test/pipeline/performance/run-load.sh b/regression-test/pipeline/performance/run-load.sh index bd67102f2030a11..46b89f09d761548 100644 --- a/regression-test/pipeline/performance/run-load.sh +++ b/regression-test/pipeline/performance/run-load.sh @@ -649,6 +649,10 @@ exit_flag=0 cp -f "${teamcity_build_checkoutDir}"/regression-test/pipeline/performance/conf/fe_custom.conf "${DORIS_HOME}"/fe/conf/ cp -f "${teamcity_build_checkoutDir}"/regression-test/pipeline/performance/conf/be_custom.conf "${DORIS_HOME}"/be/conf/ target_branch="$(echo "${target_branch}" | sed 's| ||g;s|\.||g;s|-||g')" # remove space、dot、hyphen from branch name + if [[ "${target_branch}" == "branch30" ]]; then + # branch-3.0 also use master data + target_branch="master" + fi sed -i "s|^meta_dir=/data/doris-meta-\${branch_name}|meta_dir=/data/doris-meta-${target_branch}|g" "${DORIS_HOME}"/fe/conf/fe_custom.conf sed -i "s|^storage_root_path=/data/doris-storage-\${branch_name}|storage_root_path=/data/doris-storage-${target_branch}|g" "${DORIS_HOME}"/be/conf/be_custom.conf if ! restart_doris; then echo "ERROR: Restart doris failed" && exit 1; fi