Mryange opened a new pull request, #63109:
URL: https://github.com/apache/doris/pull/63109
### What problem does this PR solve?
Issue Number: N/A
Problem Summary:
After #63070 replaced `std::mutex`/`std::lock_guard` with annotated wrappers
(`AnnotatedMutex`/`LockGuard`), shared mutex usage still relied on raw
`std::shared_mutex` and `std::shared_lock`/`std::unique_lock`, which are
invisible to Clang's thread safety analysis. This leaves shared-lock sites
unverified — `GUARDED_BY`, `REQUIRES_SHARED`, and other annotations cannot be
enforced.
- Add `AnnotatedSharedMutex` (wrapping `std::shared_mutex` with
`CAPABILITY`/`ACQUIRE`/`RELEASE`/`ACQUIRE_SHARED`/`RELEASE_SHARED` annotations)
and `SharedLockGuard` (RAII `SCOPED_CAPABILITY` with
`ACQUIRE_SHARED`/`RELEASE`) in `thread_safety_annotations.h`.
- Migrate `VDataStreamMgr` and `RuntimeFilterMergeControllerEntity` from
`std::shared_mutex` to `AnnotatedSharedMutex`, and from
`std::unique_lock`/`std::shared_lock` to `LockGuard`/`SharedLockGuard`.
- Add `GUARDED_BY` annotations to the protected maps.
- Extract `_find_recvr` as a private helper annotated with
`REQUIRES_SHARED(_lock)`, eliminating the `bool acquire_lock` parameter that
previously bypassed lock tracking.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR should
merge into -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
