diff --git a/deps/init/oceanbase.el7.aarch64.deps b/deps/init/oceanbase.el7.aarch64.deps index bb695dad4..bbee3b1f4 100644 --- a/deps/init/oceanbase.el7.aarch64.deps +++ b/deps/init/oceanbase.el7.aarch64.deps @@ -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] diff --git a/deps/init/oceanbase.el7.x86_64.deps b/deps/init/oceanbase.el7.x86_64.deps index bd38213ed..ef9dfa829 100644 --- a/deps/init/oceanbase.el7.x86_64.deps +++ b/deps/init/oceanbase.el7.x86_64.deps @@ -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] diff --git a/deps/init/oceanbase.el8.aarch64.deps b/deps/init/oceanbase.el8.aarch64.deps index b428d24bc..d7e16a79b 100644 --- a/deps/init/oceanbase.el8.aarch64.deps +++ b/deps/init/oceanbase.el8.aarch64.deps @@ -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] diff --git a/deps/init/oceanbase.el8.x86_64.deps b/deps/init/oceanbase.el8.x86_64.deps index 050f45976..8303cf9f6 100644 --- a/deps/init/oceanbase.el8.x86_64.deps +++ b/deps/init/oceanbase.el8.x86_64.deps @@ -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] diff --git a/deps/init/oceanbase.el9.aarch64.deps b/deps/init/oceanbase.el9.aarch64.deps index 789087f9e..f2030d660 100644 --- a/deps/init/oceanbase.el9.aarch64.deps +++ b/deps/init/oceanbase.el9.aarch64.deps @@ -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] diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps index de5e92716..1381cbaa0 100644 --- a/deps/init/oceanbase.el9.x86_64.deps +++ b/deps/init/oceanbase.el9.x86_64.deps @@ -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] diff --git a/deps/oblib/src/CMakeLists.txt b/deps/oblib/src/CMakeLists.txt index 56d2121fc..7f9a77981 100644 --- a/deps/oblib/src/CMakeLists.txt +++ b/deps/oblib/src/CMakeLists.txt @@ -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 diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index cc2789430..d422c81d7 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -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