Revert "[HUDI-5244] Fix bugs in schema evolution client with lost ope…

…ration field and not found schema (apache#7248)" This reverts commit 4c21823.
trushev · Nov 21, 2022 · 0a6e2ca · 0a6e2ca
1 parent 4c21823
commit 0a6e2ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 114 deletions.
diff --git a/...client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java b/...client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java
@@ -280,7 +280,7 @@ private void saveInternalSchema(HoodieTable table, String instantTime, HoodieCom
     FileBasedInternalSchemaStorageManager schemasManager = new FileBasedInternalSchemaStorageManager(table.getMetaClient());
     if (!historySchemaStr.isEmpty() || Boolean.parseBoolean(config.getString(HoodieCommonConfig.RECONCILE_SCHEMA.key()))) {
       InternalSchema internalSchema;
-      Schema avroSchema = HoodieAvroUtils.createHoodieWriteSchema(config.getSchema(), config.allowOperationMetadataField());
+      Schema avroSchema = HoodieAvroUtils.createHoodieWriteSchema(new Schema.Parser().parse(config.getSchema()));
       if (historySchemaStr.isEmpty()) {
         internalSchema = AvroInternalSchemaConverter.convert(avroSchema);
         internalSchema.setSchemaId(Long.parseLong(instantTime));
@@ -1762,13 +1762,16 @@ public void reOrderColPosition(String colName, String referColName, TableChange.
   private Pair<InternalSchema, HoodieTableMetaClient> getInternalSchemaAndMetaClient() {
     HoodieTableMetaClient metaClient = createMetaClient(true);
     TableSchemaResolver schemaUtil = new TableSchemaResolver(metaClient);
-    return Pair.of(getInternalSchema(schemaUtil), metaClient);
+    Option<InternalSchema> internalSchemaOption = schemaUtil.getTableInternalSchemaFromCommitMetadata();
+    if (!internalSchemaOption.isPresent()) {
+      throw new HoodieException(String.format("cannot find schema for current table: %s", config.getBasePath()));
+    }
+    return Pair.of(internalSchemaOption.get(), metaClient);
   }
 
   private void commitTableChange(InternalSchema newSchema, HoodieTableMetaClient metaClient) {
     TableSchemaResolver schemaUtil = new TableSchemaResolver(metaClient);
-    String historySchemaStr = schemaUtil.getTableHistorySchemaStrFromCommitMetadata().orElseGet(
-        () -> SerDeHelper.inheritSchemas(getInternalSchema(schemaUtil), ""));
+    String historySchemaStr = schemaUtil.getTableHistorySchemaStrFromCommitMetadata().orElse("");
     Schema schema = AvroInternalSchemaConverter.convert(newSchema, config.getTableName());
     String commitActionType = CommitUtils.getCommitActionType(WriteOperationType.ALTER_SCHEMA, metaClient.getTableType());
     String instantTime = HoodieActiveTimeline.createNewInstantTime();
@@ -1790,14 +1793,4 @@ private void commitTableChange(InternalSchema newSchema, HoodieTableMetaClient m
     schemasManager.persistHistorySchemaStr(instantTime, SerDeHelper.inheritSchemas(newSchema, historySchemaStr));
     commitStats(instantTime, Collections.emptyList(), Option.of(extraMeta), commitActionType);
   }
-
-  private InternalSchema getInternalSchema(TableSchemaResolver schemaUtil) {
-    return schemaUtil.getTableInternalSchemaFromCommitMetadata().orElseGet(() -> {
-      try {
-        return AvroInternalSchemaConverter.convert(schemaUtil.getTableAvroSchema());
-      } catch (Exception e) {
-        throw new HoodieException(String.format("cannot find schema for current table: %s", config.getBasePath()));
-      }
-    });
-  }
 }
diff --git a/...a-client/src/test/java/org/apache/hudi/table/action/commit/TestSchemaEvolutionClient.java b/...a-client/src/test/java/org/apache/hudi/table/action/commit/TestSchemaEvolutionClient.java
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
@@ -184,10 +184,6 @@ public static Schema createHoodieWriteSchema(String originalSchema) {
     return createHoodieWriteSchema(new Schema.Parser().parse(originalSchema));
   }
 
-  public static Schema createHoodieWriteSchema(String originalSchema, boolean withOperationField) {
-    return addMetadataFields(new Schema.Parser().parse(originalSchema), withOperationField);
-  }
-
   /**
    * Adds the Hoodie metadata fields to the given schema.
    *