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.

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

Jump to bottom

Support asterisk #14409

Open
wants to merge 2 commits into
base: 3.3
Choose a base branch
from
Open

Support asterisk #14409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd3b1b
make nacos dataId support asterisk
qingkaiyan Jul 9, 2024
aee204e
null values make sense
qingkaiyan Jul 9, 2024
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
6 changes: 3 additions & 3 deletions dubbo-common/src/main/java/org/apache/dubbo/common/url/component/URLParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ public String getAnyMethodParameter(String key) {
* @return A new URLParam
*/
public URLParam addParameter(String key, String value) {
if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value)) {
if (StringUtils.isEmpty(key)) {
Copy link
Member

Choose a reason for hiding this comment

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

Why change this? This may cause some usage mistakes

Copy link
Author

Choose a reason for hiding this comment

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

When a consumer with a * version invoke a null version provider
Building a remote URL based on the consumer's URL will be contiains * version
It's not a good result and will blocked by PermittedSerializationKeeper.checkSerializationPermitted
This issue may only arise when the * symbol is used and The impact of the change will be widespread
But null valus has meanings seems makes scene and 10+ application running well when I made these changes
It's true that no one dares to say these is no other problem
I've been experimenting for over a month and haven't failed yet

Copy link
Author

Choose a reason for hiding this comment

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

And a consumer with a * version invoke a null version provider worked well at 2.7
I use different version and condition-router to achieve gray and business group
And like to make the dubbo:consumer version = *
It's not work when I update to 3.2 or 3.3

Copy link
Member

Choose a reason for hiding this comment

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

It would be better to change PermittedSerializationKeeper.checkSerializationPermitted in the scenarios.

Copy link
Author

Choose a reason for hiding this comment

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

Maybe It's not just this problom
It would be better when the * version consumer called the null version provider to build the null version URL

Copy link
Member

Choose a reason for hiding this comment

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

URL is a really really basic component for Dubbo, so I would prefer not to change it enless we have the conclusion that we can only change it to fix a issue.

return this;
}
return addParameters(Collections.singletonMap(key, value));
Expand All @@ -497,7 +497,7 @@ public URLParam addParameter(String key, String value) {
* @return A new URLParam
*/
public URLParam addParameterIfAbsent(String key, String value) {
if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value)) {
if (StringUtils.isEmpty(key)) {
return this;
}
if (hasParameter(key)) {
Expand Down Expand Up @@ -567,7 +567,7 @@ private URLParam doAddParameters(Map<String, String> parameters, boolean skipIfP
if (skipIfPresent && hasParameter(entry.getKey())) {
continue;
}
if (entry.getKey() == null || entry.getValue() == null) {
if (entry.getKey() == null) {
continue;
}
int keyIndex = DynamicParamTable.getKeyIndex(enableCompressed, entry.getKey());
Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosConfigServiceWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

public class NacosConfigServiceWrapper {

private static final char ASTERISK_SYMBOL = '*';

private static final String INNERCLASS_SYMBOL = "$";

private static final String INNERCLASS_COMPATIBLE_SYMBOL = "___";
Expand Down Expand Up @@ -76,6 +78,8 @@ private String handleInnerSymbol(String data) {
if (data == null) {
return null;
}
return data.replace(INNERCLASS_SYMBOL, INNERCLASS_COMPATIBLE_SYMBOL).replace(SLASH_CHAR, HYPHEN_CHAR);
return data.replace(INNERCLASS_SYMBOL, INNERCLASS_COMPATIBLE_SYMBOL)
.replace(SLASH_CHAR, HYPHEN_CHAR)
.replace(ASTERISK_SYMBOL, HYPHEN_CHAR);
}
}
6 changes: 5 additions & 1 deletion ...-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosConfigServiceWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

public class NacosConfigServiceWrapper {

private static final char ASTERISK_SYMBOL = '*';

private static final String INNERCLASS_SYMBOL = "$";

private static final String INNERCLASS_COMPATIBLE_SYMBOL = "___";
Expand Down Expand Up @@ -76,6 +78,8 @@ private String handleInnerSymbol(String data) {
if (data == null) {
return null;
}
return data.replace(INNERCLASS_SYMBOL, INNERCLASS_COMPATIBLE_SYMBOL).replace(SLASH_CHAR, HYPHEN_CHAR);
return data.replace(INNERCLASS_SYMBOL, INNERCLASS_COMPATIBLE_SYMBOL)
.replace(SLASH_CHAR, HYPHEN_CHAR)
.replace(ASTERISK_SYMBOL, HYPHEN_CHAR);
}
}
Loading