Fix same hashCodes an different queries with include and exclude#4831
Open
13wjdgk wants to merge 1 commit intospring-projects:mainfrom
Open
Fix same hashCodes an different queries with include and exclude#483113wjdgk wants to merge 1 commit intospring-projects:mainfrom
13wjdgk wants to merge 1 commit intospring-projects:mainfrom
Conversation
|
@13wjdgk Please sign the Contributor License Agreement! Click here to manually synchronize the status of this Pull Request. See the FAQ for frequently asked questions. |
Author
|
Instead of toString(), I also considered the following solution. int result = nullSafeHashCodeForCriteria(criteria);
public static int nullSafeHashCodeForCriteria(@Nullable Object obj) {
if (obj == null) {
return 0;
} else if(obj instanceof Map<?,?>){
int result = 0;
for(Entry<?, ?> entry : ((Map<?, ?>)obj).entrySet()){
if(entry.getValue() instanceof Integer){
Integer value = (Integer)entry.getValue();
int valueHashCode;
if(value == 0){
valueHashCode = FieldProjection.EXCLUDE.hashCode();
}
else if(value == 1){
valueHashCode = FieldProjection.INCLUDE.hashCode();
}else{
valueHashCode = value.hashCode();
}
result += entry.getKey().hashCode() ^ valueHashCode;
}else {
result += entry.hashCode();
}
}
return result;
}
return obj.hashCode();
}If you have a better idea, please let me know in the comments! |
f5f6bfd to
65257f2
Compare
|
@13wjdgk Thank you for signing the Contributor License Agreement! |
13wjdgk
commented
Nov 10, 2024
| queryWithInclude.fields().include("key1"); | ||
| queryWithInclude.fields().include("key2"); | ||
|
|
||
| assertThat(queryWithExclude.hashCode()).isNotEqualTo(queryWithInclude.hashCode()); |
Author
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.

Closes #4032
There was a bug where the hashCodes of the exclude and include queries were identical.
The issue was caused by the hashCode calculation in HashMap, where the XOR operation between the hashCode of the key and the hashCode of the value (0 or 1) resulted in duplicate hashCodes.
Since Exclude and Include are differentiated by 0 and 1 and are put into the hashMap, they were vulnerable to returning duplicate hashCodes.
To resolve this, the fix involved combining the key and value of the HashMap into a single String and calculating the hashCode based on that.