[fix](build) Keep relocated storage sources out of unity builds - #66846
Open
hoshinojyunn wants to merge 1 commit into
Open
[fix](build) Keep relocated storage sources out of unity builds#66846hoshinojyunn wants to merge 1 commit into
hoshinojyunn wants to merge 1 commit into
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
### What problem does this PR solve? Issue Number: None Related PR: apache#66052 Problem Summary: The Storage unity-build exclusions still referenced collection_statistics.cpp under storage/compaction after the source moved to storage/index/inverted/similarity. CMake rejects the stale path during configuration. Restoring the exclusion at its relocated path also changes unity batch composition and exposes duplicate anonymous-namespace helper names in variant_assembler.cpp and variant_storage_cell.cpp. Exclude variant_storage_cell.cpp from unity batching so the sources keep independent translation units. ### Release note None ### Check List (For Author) - Test: BE build target - cmake --build be/build_Release --target Storage -j192 - Behavior changed: No - Does this need documentation: No
hoshinojyunn
force-pushed
the
fix/storage-unity-collection-statistics
branch
from
August 17, 2026 10:06
5dad395 to
df9b3e2
Compare
Contributor
Author
|
run buildall |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: None
Related PR: #66052
Problem Summary:
PR #66052 moved
collection_statistics.cppfrombe/src/storage/compaction/tobe/src/storage/index/inverted/similarity/. The Storage unity-build skip list still used the old path. Thedoris_skip_unity_inclusionhelper intentionally rejects nonexistent entries, so a clean BE CMake configuration fails before compilation.The relocated source must remain excluded from the unity batch. After updating the path, CMake repacks the remaining Storage sources and puts
variant_assembler.cppandvariant_storage_cell.cppin one generated unity translation unit. Both files define an implementation-localpublish_encodedhelper in an anonymous namespace; this is valid when compiled independently but becomes a redefinition in one unity translation unit.This PR updates the collection-statistics exclusion to its new source path and excludes
variant_storage_cell.cppfrom unity builds, preserving the independent compilation boundary for both Variant files. It changes only build grouping and does not alter runtime behavior.Release note
None
Check List (For Author)
Test
DORIS_HOME=/mnt/disk1/ganderun/doris cmake --build be/build_Release --target Storage -j192.Storagetarget builds with unity builds enabled.Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)