Skip to content

[fix](build) Keep relocated storage sources out of unity builds #66846

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

Open
hoshinojyunn wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −5
Open

[fix](build) Keep relocated storage sources out of unity builds #66846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions be/src/storage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ pch_reuse(Storage)
# FORMAT_*_ADD_JSON_NODE, RETURN_IF_ERROR_) must not leak into unity siblings
# - the three heaviest template-instantiation TUs (predicate creators) which
# would dominate any batch they join
# - compaction/collection_statistics.cpp: its test compiles it a second time
# by #including the .cpp; the test object must shadow a never-pulled archive
# member, but a unity batch is pulled in for its siblings and the linker
# sees a duplicate definition
# - segment/variant/v2/variant_storage_cell.cpp: it and variant_assembler.cpp
# define the same anonymous-namespace helper, which conflicts in one unity batch
set(STORAGE_UNITY_SKIP
${CMAKE_CURRENT_SOURCE_DIR}/index/inverted/inverted_index_compound_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/index/inverted/inverted_index_fs_directory.cpp
Expand All @@ -70,7 +68,8 @@ set(STORAGE_UNITY_SKIP
${CMAKE_CURRENT_SOURCE_DIR}/predicate/predicate_creator_comparison.cpp
${CMAKE_CURRENT_SOURCE_DIR}/predicate/predicate_creator_in_list_in.cpp
${CMAKE_CURRENT_SOURCE_DIR}/predicate/predicate_creator_in_list_not_in.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compaction/collection_statistics.cpp)
${CMAKE_CURRENT_SOURCE_DIR}/index/inverted/similarity/collection_statistics.cpp
${CMAKE_CURRENT_SOURCE_DIR}/segment/variant/v2/variant_storage_cell.cpp)
if (ENABLE_VARIANT_NESTED_GROUP)
# Out-of-tree module sources swapped into this target: unity hygiene
# unaudited, keep them individual.
Expand Down
Loading