[hudi] 16/16: remove schemacheck for rewriteEvolutionRecordWithMetadata and address comments

[xushiyan]

This is an automated email from the ASF dual-hosted git repository.

xushiyan pushed a commit to branch rc3-patched-for-test
in repository https://gitbox.apache.org/repos/asf/hudi.git

commit 44d47b0013d6df631516050e2d7cdddeb7b43269
Author: xiarixiaoyao <mengtao0...@qq.com>
AuthorDate: Fri Apr 22 00:05:18 2022 +0800

    remove schemacheck for rewriteEvolutionRecordWithMetadata and address 
comments
---
 .../java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java   | 2 +-
 hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java
 
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java
index e964cfc9b3..04dd29c63c 100644
--- 
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java
+++ 
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java
@@ -117,7 +117,7 @@ public class HoodieMergeHelper<T extends 
HoodieRecordPayload> extends
           .convert(new InternalSchemaMerger(writeInternalSchema, querySchema, 
true, false, false).mergeSchema(), readSchema.getName());
       Schema writeSchemaFromFile = 
AvroInternalSchemaConverter.convert(writeInternalSchema, readSchema.getName());
       needToReWriteRecord = sameCols.size() != colNamesFromWriteSchema.size()
-              || 
SchemaCompatibility.checkReaderWriterCompatibility(writeSchemaFromFile, 
readSchema).getType() == 
org.apache.avro.SchemaCompatibility.SchemaCompatibilityType.COMPATIBLE;
+              || 
SchemaCompatibility.checkReaderWriterCompatibility(readSchema, 
writeSchemaFromFile).getType() == 
org.apache.avro.SchemaCompatibility.SchemaCompatibilityType.COMPATIBLE;
       if (needToReWriteRecord) {
         renameCols = 
InternalSchemaUtils.collectRenameCols(writeInternalSchema, querySchema);
       }
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 47be7117a7..f69d5683d1 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
@@ -413,10 +413,6 @@ public class HoodieAvroUtils {
     GenericRecord newRecord = 
HoodieAvroUtils.rewriteRecordWithNewSchema(genericRecord, newSchema, new 
HashMap<>());
     // do not preserve FILENAME_METADATA_FIELD
     newRecord.put(HoodieRecord.FILENAME_METADATA_FIELD_POS, fileName);
-    if (!GenericData.get().validate(newSchema, newRecord)) {
-      throw new SchemaCompatibilityException(
-          "Unable to validate the rewritten record " + genericRecord + " 
against schema " + newSchema);
-    }
     return newRecord;
   }