[chore](orc) Update orc lib to third party lib(1.8.3) using git submodule. (#18531)

This commit is contained in:
Qi Chen
2023-04-12 10:37:50 +08:00
committed by GitHub
parent 17e1b6d1b2
commit 2209b714d1
13 changed files with 54 additions and 7 deletions

4
.gitmodules vendored
View File

@ -25,3 +25,7 @@
[submodule ".github/actions/clang-tidy-review"]
path = .github/actions/clang-tidy-review
url = https://github.com/ZedThree/clang-tidy-review.git
[submodule "be/src/apache-orc"]
path = be/src/apache-orc
url = https://github.com/apache/doris-thirdparty.git
branch = orc

View File

@ -301,9 +301,6 @@ set_target_properties(roaring PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib
add_library(fmt STATIC IMPORTED)
set_target_properties(fmt PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libfmt.a)
add_library(orc STATIC IMPORTED)
set_target_properties(orc PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/liborc.a)
add_library(cctz STATIC IMPORTED)
set_target_properties(cctz PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libcctz.a)
@ -437,6 +434,21 @@ if (OS_MACOSX)
set_target_properties(intl PROPERTIES IMPORTED_LOCATION "${THIRDPARTY_DIR}/lib/libintl.a")
endif()
option(BUILD_JAVA OFF)
option(BUILD_CPP_TESTS OFF)
option(STOP_BUILD_ON_WARNING OFF)
option(BUILD_LIBHDFSPP OFF)
SET(PROTOBUF_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(SNAPPY_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(LZ4_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(LZ4_INCLUDE_DIR "$ENV{DORIS_THIRDPARTY}/installed/include/lz4")
SET(ZLIB_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(ZSTD_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(ZSTD_INCLUDE_DIR "$ENV{DORIS_THIRDPARTY}/installed/include/zstd")
add_subdirectory(${SRC_DIR}/apache-orc EXCLUDE_FROM_ALL)
target_compile_options(orc PRIVATE -Wno-implicit-fallthrough)
# Check if functions are supported in this platform. All flags will generated
# in gensrc/build/common/env_config.h.
# You can check funcion here which depends on platform. Don't forget add this
@ -621,6 +633,11 @@ set(CMAKE_CXX_FLAGS "${CXX_COMMON_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
# Set include dirs
include_directories(
${SRC_DIR}/apache-orc/c++/include
${CMAKE_CURRENT_BINARY_DIR}/src/apache-orc/c++/include
)
include_directories(
${SRC_DIR}/
${TEST_DIR}/
@ -744,7 +761,6 @@ set(COMMON_THIRDPARTY
zstd
arrow
parquet
orc
odbc
cctz
minizip
@ -829,6 +845,8 @@ if (WITH_MYSQL)
set(DORIS_DEPENDENCIES ${DORIS_DEPENDENCIES} mysql)
endif()
set(DORIS_DEPENDENCIES ${DORIS_DEPENDENCIES} orc)
set(DORIS_DEPENDENCIES ${DORIS_DEPENDENCIES} ${WL_END_GROUP})
# Add all external dependencies. They should come after the palo libs.
@ -851,6 +869,7 @@ else()
)
endif()
if (USE_JEMALLOC)
set(MALLOCLIB jemalloc)
else ()
@ -1004,3 +1023,4 @@ get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTO
foreach(dir ${dirs})
message(STATUS "dir='${dir}'")
endforeach()

1
be/src/apache-orc Submodule

Submodule be/src/apache-orc added at baf9e30475

View File

@ -247,6 +247,11 @@ if [[ ! -f "${DORIS_THIRDPARTY}/installed/lib/libbacktrace.a" ]]; then
fi
fi
if [[ ! -f "${DORIS_HOME}/be/src/apache-orc/README.md " ]]; then
echo "apache-orc not exists, need to update submodules ..."
git submodule update --init --recursive
fi
if [[ "${CLEAN}" -eq 1 && "${BUILD_BE}" -eq 0 && "${BUILD_FE}" -eq 0 && "${BUILD_SPARK_DPP}" -eq 0 ]]; then
clean_gensrc
clean_be

View File

@ -26,6 +26,8 @@ under the License.
```console
$ cd /to/your/workspace/
$ git clone https://github.com/apache/doris.git
$ cd doris
$ git submodule update --init --recursive
```
You can remove the `.git` dir in `doris/` to make the dir size smaller.

View File

@ -57,10 +57,12 @@ sudo apt install -y openssl libssl-dev
The following steps are carried out in the /home/workspace directory
1. dowload source
1. download source
```
git clone https://github.com/apache/doris.git
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
```
2. Compile third-party dependency packages

View File

@ -112,6 +112,8 @@ create directory and download doris
su <your user>
mkdir code && cd code
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
```
## Compile

View File

@ -40,6 +40,8 @@ Go to the [github page](https://github.com/apache/doris) of apache/doris , and c
```
git clone https://github.com/<your_github_name>/doris.git
cd doris
git submodule update --init --recursive
```
Note: Please replace your GitHub name with your yourgithubname.
@ -49,7 +51,6 @@ When clone is completed, origin defaults to the remote fork address on github.
#### (2) Add apache/doris to the remote branch upstream of the local warehouse:
```
cd doris
git remote add upstream https://github.com/apache/doris.git
```

View File

@ -62,6 +62,8 @@ CREATE TABLE IF NOT EXISTS `hive_table`(
```sql
--clone doris code
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
--install thrift
--Enter the fe directory
cd fe

View File

@ -59,6 +59,8 @@ sudo apt install -y openssl libssl-dev
```
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
```
2. 编译第三方依赖包

View File

@ -113,6 +113,8 @@ plugins=(git zsh-autosuggestions zsh-syntax-highlighting)
su <your user>
mkdir code && cd code
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
```
## 编译

View File

@ -40,6 +40,8 @@ under the License.
```
git clone https://github.com/<your_github_name>/doris.git
cd doris
git submodule update --init --recursive
```
注意:请将 \<your\_github\_name\> 替换为您的 github 名字。

View File

@ -64,6 +64,8 @@ Hive Bitmap UDF 需要在 Hive/Spark 中使用,首先需要编译fe得到hive-
```sql
--clone doris源码
git clone https://github.com/apache/doris.git
cd doris
git submodule update --init --recursive
--安装thrift
--进入fe目录
cd fe