This is an automated email from the ASF dual-hosted git repository.
vinoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new d4d4c8c [MINOR] Fix typo and others (#2164)
d4d4c8c is described below
commit d4d4c8c8994d4da988005b7930b797213aed4303
Author: dugenkui <[email protected]>
AuthorDate: Mon Oct 12 08:52:44 2020 +0800
[MINOR] Fix typo and others (#2164)
* remove HoodieSerializationException that will never be throw
* remove unused method, make HoodieException more readable
* fix typo
---
.../src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java | 4 ++--
.../org/apache/hudi/common/table/log/HoodieLogFileReader.java | 2 +-
.../main/java/org/apache/hudi/common/util/SerializationUtils.java | 3 ---
.../src/main/java/org/apache/hudi/exception/HoodieException.java | 8 --------
...patabilityException.java => SchemaCompatibilityException.java} | 8 ++++----
.../src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java | 4 ++--
6 files changed, 9 insertions(+), 20 deletions(-)
diff --git
a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java
b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java
index 422d75c..a7517a4 100644
--- a/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java
+++ b/hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java
@@ -23,7 +23,7 @@ import org.apache.hudi.common.util.StringUtils;
import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.exception.HoodieException;
import org.apache.hudi.exception.HoodieIOException;
-import org.apache.hudi.exception.SchemaCompatabilityException;
+import org.apache.hudi.exception.SchemaCompatibilityException;
import org.apache.avro.Conversions.DecimalConversion;
import org.apache.avro.JsonProperties;
@@ -321,7 +321,7 @@ public class HoodieAvroUtils {
}
}
if (!GenericData.get().validate(newSchema, newRecord)) {
- throw new SchemaCompatabilityException(
+ throw new SchemaCompatibilityException(
"Unable to validate the rewritten record " + record + " against
schema " + newSchema);
}
return newRecord;
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java
b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java
index 5d2e185..27884ec 100644
---
a/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java
+++
b/hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFileReader.java
@@ -319,7 +319,7 @@ public class HoodieLogFileReader implements
HoodieLogFormat.Reader {
boolean hasMagic = hasNextMagic();
if (!hasMagic) {
throw new CorruptedLogFileException(
- logFile + "could not be read. Did not find the magic bytes at the
start of the block");
+ logFile + " could not be read. Did not find the magic bytes at the
start of the block");
}
return hasMagic;
} catch (EOFException e) {
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/util/SerializationUtils.java
b/hudi-common/src/main/java/org/apache/hudi/common/util/SerializationUtils.java
index 9d075bb..9041db5 100644
---
a/hudi-common/src/main/java/org/apache/hudi/common/util/SerializationUtils.java
+++
b/hudi-common/src/main/java/org/apache/hudi/common/util/SerializationUtils.java
@@ -18,8 +18,6 @@
package org.apache.hudi.common.util;
-import org.apache.hudi.exception.HoodieSerializationException;
-
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
@@ -72,7 +70,6 @@ public class SerializationUtils {
* @param objectData the serialized object, must not be null
* @return the deserialized object
* @throws IllegalArgumentException if {@code objectData} is {@code null}
- * @throws HoodieSerializationException (runtime) if the serialization fails
*/
public static <T> T deserialize(final byte[] objectData) {
if (objectData == null) {
diff --git
a/hudi-common/src/main/java/org/apache/hudi/exception/HoodieException.java
b/hudi-common/src/main/java/org/apache/hudi/exception/HoodieException.java
index 2b86dc6..58adc0e 100644
--- a/hudi-common/src/main/java/org/apache/hudi/exception/HoodieException.java
+++ b/hudi-common/src/main/java/org/apache/hudi/exception/HoodieException.java
@@ -47,12 +47,4 @@ public class HoodieException extends RuntimeException
implements Serializable {
super(t);
}
- protected static String format(String message, Object... args) {
- String[] argStrings = new String[args.length];
- for (int i = 0; i < args.length; i += 1) {
- argStrings[i] = String.valueOf(args[i]);
- }
- return String.format(String.valueOf(message), (Object[]) argStrings);
- }
-
}
diff --git
a/hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatabilityException.java
b/hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatibilityException.java
similarity index 80%
rename from
hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatabilityException.java
rename to
hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatibilityException.java
index a6225d5..478ec0d 100644
---
a/hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatabilityException.java
+++
b/hudi-common/src/main/java/org/apache/hudi/exception/SchemaCompatibilityException.java
@@ -21,17 +21,17 @@ package org.apache.hudi.exception;
/**
* An exception thrown when schema has compatibility problems.
*/
-public class SchemaCompatabilityException extends HoodieException {
+public class SchemaCompatibilityException extends HoodieException {
- public SchemaCompatabilityException(String message) {
+ public SchemaCompatibilityException(String message) {
super(message);
}
- public SchemaCompatabilityException(String message, Throwable t) {
+ public SchemaCompatibilityException(String message, Throwable t) {
super(message, t);
}
- public SchemaCompatabilityException(Throwable t) {
+ public SchemaCompatibilityException(Throwable t) {
super(t);
}
}
diff --git
a/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java
b/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java
index 7d5cf04..f6854ca 100644
--- a/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java
+++ b/hudi-common/src/test/java/org/apache/hudi/avro/TestHoodieAvroUtils.java
@@ -20,7 +20,7 @@ package org.apache.hudi.avro;
import org.apache.avro.JsonProperties;
import org.apache.hudi.common.model.HoodieRecord;
-import org.apache.hudi.exception.SchemaCompatabilityException;
+import org.apache.hudi.exception.SchemaCompatibilityException;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
@@ -147,7 +147,7 @@ public class TestHoodieAvroUtils {
rec.put("non_pii_col", "val1");
rec.put("pii_col", "val2");
rec.put("timestamp", 3.5);
- assertThrows(SchemaCompatabilityException.class, () ->
HoodieAvroUtils.rewriteRecord(rec, new
Schema.Parser().parse(SCHEMA_WITH_NON_NULLABLE_FIELD)));
+ assertThrows(SchemaCompatibilityException.class, () ->
HoodieAvroUtils.rewriteRecord(rec, new
Schema.Parser().parse(SCHEMA_WITH_NON_NULLABLE_FIELD)));
}
@Test
