Skip to content

Commit 9c71fe3

Browse files
committed
Annotate equals methods with Nullable in src/core/main
1 parent e315fbb commit 9c71fe3

File tree

109 files changed

+329
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+329
-125
lines changed

core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies {
5656
implementation("net.hydromatic:aggdesigner-algorithm")
5757
implementation("org.apache.commons:commons-dbcp2")
5858
implementation("org.apache.commons:commons-lang3")
59+
implementation("org.checkerframework:checker-qual")
5960
implementation("commons-io:commons-io")
6061
implementation("org.codehaus.janino:commons-compiler")
6162
implementation("org.codehaus.janino:janino")

core/src/main/java/org/apache/calcite/interpreter/Row.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
package org.apache.calcite.interpreter;
1818

19+
import org.checkerframework.checker.nullness.qual.Nullable;
20+
1921
import java.util.Arrays;
2022

2123
/**
@@ -64,7 +66,7 @@ public static Row of(Object...values) {
6466
return Arrays.hashCode(values);
6567
}
6668

67-
@Override public boolean equals(Object obj) {
69+
@Override public boolean equals(@Nullable Object obj) {
6870
return obj == this
6971
|| obj instanceof Row
7072
&& Arrays.equals(values, ((Row) obj).values);

core/src/main/java/org/apache/calcite/jdbc/JavaRecordType.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.apache.calcite.rel.type.RelDataTypeField;
2020
import org.apache.calcite.rel.type.RelRecordType;
2121

22+
import org.checkerframework.checker.nullness.qual.Nullable;
23+
2224
import java.util.List;
2325
import java.util.Objects;
2426

@@ -37,7 +39,7 @@ public JavaRecordType(List<RelDataTypeField> fields, Class clazz) {
3739
this.clazz = Objects.requireNonNull(clazz);
3840
}
3941

40-
@Override public boolean equals(Object obj) {
42+
@Override public boolean equals(@Nullable Object obj) {
4143
return this == obj
4244
|| obj instanceof JavaRecordType
4345
&& fieldList.equals(((JavaRecordType) obj).fieldList)

core/src/main/java/org/apache/calcite/materialize/Lattice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ public int compareTo(@Nonnull Measure measure) {
591591
return Objects.hash(agg, args);
592592
}
593593

594-
@Override public boolean equals(Object obj) {
594+
@Override public boolean equals(@Nullable Object obj) {
595595
return obj == this
596596
|| obj instanceof Measure
597597
&& this.agg.equals(((Measure) obj).agg)
@@ -664,7 +664,7 @@ public int compareTo(Column column) {
664664
return ordinal;
665665
}
666666

667-
@Override public boolean equals(Object obj) {
667+
@Override public boolean equals(@Nullable Object obj) {
668668
return obj == this
669669
|| obj instanceof Column
670670
&& this.ordinal == ((Column) obj).ordinal;

core/src/main/java/org/apache/calcite/materialize/LatticeSuggester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ public int hashCode() {
632632
return ordinalInQuery;
633633
}
634634

635-
public boolean equals(Object obj) {
635+
public boolean equals(@Nullable Object obj) {
636636
return this == obj
637637
|| obj instanceof TableRef
638638
&& ordinalInQuery == ((TableRef) obj).ordinalInQuery;
@@ -658,7 +658,7 @@ private static class StepRef extends DefaultEdge {
658658
return ordinalInQuery;
659659
}
660660

661-
@Override public boolean equals(Object obj) {
661+
@Override public boolean equals(@Nullable Object obj) {
662662
return this == obj
663663
|| obj instanceof StepRef
664664
&& ((StepRef) obj).ordinalInQuery == ordinalInQuery;

core/src/main/java/org/apache/calcite/materialize/LatticeTable.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.apache.calcite.rel.type.RelDataTypeField;
2121
import org.apache.calcite.util.Util;
2222

23+
import org.checkerframework.checker.nullness.qual.Nullable;
24+
2325
import java.util.Objects;
2426
import javax.annotation.Nonnull;
2527

@@ -37,7 +39,7 @@ public class LatticeTable {
3739
return t.getQualifiedName().hashCode();
3840
}
3941

40-
@Override public boolean equals(Object obj) {
42+
@Override public boolean equals(@Nullable Object obj) {
4143
return this == obj
4244
|| obj instanceof LatticeTable
4345
&& t.getQualifiedName().equals(

core/src/main/java/org/apache/calcite/materialize/MaterializationActor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import com.google.common.collect.HashMultimap;
2424
import com.google.common.collect.Multimap;
2525

26+
import org.checkerframework.checker.nullness.qual.Nullable;
27+
2628
import java.util.HashMap;
2729
import java.util.List;
2830
import java.util.Map;
@@ -97,7 +99,7 @@ static class QueryKey {
9799
this.path = path;
98100
}
99101

100-
@Override public boolean equals(Object obj) {
102+
@Override public boolean equals(@Nullable Object obj) {
101103
return obj == this
102104
|| obj instanceof QueryKey
103105
&& sql.equals(((QueryKey) obj).sql)

core/src/main/java/org/apache/calcite/materialize/MaterializationKey.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
package org.apache.calcite.materialize;
1818

19+
import org.checkerframework.checker.nullness.qual.Nullable;
20+
1921
import java.io.Serializable;
2022
import java.util.UUID;
2123

@@ -32,7 +34,7 @@ public class MaterializationKey implements Serializable {
3234
return uuid.hashCode();
3335
}
3436

35-
@Override public boolean equals(Object obj) {
37+
@Override public boolean equals(@Nullable Object obj) {
3638
return this == obj
3739
|| obj instanceof MaterializationKey
3840
&& uuid.equals(((MaterializationKey) obj).uuid);

core/src/main/java/org/apache/calcite/materialize/Path.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import com.google.common.collect.ImmutableList;
2020

21+
import org.checkerframework.checker.nullness.qual.Nullable;
22+
2123
import java.util.List;
2224

2325
/** A sequence of {@link Step}s from a root node (fact table) to another node
@@ -35,7 +37,7 @@ class Path {
3537
return id;
3638
}
3739

38-
@Override public boolean equals(Object obj) {
40+
@Override public boolean equals(@Nullable Object obj) {
3941
return this == obj
4042
|| obj instanceof Path
4143
&& id == ((Path) obj).id;

core/src/main/java/org/apache/calcite/materialize/Step.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import com.google.common.collect.ImmutableList;
2525
import com.google.common.collect.Ordering;
2626

27+
import org.checkerframework.checker.nullness.qual.Nullable;
28+
2729
import java.util.List;
2830
import java.util.Objects;
2931

@@ -68,7 +70,7 @@ static Step create(LatticeTable source, LatticeTable target,
6870
return Objects.hash(source, target, keys);
6971
}
7072

71-
@Override public boolean equals(Object obj) {
73+
@Override public boolean equals(@Nullable Object obj) {
7274
return this == obj
7375
|| obj instanceof Step
7476
&& ((Step) obj).source.equals(source)

0 commit comments

Comments
 (0)