Skip to content

[enhancement](thirdparty) upgrade thirdparty libs - #23290

Merged
morningman merged 3 commits into
apache:masterfrom
xinyiZzz:20230816_arrow_flight_be2_push_thridparty
Aug 23, 2023
Merged

[enhancement](thirdparty) upgrade thirdparty libs#23290
morningman merged 3 commits into
apache:masterfrom
xinyiZzz:20230816_arrow_flight_be2_push_thridparty

Conversation

@xinyiZzz

Copy link
Copy Markdown
Contributor

Proposed changes

protobuf 3.15.0 -> 21.11
glog 0.4.0 -> 0.6.0
lz4 1.9.3 -> 1.9.4
curl 7.79.0 -> 8.2.1
brpc 1.4.0 -> 1.6.0
zstd 1.5.2 -> 1.5.5
arrow 7.0.0 -> 13.0.0
abseil 20220623.1 -> 2023012.3
orc 1.7.2 -> 1.9.0
jemalloc for arrow 5.2.1 -> 5.3.0
xsimd 7.0.0 -> 13.0.0
opentelemetry-proto 0.19.0 -> 1.0.0
opentelemetry 1.8.3 -> 1.10.0

new:
c-ares -> 1.19.1
grpc -> 1.54.3

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@github-actions

Copy link
Copy Markdown
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:
----------
In thirdparty/build-thirdparty.sh line 432:
-DCMAKE_PREFIX_PATH=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 439:
-DCMAKE_INSTALL_PREFIX=${TP_INSTALL_DIR} ../..
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" ../..
In thirdparty/build-thirdparty.sh line 935:
-DCMAKE_INSTALL_PREFIX=${TP_INSTALL_DIR} ..
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" ..
In thirdparty/build-thirdparty.sh line 951:
-DCMAKE_INSTALL_PREFIX=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 953:
-Dc-ares_DIR=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -Dc-ares_DIR="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 955:
-Dabsl_DIR=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -Dabsl_DIR="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 957:
-DProtobuf_DIR=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DProtobuf_DIR="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 959:
-Dre2_DIR:STRING=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -Dre2_DIR:STRING="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 961:
-DOPENSSL_ROOT_DIR=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DOPENSSL_ROOT_DIR="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 963:
-DZLIB_ROOT=${TP_INSTALL_DIR} \
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: -DZLIB_ROOT="${TP_INSTALL_DIR}" \
In thirdparty/build-thirdparty.sh line 971:
sed -i 's/find_dependency/find_package/g' ${TP_INSTALL_DIR}/lib64/cmake/grpc/gRPCConfig.cmake
^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean: sed -i 's/find_dependency/find_package/g' "${TP_INSTALL_DIR}"/lib64/cmake/grpc/gRPCConfig.cmake
For more information:
https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ...
----------
You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
# shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.
shfmt errors

'shfmt ' returned error 1 finding the following formatting issues:
----------
--- thirdparty/build-thirdparty.sh.orig
+++ thirdparty/build-thirdparty.sh
@@ -427,7 +427,7 @@
cd cmake/build
CXXFLAGS="-O2 -I${TP_INCLUDE_DIR}" \
- LDFLAGS="${ldflags}" \
+ LDFLAGS="${ldflags}" \
"${CMAKE_CMD}" -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=${TP_INSTALL_DIR} \
-Dprotobuf_USE_EXTERNAL_GTEST=ON \
@@ -946,23 +946,23 @@
cd cmake/build
cmake -DgRPC_INSTALL=ON \
- -DgRPC_BUILD_TESTS=OFF \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=${TP_INSTALL_DIR} \
- -DgRPC_CARES_PROVIDER=package \
- -Dc-ares_DIR=${TP_INSTALL_DIR} \
- -DgRPC_ABSL_PROVIDER=package \
- -Dabsl_DIR=${TP_INSTALL_DIR} \
- -DgRPC_PROTOBUF_PROVIDER=package \
- -DProtobuf_DIR=${TP_INSTALL_DIR} \
- -DgRPC_RE2_PROVIDER=package \
- -Dre2_DIR:STRING=${TP_INSTALL_DIR} \
- -DgRPC_SSL_PROVIDER=package \
- -DOPENSSL_ROOT_DIR=${TP_INSTALL_DIR} \
- -DgRPC_ZLIB_PROVIDER=package \
- -DZLIB_ROOT=${TP_INSTALL_DIR} \
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
- ../..
+ -DgRPC_BUILD_TESTS=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=${TP_INSTALL_DIR} \
+ -DgRPC_CARES_PROVIDER=package \
+ -Dc-ares_DIR=${TP_INSTALL_DIR} \
+ -DgRPC_ABSL_PROVIDER=package \
+ -Dabsl_DIR=${TP_INSTALL_DIR} \
+ -DgRPC_PROTOBUF_PROVIDER=package \
+ -DProtobuf_DIR=${TP_INSTALL_DIR} \
+ -DgRPC_RE2_PROVIDER=package \
+ -Dre2_DIR:STRING=${TP_INSTALL_DIR} \
+ -DgRPC_SSL_PROVIDER=package \
+ -DOPENSSL_ROOT_DIR=${TP_INSTALL_DIR} \
+ -DgRPC_ZLIB_PROVIDER=package \
+ -DZLIB_ROOT=${TP_INSTALL_DIR} \
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+ ../..
make -j "${PARALLEL}"
make install
@@ -1579,8 +1579,8 @@
cd "${BUILD_DIR}"
CXXFLAGS="-O2 -I${TP_INCLUDE_DIR}" \
- LDFLAGS="-L${TP_LIB_DIR}" \
- "${CMAKE_CMD}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
+ LDFLAGS="-L${TP_LIB_DIR}" \
+ "${CMAKE_CMD}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
-DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" \
-DBUILD_TESTING=OFF \
-DWITH_OTLP_GRPC=ON \
----------
You can reformat the above files to meet shfmt's requirements by typing:
shfmt -w filename

