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

[code quality][nacos-address]improve the code of ServiceManager.java #5919

Merged
merged 4 commits into from
Jun 16, 2021

Conversation

zhongxiongzeng
Copy link
Contributor

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

What is the purpose of the change

XXXXX

Brief changelog

XX

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.

@CLAassistant
Copy link

CLAassistant commented Jun 1, 2021

CLA assistant check
All committers have signed the CLA.

@KomachiSion
Copy link
Collaborator

Please fix the cla problem first

@KomachiSion KomachiSion added the pending On hold due to dependency or release label Jun 3, 2021
@zhongxiongzeng
Copy link
Contributor Author

Please fix the cla problem first

done

@KomachiSion
Copy link
Collaborator

Can you describe why you do refactor like this? I think this change need to be discuss.

@zhongxiongzeng
Copy link
Contributor Author

Can you describe why you do refactor like this? I think this change need to be discuss.

主要是优化了两个锁,使逻辑简单清晰一点。
1.优化putService线程安全的逻辑:serviceMap是ConcurrentHashMap,本身就是一个线程安全类,加锁-get-put-解锁,用putIfAbsent替代就行了。
2.addUpdatedServiceToQueue这个方法也是一样的,若只要保证这个方法是线程安全的,用synchronized就够了,额外用一个对象来加锁反而让代码显得臃肿复杂

}
}
serviceMap.get(service.getNamespaceId()).putIfAbsent(service.getName(), service);
serviceMap.putIfAbsent(service.getNamespaceId(), new ConcurrentSkipListMap<>())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the doc, the method will return the previous value associated with the specified key.
So will it throw NPE when called first time?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, i wil fix it later

@KomachiSion KomachiSion added kind/refactor and removed pending On hold due to dependency or release labels Jun 16, 2021
@KomachiSion KomachiSion added this to the 2.0.3 milestone Jun 16, 2021
@KomachiSion KomachiSion merged commit 1b18f2c into alibaba:develop Jun 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants