hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix odps and orc conflic on protobuf

Browse Source
This commit is contained in:
obdev 2024-09-18 05:33:16 +00:00 committed by ob-robot
parent 742e4a3b52
commit e4ad4e994f
8 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/init/oceanbase.el7.aarch64.deps vendored
View File

@ -33,7 +33,7 @@ devdeps-s3-cpp-sdk-1.11.156-102023122011.el7.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el7.aarch64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.aarch64.rpm
devdeps-apache-arrow-9.0.0-302024052920.el7.aarch64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el7.aarch64.rpm
devdeps-apache-orc-1.8.3-202024072510.el7.aarch64.rpm
devdeps-vsag-1.0.0-102024082710.el7.aarch64.rpm
[tools]

1
deps/init/oceanbase.el7.x86_64.deps vendored
View File

@ -38,7 +38,6 @@ devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.x86_64.rpm
devdeps-apache-arrow-9.0.0-222024052223.el7.x86_64.rpm
devdeps-hyperscan-5.4.2-152024071714.el7.x86_64.rpm
devdeps-apache-orc-1.8.3-202024072510.el7.x86_64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el7.x86_64.rpm
devdeps-vsag-1.0.0-102024082710.el7.x86_64.rpm
[tools]

2
deps/init/oceanbase.el8.aarch64.deps vendored
View File

@ -33,7 +33,7 @@ devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
devdeps-apache-arrow-9.0.0-322024052923.el8.aarch64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el8.aarch64.rpm
devdeps-apache-orc-1.8.3-202024072510.el8.aarch64.rpm
devdeps-vsag-1.0.0-102024082710.el8.aarch64.rpm
[tools]

2
deps/init/oceanbase.el8.x86_64.deps vendored
View File

@ -36,8 +36,6 @@ devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
devdeps-apache-arrow-9.0.0-172024052218.el8.x86_64.rpm
devdeps-hyperscan-5.4.2-152024071714.el8.x86_64.rpm
devdeps-apache-orc-1.8.3-202024072510.el8.x86_64.rpm
devdeps-odps-cpp-sdk-1.0.0-482024080517.el8.x86_64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el8.x86_64.rpm
devdeps-vsag-1.0.0-102024082710.el8.x86_64.rpm
[tools]

2
deps/init/oceanbase.el9.aarch64.deps vendored
View File

@ -37,7 +37,7 @@ devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
devdeps-apache-arrow-9.0.0-322024052923.el8.aarch64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el8.aarch64.rpm
devdeps-apache-orc-1.8.3-202024072510.el8.aarch64.rpm
devdeps-vsag-1.0.0-102024082710.el8.aarch64.rpm
[deps-el9]

1
deps/init/oceanbase.el9.x86_64.deps vendored
View File

@ -41,7 +41,6 @@ devdeps-apache-arrow-9.0.0-172024052218.el8.x86_64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
devdeps-hyperscan-5.4.2-152024071714.el8.x86_64.rpm
devdeps-apache-orc-1.8.3-202024072510.el8.x86_64.rpm
# devdeps-apache-orc-1.8.3-202024072510.el8.x86_64.rpm
devdeps-vsag-1.0.0-102024082710.el8.x86_64.rpm
[deps-el9]

26
deps/oblib/src/CMakeLists.txt vendored
View File

@ -21,7 +21,7 @@ target_include_directories(
${DEP_DIR}/include/apr-1/
${DEP_DIR}/include/icu/common
${DEP_DIR}/include/apache-arrow
# ${DEP_DIR}/include/apache-orc
${DEP_DIR}/include/apache-orc
${USSL_INCLUDE_DIRS}
)
@ -216,12 +216,12 @@ target_link_libraries(oblib_base_base_base
${DEP_DIR}/lib64/libarrow.a
${DEP_DIR}/lib64/libparquet.a
${DEP_DIR}/lib64/libarrow_bundled_dependencies.a
# ${DEP_DIR}/lib64/liborc.a
# ${DEP_DIR}/lib64/libsnappy.a
# ${DEP_DIR}/lib64/libprotoc.a
# ${DEP_DIR}/lib64/libprotobuf.a
# ${DEP_DIR}/lib64/liblz4.a
# ${DEP_DIR}/lib64/libzstd.a
${DEP_DIR}/lib64/liborc.a
${DEP_DIR}/lib64/libsnappy.a
${DEP_DIR}/lib64/libprotoc.a
${DEP_DIR}/lib64/libprotobuf.a
${DEP_DIR}/lib64/liblz4.a
${DEP_DIR}/lib64/libzstd.a
-L${DEP_DIR}/var/usr/lib64
-L${DEP_DIR}/var/usr/lib
-L${DEP_3RD_DIR}/usr/lib
@ -251,12 +251,12 @@ target_link_libraries(oblib_base_base_base
${DEP_DIR}/lib64/libarrow.a
${DEP_DIR}/lib64/libparquet.a
${DEP_DIR}/lib64/libarrow_bundled_dependencies.a
# ${DEP_DIR}/lib64/liborc.a
# ${DEP_DIR}/lib64/libsnappy.a
# ${DEP_DIR}/lib64/libprotoc.a
# ${DEP_DIR}/lib64/libprotobuf.a
# ${DEP_DIR}/lib64/liblz4.a
# ${DEP_DIR}/lib64/libzstd.a
${DEP_DIR}/lib64/liborc.a
${DEP_DIR}/lib64/libsnappy.a
${DEP_DIR}/lib64/libprotoc.a
${DEP_DIR}/lib64/libprotobuf.a
${DEP_DIR}/lib64/liblz4.a
${DEP_DIR}/lib64/libzstd.a
-L${DEP_DIR}/var/usr/lib64
-L${DEP_DIR}/var/usr/lib
-L${DEP_3RD_DIR}/usr/lib

4
src/sql/CMakeLists.txt
View File

@ -912,7 +912,7 @@ ob_set_subtarget(ob_sql engine_table
engine/table/ob_index_lookup_op_impl.cpp
engine/table/ob_table_scan_with_index_back_op.cpp
engine/table/ob_external_table_access_service.cpp
# engine/table/ob_orc_table_row_iter.cpp
engine/table/ob_orc_table_row_iter.cpp
engine/table/ob_parquet_table_row_iter.cpp
engine/table/ob_odps_table_row_iter.cpp
)
@ -1430,7 +1430,7 @@ else()
target_link_libraries(ob_sql_static
PUBLIC ob_sql
ob_sql_server_parser_static
${DEP_DIR}/lib64/libprotobuf.a
${DEP_DIR}/lib64/libprotobuf-v371.a
${DEP_DIR}/lib64/libzstd.a
${DEP_DIR}/lib64/libbrotlidec.a
${DEP_DIR}/lib64/libbrotlienc.a