@github-actions

Copy link
Copy Markdown
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@xinyiZzz
xinyiZzzforce-pushed the 20230816_arrow_flight_be2_push_thridparty branch from 9396c76 to 3ae017aCompareAugust 22, 2023 07:20
@xinyiZzz

Copy link
Copy Markdown
ContributorAuthor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 48.71 seconds
stream load tsv: 553 seconds loaded 74807831229 Bytes, about 129 MB/s
stream load json: 21 seconds loaded 2358488459 Bytes, about 107 MB/s
stream load orc: 65 seconds loaded 1101869774 Bytes, about 16 MB/s
stream load parquet: 31 seconds loaded 861443392 Bytes, about 26 MB/s
insert into select: 29.2 seconds inserted 10000000 Rows, about 342K ops/s
storage size: 17162299264 Bytes

@xinyiZzz
xinyiZzzforce-pushed the 20230816_arrow_flight_be2_push_thridparty branch from 3ae017a to c1092ebCompareAugust 22, 2023 16:09
@xinyiZzz

Copy link
Copy Markdown
ContributorAuthor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 45.7 seconds
stream load tsv: 537 seconds loaded 74807831229 Bytes, about 132 MB/s
stream load json: 20 seconds loaded 2358488459 Bytes, about 112 MB/s
stream load orc: 65 seconds loaded 1101869774 Bytes, about 16 MB/s
stream load parquet: 31 seconds loaded 861443392 Bytes, about 26 MB/s
insert into select: 29.2 seconds inserted 10000000 Rows, about 342K ops/s
storage size: 17162073019 Bytes

Comment threadthirdparty/vars.sh Outdated
Comment threadthirdparty/vars.sh Outdated
Comment threadthirdparty/vars.sh Outdated
@xinyiZzz
xinyiZzzforce-pushed the 20230816_arrow_flight_be2_push_thridparty branch from c1092eb to 7987e4dCompareAugust 23, 2023 04:13
@xinyiZzz

Copy link
Copy Markdown
ContributorAuthor

run buildall

@xinyiZzz
xinyiZzzforce-pushed the 20230816_arrow_flight_be2_push_thridparty branch from 7987e4d to c58c69aCompareAugust 23, 2023 04:17
@xinyiZzz

Copy link
Copy Markdown
ContributorAuthor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 44.97 seconds
stream load tsv: 554 seconds loaded 74807831229 Bytes, about 128 MB/s
stream load json: 20 seconds loaded 2358488459 Bytes, about 112 MB/s
stream load orc: 65 seconds loaded 1101869774 Bytes, about 16 MB/s
stream load parquet: 32 seconds loaded 861443392 Bytes, about 25 MB/s
insert into select: 29.4 seconds inserted 10000000 Rows, about 340K ops/s
storage size: 17162085456 Bytes

@adonis0147adonis0147 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Aug 23, 2023
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@morningmanmorningman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@morningman
morningman merged commit 2185268 into apache:masterAug 23, 2023
hello-stephen pushed a commit to hello-stephen/doris that referenced this pull request Aug 24, 2023
yiguolei pushed a commit that referenced this pull request Aug 24, 2023
…23420)
This reverts commit 2185268.
Co-authored-by: stephen <hello-stephen@qq.com>
xinyiZzz added a commit that referenced this pull request Aug 26, 2023
submit again #23290 (not upgrade brpc, because bthread local has error)
protobuf 3.15.0 -> 21.11
glog 0.4.0 -> 0.6.0
lz4 1.9.3 -> 1.9.4
curl 7.79.0 -> 8.2.1
zstd 1.5.2 -> 1.5.5
arrow 7.0.0 -> 13.0.0
abseil 20220623.1 -> 2023012.3
orc 1.7.2 -> 1.9.0
jemalloc for arrow 5.2.1 -> 5.3.0
xsimd 7.0.0 -> 13.0.0
opentelemetry-proto 0.19.0 -> 1.0.0
opentelemetry 1.8.3 -> 1.10.0
new:
c-ares -> 1.19.1
grpc -> 1.54.3
tudouzhao pushed a commit to tudouzhao/doris that referenced this pull request Aug 26, 2023
…s not cover some failed situations for load (apache#23363)
Co-authored-by: caiconghui1 <caiconghui1@jd.com>
[enhancement](thirdparty) upgrade thirdparty libs - again (apache#23414)
submit again apache#23290 (not upgrade brpc, because bthread local has error)
protobuf 3.15.0 -> 21.11
glog 0.4.0 -> 0.6.0
lz4 1.9.3 -> 1.9.4
curl 7.79.0 -> 8.2.1
zstd 1.5.2 -> 1.5.5
arrow 7.0.0 -> 13.0.0
abseil 20220623.1 -> 2023012.3
orc 1.7.2 -> 1.9.0
jemalloc for arrow 5.2.1 -> 5.3.0
xsimd 7.0.0 -> 13.0.0
opentelemetry-proto 0.19.0 -> 1.0.0
opentelemetry 1.8.3 -> 1.10.0
new:
c-ares -> 1.19.1
grpc -> 1.54.3
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by one committer.reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@xinyiZzz@hello-stephen@adonis0147@morningman