You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2019/11/06 18:36:27 UTC
[incubator-iceberg] branch master updated: Fix EqualsGetClass error
(#611)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 77c822d Fix EqualsGetClass error (#611)
77c822d is described below
commit 77c822de728330e386f8a5a75a1b2143353aa425
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Wed Nov 6 19:36:18 2019 +0100
Fix EqualsGetClass error (#611)
---
api/src/main/java/org/apache/iceberg/PartitionField.java | 3 +--
api/src/main/java/org/apache/iceberg/PartitionSpec.java | 3 +--
.../main/java/org/apache/iceberg/transforms/Bucket.java | 3 +--
.../main/java/org/apache/iceberg/transforms/Identity.java | 3 +--
.../main/java/org/apache/iceberg/transforms/Truncate.java | 15 +++++----------
.../org/apache/iceberg/transforms/UnknownTransform.java | 4 +---
api/src/main/java/org/apache/iceberg/types/Types.java | 14 +++++++-------
.../java/org/apache/iceberg/util/CharSequenceWrapper.java | 3 +--
.../main/java/org/apache/iceberg/GenericManifestFile.java | 3 +--
core/src/main/java/org/apache/iceberg/MetricsModes.java | 9 ++++-----
core/src/main/java/org/apache/iceberg/PartitionData.java | 3 +--
core/src/main/java/org/apache/iceberg/TableMetadata.java | 3 +--
.../main/java/org/apache/iceberg/mapping/MappedField.java | 4 +---
.../java/org/apache/iceberg/mapping/MappedFields.java | 4 +---
core/src/main/java/org/apache/iceberg/util/Pair.java | 3 +--
.../java/org/apache/iceberg/util/StructLikeWrapper.java | 4 +---
.../main/java/org/apache/iceberg/data/GenericRecord.java | 4 +---
.../org/apache/iceberg/spark/source/PartitionKey.java | 3 +--
18 files changed, 31 insertions(+), 57 deletions(-)
diff --git a/api/src/main/java/org/apache/iceberg/PartitionField.java b/api/src/main/java/org/apache/iceberg/PartitionField.java
index ceb4db9..3964207 100644
--- a/api/src/main/java/org/apache/iceberg/PartitionField.java
+++ b/api/src/main/java/org/apache/iceberg/PartitionField.java
@@ -67,8 +67,7 @@ public class PartitionField implements Serializable {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof PartitionField)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java
index b936ad5..da51598 100644
--- a/api/src/main/java/org/apache/iceberg/PartitionSpec.java
+++ b/api/src/main/java/org/apache/iceberg/PartitionSpec.java
@@ -201,8 +201,7 @@ public class PartitionSpec implements Serializable {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof PartitionSpec)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java
index bc43537..76c7a30 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java
@@ -89,8 +89,7 @@ abstract class Bucket<T> implements Transform<T, Integer> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof Bucket)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/transforms/Identity.java b/api/src/main/java/org/apache/iceberg/transforms/Identity.java
index ef1037b..d11e345 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/Identity.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/Identity.java
@@ -108,8 +108,7 @@ class Identity<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof Identity)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
index 140fa5b..a502ff0 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
@@ -111,8 +111,7 @@ abstract class Truncate<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TruncateInteger)) {
return false;
}
@@ -177,8 +176,7 @@ abstract class Truncate<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TruncateLong)) {
return false;
}
@@ -260,8 +258,7 @@ abstract class Truncate<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TruncateString)) {
return false;
}
@@ -330,8 +327,7 @@ abstract class Truncate<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TruncateByteBuffer)) {
return false;
}
@@ -410,8 +406,7 @@ abstract class Truncate<T> implements Transform<T, T> {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TruncateDecimal)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/transforms/UnknownTransform.java b/api/src/main/java/org/apache/iceberg/transforms/UnknownTransform.java
index 21966d2..9c5c8da 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/UnknownTransform.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/UnknownTransform.java
@@ -73,9 +73,7 @@ public class UnknownTransform<S, T> implements Transform<S, T> {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
-
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof UnknownTransform)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java
index 9eca4db..af23f0e 100644
--- a/api/src/main/java/org/apache/iceberg/types/Types.java
+++ b/api/src/main/java/org/apache/iceberg/types/Types.java
@@ -247,7 +247,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof TimestampType)) {
return false;
}
@@ -326,7 +326,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof FixedType)) {
return false;
}
@@ -395,7 +395,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof DecimalType)) {
return false;
}
@@ -480,7 +480,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof NestedField)) {
return false;
}
@@ -581,7 +581,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof StructType)) {
return false;
}
@@ -716,7 +716,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof ListType)) {
return false;
}
@@ -834,7 +834,7 @@ public class Types {
public boolean equals(Object o) {
if (this == o) {
return true;
- } else if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof MapType)) {
return false;
}
diff --git a/api/src/main/java/org/apache/iceberg/util/CharSequenceWrapper.java b/api/src/main/java/org/apache/iceberg/util/CharSequenceWrapper.java
index 6ad3348..a8b9be5 100644
--- a/api/src/main/java/org/apache/iceberg/util/CharSequenceWrapper.java
+++ b/api/src/main/java/org/apache/iceberg/util/CharSequenceWrapper.java
@@ -49,8 +49,7 @@ public class CharSequenceWrapper implements CharSequence, Serializable {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof CharSequenceWrapper)) {
return false;
}
diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java
index d634488..5498121 100644
--- a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java
+++ b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java
@@ -282,8 +282,7 @@ public class GenericManifestFile
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof GenericManifestFile)) {
return false;
}
GenericManifestFile that = (GenericManifestFile) other;
diff --git a/core/src/main/java/org/apache/iceberg/MetricsModes.java b/core/src/main/java/org/apache/iceberg/MetricsModes.java
index 453d721..f5e98aa 100644
--- a/core/src/main/java/org/apache/iceberg/MetricsModes.java
+++ b/core/src/main/java/org/apache/iceberg/MetricsModes.java
@@ -112,14 +112,13 @@ public class MetricsModes {
}
@Override
- public boolean equals(Object obj) {
- if (this == obj) {
+ public boolean equals(Object other) {
+ if (this == other) {
return true;
- }
- if (obj == null || getClass() != obj.getClass()) {
+ } else if (!(other instanceof Truncate)) {
return false;
}
- Truncate truncate = (Truncate) obj;
+ Truncate truncate = (Truncate) other;
return length == truncate.length;
}
diff --git a/core/src/main/java/org/apache/iceberg/PartitionData.java b/core/src/main/java/org/apache/iceberg/PartitionData.java
index 43e047d..d708347 100644
--- a/core/src/main/java/org/apache/iceberg/PartitionData.java
+++ b/core/src/main/java/org/apache/iceberg/PartitionData.java
@@ -180,8 +180,7 @@ class PartitionData
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof PartitionData)) {
return false;
}
diff --git a/core/src/main/java/org/apache/iceberg/TableMetadata.java b/core/src/main/java/org/apache/iceberg/TableMetadata.java
index 9eb18c3..c388ee1 100644
--- a/core/src/main/java/org/apache/iceberg/TableMetadata.java
+++ b/core/src/main/java/org/apache/iceberg/TableMetadata.java
@@ -104,8 +104,7 @@ public class TableMetadata {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof SnapshotLogEntry)) {
return false;
}
SnapshotLogEntry that = (SnapshotLogEntry) other;
diff --git a/core/src/main/java/org/apache/iceberg/mapping/MappedField.java b/core/src/main/java/org/apache/iceberg/mapping/MappedField.java
index 8250fe9..94d5d7b 100644
--- a/core/src/main/java/org/apache/iceberg/mapping/MappedField.java
+++ b/core/src/main/java/org/apache/iceberg/mapping/MappedField.java
@@ -71,9 +71,7 @@ public class MappedField {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
-
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof MappedField)) {
return false;
}
diff --git a/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java b/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java
index a61582f..fa3e1d4 100644
--- a/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java
+++ b/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java
@@ -89,9 +89,7 @@ public class MappedFields {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
-
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof MappedFields)) {
return false;
}
diff --git a/core/src/main/java/org/apache/iceberg/util/Pair.java b/core/src/main/java/org/apache/iceberg/util/Pair.java
index 633e1a0..76a4317 100644
--- a/core/src/main/java/org/apache/iceberg/util/Pair.java
+++ b/core/src/main/java/org/apache/iceberg/util/Pair.java
@@ -119,8 +119,7 @@ public class Pair<X, Y> implements IndexedRecord, SpecificData.SchemaConstructab
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- if (getClass() != other.getClass()) {
+ } else if (!(other instanceof Pair)) {
return false;
}
Pair<?, ?> otherPair = (Pair<?, ?>) other;
diff --git a/core/src/main/java/org/apache/iceberg/util/StructLikeWrapper.java b/core/src/main/java/org/apache/iceberg/util/StructLikeWrapper.java
index fb2cdc2..95015bc 100644
--- a/core/src/main/java/org/apache/iceberg/util/StructLikeWrapper.java
+++ b/core/src/main/java/org/apache/iceberg/util/StructLikeWrapper.java
@@ -50,9 +50,7 @@ public class StructLikeWrapper {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
-
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof StructLikeWrapper)) {
return false;
}
diff --git a/data/src/main/java/org/apache/iceberg/data/GenericRecord.java b/data/src/main/java/org/apache/iceberg/data/GenericRecord.java
index f99f71b..e52e0b7 100644
--- a/data/src/main/java/org/apache/iceberg/data/GenericRecord.java
+++ b/data/src/main/java/org/apache/iceberg/data/GenericRecord.java
@@ -157,9 +157,7 @@ public class GenericRecord implements Record, StructLike {
public boolean equals(Object other) {
if (this == other) {
return true;
- }
-
- if (other == null || getClass() != other.getClass()) {
+ } else if (!(other instanceof GenericRecord)) {
return false;
}
diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java b/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java
index 0b521ee..87ddcd2 100644
--- a/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java
+++ b/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java
@@ -142,8 +142,7 @@ class PartitionKey implements StructLike {
public boolean equals(Object o) {
if (this == o) {
return true;
- }
- if (o == null || getClass() != o.getClass()) {
+ } else if (!(o instanceof PartitionKey)) {
return false;
}