This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3842427c487 [Chore](workflow) do not check java env on clang-tidy
preparation (#32161)
3842427c487 is described below
commit 3842427c48747c4807010a8bdb3c2fe8d76044e3
Author: Pxl <[email protected]>
AuthorDate: Wed Mar 13 14:20:47 2024 +0800
[Chore](workflow) do not check java env on clang-tidy preparation (#32161)
---
.github/workflows/code-checks.yml | 2 +-
.github/workflows/sonarcloud.yml | 2 +-
be/src/runtime/load_channel_mgr.cpp | 6 +++---
env.sh | 2 +-
thirdparty/build-thirdparty.sh | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/code-checks.yml
b/.github/workflows/code-checks.yml
index 59a05a39fb7..72c164a1c58 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -105,7 +105,7 @@ jobs:
popd
export
PATH="${DEFAULT_DIR}/ldb-toolchain/bin/:$(pwd)/thirdparty/installed/bin/:${PATH}"
- DISABLE_JAVA_UDF=ON DORIS_TOOLCHAIN=clang ENABLE_PCH=OFF
OUTPUT_BE_BINARY=0 ./build.sh --be --cloud
+ DO_NOT_CHECK_JAVA_ENV=ON DORIS_TOOLCHAIN=clang ENABLE_PCH=OFF
OUTPUT_BE_BINARY=0 ./build.sh --be --cloud
fi
echo "should_check=${{ steps.filter.outputs.cpp_changes }}"
>>${GITHUB_OUTPUT}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 1deabd2cf9d..81172f176e4 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -143,7 +143,7 @@ jobs:
popd
export
PATH="${DEFAULT_DIR}/ldb-toolchain/bin/:$(pwd)/thirdparty/installed/bin/:${PATH}"
- DISABLE_JAVA_UDF=ON ENABLE_PCH=OFF DORIS_TOOLCHAIN=clang
OUTPUT_BE_BINARY=0 ./build.sh --be
+ DO_NOT_CHECK_JAVA_ENV=ON ENABLE_PCH=OFF DORIS_TOOLCHAIN=clang
OUTPUT_BE_BINARY=0 ./build.sh --be
- name: Install sonar-scanner and build-wrapper
if: ${{ steps.filter.outputs.be_changes == 'true' }}
diff --git a/be/src/runtime/load_channel_mgr.cpp
b/be/src/runtime/load_channel_mgr.cpp
index 4b0cc32f9c9..53063d90673 100644
--- a/be/src/runtime/load_channel_mgr.cpp
+++ b/be/src/runtime/load_channel_mgr.cpp
@@ -162,7 +162,7 @@ Status LoadChannelMgr::add_batch(const
PTabletWriterAddBlockRequest& request,
// this case will be handled in load channel's add batch method.
Status st = channel->add_batch(request, response);
if (UNLIKELY(!st.ok())) {
- static_cast<void>(channel->cancel());
+ RETURN_IF_ERROR(channel->cancel());
return st;
}
@@ -198,7 +198,7 @@ Status LoadChannelMgr::cancel(const
PTabletWriterCancelRequest& params) {
}
if (cancelled_channel != nullptr) {
- static_cast<void>(cancelled_channel->cancel());
+ RETURN_IF_ERROR(cancelled_channel->cancel());
LOG(INFO) << "load channel has been cancelled: " << load_id;
}
@@ -246,7 +246,7 @@ Status LoadChannelMgr::_start_load_channels_clean() {
// otherwise some object may be invalid before trying to visit it.
// eg: MemTracker in load channel
for (auto& channel : need_delete_channels) {
- static_cast<void>(channel->cancel());
+ RETURN_IF_ERROR(channel->cancel());
LOG(INFO) << "load channel has been safely deleted: " <<
channel->load_id()
<< ", timeout(s): " << channel->timeout();
}
diff --git a/env.sh b/env.sh
index 5f2cef57e69..52d83d60675 100755
--- a/env.sh
+++ b/env.sh
@@ -247,7 +247,7 @@ function check_jdk_version() {
}
# if is called from build-thirdparty.sh, no need to check these tools
-if test -z "${BUILD_THIRDPARTY_WIP:-}"; then
+if test -z "${DO_NOT_CHECK_JAVA_ENV:-}"; then
# register keyword is forbidden to use in C++17
# the C++ code generated by flex that remove register keyword after
version 2.6.0
# so we need check flex version here to avoid compilation failed
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index ad8dbc28e93..6a83039db55 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -38,9 +38,9 @@ export TP_DIR="${curdir}"
# include custom environment variables
if [[ -f "${DORIS_HOME}/env.sh" ]]; then
- export BUILD_THIRDPARTY_WIP=1
+ export DO_NOT_CHECK_JAVA_ENV=1
. "${DORIS_HOME}/env.sh"
- export BUILD_THIRDPARTY_WIP=
+ export DO_NOT_CHECK_JAVA_ENV=
fi
# Check args
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
