nsivabalan commented on code in PR #8978: URL: https://github.com/apache/hudi/pull/8978#discussion_r1242926341
########## hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/FlinkDeletePreppedCommitActionExecutor.java: ########## @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.table.action.commit; + +import org.apache.hudi.client.WriteStatus; +import org.apache.hudi.common.engine.HoodieEngineContext; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.WriteOperationType; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.io.HoodieWriteHandle; +import org.apache.hudi.table.HoodieTable; +import org.apache.hudi.table.action.HoodieWriteMetadata; + +import java.util.List; + +/** + * Flink upsert prepped commit action executor. + */ +public class FlinkDeletePreppedCommitActionExecutor<T> extends BaseFlinkCommitActionExecutor<T> { + + private final List<HoodieRecord<T>> preppedRecords; + + public FlinkDeletePreppedCommitActionExecutor(HoodieEngineContext context, Review Comment: Can you file a ticket or adding tests for delete prepped for flink. for spark, lets add tests in this patch only. ########## hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/HoodieSparkMergeOnReadTable.java: ########## @@ -105,6 +106,11 @@ public HoodieWriteMetadata<HoodieData<WriteStatus>> delete(HoodieEngineContext c return new SparkDeleteDeltaCommitActionExecutor<>((HoodieSparkEngineContext) context, config, this, instantTime, keys).execute(); } + @Override + public HoodieWriteMetadata<HoodieData<WriteStatus>> deletePrepped(HoodieEngineContext context, String instantTime, HoodieData<HoodieRecord<T>> preppedRecords) { Review Comment: my bad. thanks ########## hudi-spark-datasource/hudi-spark-common/src/main/java/org/apache/hudi/HoodieSparkRecordMerger.java: ########## @@ -41,13 +42,30 @@ public Option<Pair<HoodieRecord, Schema>> merge(HoodieRecord older, Schema oldSc ValidationUtils.checkArgument(older.getRecordType() == HoodieRecordType.SPARK); ValidationUtils.checkArgument(newer.getRecordType() == HoodieRecordType.SPARK); - if (newer.getData() == null) { - // Delete record - return Option.empty(); + if (newer instanceof HoodieSparkRecord) { + HoodieSparkRecord newSparkRecord = (HoodieSparkRecord) newer; + if (newSparkRecord.isDeleted()) { + // Delete record + return Option.empty(); + } + } else { + if (newer.getData() == null) { Review Comment: we need to understand whats going on in that test ########## hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkRDDWriteClient.java: ########## @@ -247,6 +247,15 @@ public JavaRDD<WriteStatus> delete(JavaRDD<HoodieKey> keys, String instantTime) return postWrite(resultRDD, instantTime, table); } + @Override + public JavaRDD<WriteStatus> deletePrepped(JavaRDD<HoodieRecord<T>> preppedRecord, String instantTime) { Review Comment: we might need to add tests for this ########## hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala: ########## @@ -349,9 +366,9 @@ object HoodieSparkSqlWriter { // Remove meta columns from writerSchema if isPrepped is true. val isPrepped = hoodieConfig.getBooleanOrDefault(DATASOURCE_WRITE_PREPPED_KEY, false) val processedDataSchema = if (isPrepped) { - HoodieAvroUtils.removeMetadataFields(writerSchema); + HoodieAvroUtils.removeMetadataFields(writerSchema) Review Comment: guess this has to be ``` HoodieAvroUtils.removeMetadataFields(dataFileSchema) ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
