Skip to content

Add bitshuffle page #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 8 commits into from
Jun 19, 2019
Merged

Add bitshuffle page #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6aef56
Add bitshuffle and croaring lib
kangpinghuang Jun 12, 2019
90e6d0e
Add bitshuffle page
kangpinghuang Jun 12, 2019
02e1266
add bitshuffle page
kangpinghuang Jun 12, 2019
941bb09
remove additional empty
kangpinghuang Jun 14, 2019
f545e0c
fix pr problems
kangpinghuang Jun 17, 2019
9b8bbda
add release api and remove cmake
kangpinghuang Jun 18, 2019
1d5e56b
fix pr problems
kangpinghuang Jun 18, 2019
fe44bf3
fix status compile problems
kangpinghuang Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions be/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ set_target_properties(librdkafka PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/
add_library(libs2 STATIC IMPORTED)
set_target_properties(libs2 PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libs2.a)

add_library(libbitshuffle STATIC IMPORTED)
set_target_properties(libbitshuffle PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libbitshuffle.a)
add_library(bitshuffle STATIC IMPORTED)
set_target_properties(bitshuffle PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libbitshuffle.a)

add_library(libroaring STATIC IMPORTED)
set_target_properties(libroaring PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libroaring.a)
add_library(roaring STATIC IMPORTED)
set_target_properties(roaring PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libroaring.a)

find_program(THRIFT_COMPILER thrift ${CMAKE_SOURCE_DIR}/bin)

Expand Down Expand Up @@ -496,6 +496,8 @@ set(DORIS_DEPENDENCIES
openssl
crypto
leveldb
bitshuffle
roaring
${WL_END_GROUP}
)

Expand Down
3 changes: 2 additions & 1 deletion be/src/olap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(LIBRARY_OUTPUT_PATH "${BUILD_DIR}/src/olap")

# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/olap")

add_library(Olap STATIC
aggregate_func.cpp
base_compaction.cpp
Expand Down Expand Up @@ -85,4 +85,5 @@ add_library(Olap STATIC
wrapper_field.cpp
rowset/segment_v2/ordinal_page_index.cpp
rowset/segment_v2/encoding_info.cpp
rowset/segment_v2/bitshuffle_wrapper.cpp
)
Loading