Skip to content

Commit

Permalink
[Fix](multi-catalog) optimize hashcode for PartitionKey. (apache#21307)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dutyu
dutyu authored Jun 30, 2023
1 parent df23ab3 commit 8f4b7c8
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
6 changes: 4 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TimeZone;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -1086,7 +1085,10 @@ public long getMicrosecond() {

@Override
public int hashCode() {
return 31 * super.hashCode() + Objects.hashCode(unixTimestamp(TimeZone.getDefault()));
// do not invoke the super.hashCode(), just use the return value of getLongValue()
// a DateV2 DateLiteral obj may be equal to a Date DateLiteral
// if the return value of getLongValue() is the same
return Long.hashCode(getLongValue());
}

// parse the date string value in 'value' by 'format' pattern.
Expand Down
6 changes: 5 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,15 @@ public boolean equals(Object obj) {

@Override
public int hashCode() {
int hashCode = 1;
for (LiteralExpr key : keys) {
hashCode = 31 * hashCode + (key == null ? 0 : key.hashCode());
}
int ret = types.size() * 1000;
for (PrimitiveType type : types) {
ret += type.ordinal();
}
return ret;
return hashCode + ret;
}

public static class PartitionKeySerializer implements JsonSerializer<PartitionKey> {
Expand Down
17 changes: 17 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,52 +79,60 @@ public void compareTest() throws AnalysisException {
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127"), new PartitionValue("32767")),
Arrays.asList(tinyInt, smallInt));
pk2 = PartitionKey.createInfinityPartitionKey(Arrays.asList(tinyInt, smallInt), true);
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case2
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127")),
Arrays.asList(tinyInt, smallInt));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127"), new PartitionValue("-32768")),
Arrays.asList(tinyInt, smallInt));
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);

// case3
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127")),
Arrays.asList(int32, bigInt));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("128"), new PartitionValue("-32768")),
Arrays.asList(int32, bigInt));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case4
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127"), new PartitionValue("12345")),
Arrays.asList(largeInt, bigInt));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127"), new PartitionValue("12346")),
Arrays.asList(largeInt, bigInt));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case5
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("2014-12-12"), new PartitionValue("2014-12-12 10:00:00")),
Arrays.asList(date, datetime));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("2014-12-12"), new PartitionValue("2014-12-12 10:00:01")),
Arrays.asList(date, datetime));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case6
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("-128")),
Arrays.asList(tinyInt, smallInt));
pk2 = PartitionKey.createInfinityPartitionKey(Arrays.asList(tinyInt, smallInt), false);
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);

// case7
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127")),
Arrays.asList(tinyInt, smallInt));
pk2 = PartitionKey.createInfinityPartitionKey(Arrays.asList(tinyInt, smallInt), true);
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case7
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("127"), new PartitionValue("32767")),
Arrays.asList(tinyInt, smallInt));
pk2 = PartitionKey.createInfinityPartitionKey(Arrays.asList(tinyInt, smallInt), true);
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case8
Expand All @@ -134,6 +142,7 @@ public void compareTest() throws AnalysisException {
new PartitionValue("9999-12-31"), new PartitionValue("9999-12-31 23:59:59")),
allColumns);
pk2 = PartitionKey.createInfinityPartitionKey(allColumns, true);
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case9
Expand All @@ -143,6 +152,7 @@ public void compareTest() throws AnalysisException {
new PartitionValue("0000-01-01"), new PartitionValue("0000-01-01 00:00:00")),
allColumns);
pk2 = PartitionKey.createInfinityPartitionKey(allColumns, false);
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);

// case10
Expand All @@ -151,48 +161,55 @@ public void compareTest() throws AnalysisException {
new PartitionValue("0"), new PartitionValue("1970-01-01"), new PartitionValue("1970-01-01 00:00:00")),
allColumns);
pk2 = PartitionKey.createInfinityPartitionKey(allColumns, false);
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == 1);

// case11
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("beijing"), new PartitionValue("shanghai")),
Arrays.asList(charString, varchar));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("beijing"), new PartitionValue("shanghai")),
Arrays.asList(charString, varchar));
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);

// case12
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("beijing"), new PartitionValue("shanghai")),
Arrays.asList(charString, varchar));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("shijiazhuang"), new PartitionValue("tianjin")),
Arrays.asList(charString, varchar));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case13
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("beijing"), new PartitionValue("shanghai")),
Arrays.asList(charString, varchar));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("beijing"), new PartitionValue("tianjin")),
Arrays.asList(charString, varchar));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == -1);

// case14
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("true")),
Arrays.asList(bool));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("false")),
Arrays.asList(bool));
Assert.assertTrue(pk1.hashCode() != pk2.hashCode());
Assert.assertTrue(!pk1.equals(pk2) && pk1.compareTo(pk2) == 1);

// case15
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("true")),
Arrays.asList(bool));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("true")),
Arrays.asList(bool));
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);

// case16
pk1 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("false")),
Arrays.asList(bool));
pk2 = PartitionKey.createPartitionKey(Arrays.asList(new PartitionValue("false")),
Arrays.asList(bool));
Assert.assertTrue(pk1.hashCode() == pk2.hashCode());
Assert.assertTrue(pk1.equals(pk2) && pk1.compareTo(pk2) == 0);
}

Expand Down

0 comments on commit 8f4b7c8

Please sign in to comment.