Skip to content
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.

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

Summer ospp#10374 #12165

Merged
merged 8 commits into from
Jun 3, 2024
Merged

Summer ospp#10374 #12165

merged 8 commits into from
Jun 3, 2024

Conversation

KomachiSion
Copy link
Collaborator

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

Fix #10374 .

Brief changelog

Merge OPSS#10374 to develop branch.

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

ldyedu and others added 8 commits August 7, 2023 09:29
* For #10374, Support listener to get changed instances

* Update AbstractNamingChangeListener,NamingChaneEventTest

* Update InstancesDiffTest

* Rename NamingChangeEventTest
* For #10374, Define selectors and related components

* Add unit test

* Update NamingSelectorWrapperTest

* Update selectors and related components

* Update NamingSelectorWrapper
* Select clusters using the selector

* Add Event Cache

* Update NacosNamingService,InstancesChangeNotifier
* Add default selectors

* add tests

* Update SubscribeSelector_ITCase

* add unsubscribe test

* Removes some methods for NamingSelectorFactor

* Update SelectorManager
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/cache/ServiceInfoHolder.java
#	client/src/test/java/com/alibaba/nacos/client/naming/NacosNamingServiceTest.java
#	client/src/test/java/com/alibaba/nacos/client/naming/event/InstancesChangeEventTest.java
#	client/src/test/java/com/alibaba/nacos/client/naming/event/InstancesChangeNotifierTest.java
@KomachiSion KomachiSion added kind/feature type/feature area/Naming area/Client Related to Nacos Client SDK Summer labels Jun 3, 2024
@KomachiSion KomachiSion added this to the 2.4.0 milestone Jun 3, 2024
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 74.18033% with 63 lines in your changes are missing coverage. Please review.

Project coverage is 68.77%. Comparing base (04f9b86) to head (0d8b04b).

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##             develop   #12165      +/-   ##
=============================================
+ Coverage      68.74%   68.77%   +0.03%     
- Complexity      9140     9215      +75     
=============================================
  Files           1254     1263       +9     
  Lines          40952    41149     +197     
  Branches        4344     4358      +14     
=============================================
+ Hits           28151    28300     +149     
- Misses         10787    10807      +20     
- Partials        2014     2042      +28     
Files Coverage Δ
...acos/client/naming/event/InstancesChangeEvent.java 100.00% <100.00%> (ø)
...acos/client/naming/listener/NamingChangeEvent.java 100.00% <100.00%> (ø)
...a/nacos/client/naming/cache/ServiceInfoHolder.java 91.30% <92.30%> (-0.74%) ⬇️
...s/client/naming/core/ServiceInfoUpdateService.java 90.72% <0.00%> (ø)
.../naming/listener/AbstractNamingChangeListener.java 75.00% <75.00%> (ø)
.../client/naming/selector/DefaultNamingSelector.java 85.71% <85.71%> (ø)
...ibaba/nacos/client/naming/event/InstancesDiff.java 93.10% <93.10%> (ø)
...alibaba/nacos/client/selector/SelectorManager.java 88.23% <88.23%> (ø)
...s/client/naming/event/InstancesChangeNotifier.java 87.50% <80.00%> (-7.85%) ⬇️
.../client/naming/selector/NamingListenerInvoker.java 71.42% <71.42%> (ø)
... and 4 more

... and 4 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 04f9b86...0d8b04b. Read the comment docs.

@KomachiSion KomachiSion merged commit d212a52 into develop Jun 3, 2024
7 checks passed
@KomachiSion KomachiSion deleted the summer-ospp#10374 branch June 3, 2024 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/Client Related to Nacos Client SDK area/Naming kind/feature type/feature Summer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Summer 2023] 客户端订阅者合并和数据选择功能/Client subscriber merged and data selected feature
3 participants