Skip to content

HOTFIX: wrong keyvalue equals logic when keys not equal but values equal #1293

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

Closed
enothereska wants to merge 2 commits into from
Closed

HOTFIX: wrong keyvalue equals logic when keys not equal but values equal #1293

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
dfeacc0
Fixed return value
enothereska Apr 29, 2016
c9eda62
Added unit test
enothereska Apr 29, 2016
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
4 changes: 2 additions & 2 deletions streams/src/main/java/org/apache/kafka/streams/KeyValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public boolean equals(Object other) {
if (other instanceof KeyValue) {
KeyValue otherKV = (KeyValue) other;

return key == null ? otherKV.key == null : key.equals(otherKV.key)
&& value == null ? otherKV.value == null : value.equals(otherKV.value);
return (key == null ? otherKV.key == null : key.equals(otherKV.key))
&& (value == null ? otherKV.value == null : value.equals(otherKV.value));
} else {
return false;
}
Expand Down
5 changes: 5 additions & 0 deletions streams/src/test/java/org/apache/kafka/streams/KeyValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class KeyValueTest {

private KeyValue<String, Long> kv1a = new KeyValue<>("key1", 1L);
private KeyValue<String, Long> kv1b = new KeyValue<>("key1", 1L);
private KeyValue<String, Long> kv1c = new KeyValue<>("key1", 2L);
private KeyValue<String, Long> kv2 = new KeyValue<>("key2", 2L);
private KeyValue<String, Long> kv3 = new KeyValue<>("key3", 3L);

Expand All @@ -34,12 +35,16 @@ public void testEquals() {
assertTrue(kv1a.equals(kv1a));
assertTrue(kv1a.equals(kv1b));
assertTrue(kv1b.equals(kv1a));
assertFalse(kv1a.equals(kv1c));
assertFalse(kv1c.equals(kv2));
assertFalse(kv1a.equals(kv2));
assertFalse(kv1a.equals(kv3));
assertFalse(kv2.equals(kv3));
assertFalse(kv1a.equals(null));
}



@Test
public void testHashcode() {
assertTrue(kv1a.hashCode() == kv1b.hashCode());
Expand Down