the-other-tim-brown commented on code in PR #13334: URL: https://github.com/apache/hudi/pull/13334#discussion_r2109870659
########## hudi-common/src/main/java/org/apache/hudi/common/model/FirstValueAvroRecordMerger.java: ########## @@ -0,0 +1,47 @@ +/* + * 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.common.model; + +import org.apache.hudi.common.config.TypedProperties; + +import org.apache.avro.Schema; + +import java.io.IOException; + +public class FirstValueAvroRecordMerger extends EventTimeBasedAvroRecordMerger { Review Comment: It would be useful to copy over the explanation of the merging logic from `FirstValueAvroPayload` ########## hudi-common/src/main/java/org/apache/hudi/common/model/EventTimeBasedAvroRecordMerger.java: ########## @@ -0,0 +1,79 @@ +/* + * 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.common.model; + +import org.apache.hudi.common.config.TypedProperties; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.collection.Pair; + +import org.apache.avro.Schema; + +import java.io.IOException; + +import static org.apache.hudi.common.model.HoodieRecord.DEFAULT_ORDERING_VALUE; + +/** + * Implements the event time based merging for Avro records. + */ +public class EventTimeBasedAvroRecordMerger implements HoodieRecordMerger { + public static final EventTimeBasedAvroRecordMerger INSTANCE = new EventTimeBasedAvroRecordMerger(); + + @Override + public Option<Pair<HoodieRecord, Schema>> merge(HoodieRecord oldRecord, + Schema oldSchema, + HoodieRecord newRecord, + Schema newSchema, + TypedProperties props) throws IOException { + if (shouldKeepNewerRecord(oldRecord, newRecord, oldSchema, newSchema, props)) { + return Option.of(Pair.of(newRecord, newSchema)); + } + return Option.empty(); Review Comment: Shouldn't this return the old record? I thought empty option implied a delete ########## hudi-common/src/main/java/org/apache/hudi/common/model/PartialUpdateAvroMerger.java: ########## @@ -0,0 +1,103 @@ +/* + * 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.common.model; + +import org.apache.hudi.common.config.TypedProperties; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.ValidationUtils; +import org.apache.hudi.common.util.collection.Pair; + +import org.apache.avro.Schema; +import org.apache.avro.generic.GenericData; +import org.apache.avro.generic.GenericRecord; +import org.apache.avro.generic.IndexedRecord; + +import java.io.IOException; + +/** + * This is the merger that replaces PartialUpdateAvroPayload class. + */ +public class PartialUpdateAvroMerger extends EventTimeBasedAvroRecordMerger { + public static final PartialUpdateAvroMerger INSTANCE = new PartialUpdateAvroMerger(); + + @Override + public String getMergingStrategy() { + return HoodieRecordMerger.PARTIAL_UPDATE_MERGE_STRATEGY_UUID; + } + + @Override + public Option<Pair<HoodieRecord, Schema>> merge(HoodieRecord oldRecord, + Schema oldSchema, + HoodieRecord newRecord, + Schema newSchema, + TypedProperties props) throws IOException { + Comparable newOrderingVal = newRecord.getOrderingValue(newSchema, props); + Comparable oldOrderingVal = oldRecord.getOrderingValue(oldSchema, props); + HoodieRecord lowOrderRecord = oldRecord; + HoodieRecord highOrderRecord = newRecord; + Schema lowOrderSchema = oldSchema; + Schema highOrderSchema = newSchema; + + if (oldOrderingVal.compareTo(newOrderingVal) > 0) { + lowOrderRecord = newRecord; + lowOrderSchema = newSchema; + highOrderRecord = oldRecord; + highOrderSchema = oldSchema; + } + + if (lowOrderRecord.isDelete(lowOrderSchema, props) + || highOrderRecord.isDelete(highOrderSchema, props)) { + return Option.of(Pair.of(highOrderRecord, highOrderSchema)); + } else { + return Option.of(Pair.of( + mergeRecord(lowOrderRecord, lowOrderSchema, highOrderRecord, highOrderSchema), Review Comment: The existing `PartialUpdateAvro` has this special merger called `mergeDisorderRecordsWithMetadata` - is this no longer required? ########## hudi-common/src/main/java/org/apache/hudi/common/model/PartialUpdateAvroMerger.java: ########## @@ -0,0 +1,103 @@ +/* + * 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.common.model; + +import org.apache.hudi.common.config.TypedProperties; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.ValidationUtils; +import org.apache.hudi.common.util.collection.Pair; + +import org.apache.avro.Schema; +import org.apache.avro.generic.GenericData; +import org.apache.avro.generic.GenericRecord; +import org.apache.avro.generic.IndexedRecord; + +import java.io.IOException; + +/** + * This is the merger that replaces PartialUpdateAvroPayload class. + */ +public class PartialUpdateAvroMerger extends EventTimeBasedAvroRecordMerger { Review Comment: Similarly, let's add java doc for this class. If we delete the old code, we will lose all the context explaining the functionality. ########## hudi-common/src/main/java/org/apache/hudi/common/model/PartialUpdateAvroMerger.java: ########## @@ -0,0 +1,103 @@ +/* + * 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.common.model; + +import org.apache.hudi.common.config.TypedProperties; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.common.util.ValidationUtils; +import org.apache.hudi.common.util.collection.Pair; + +import org.apache.avro.Schema; +import org.apache.avro.generic.GenericData; +import org.apache.avro.generic.GenericRecord; +import org.apache.avro.generic.IndexedRecord; + +import java.io.IOException; + +/** + * This is the merger that replaces PartialUpdateAvroPayload class. + */ +public class PartialUpdateAvroMerger extends EventTimeBasedAvroRecordMerger { + public static final PartialUpdateAvroMerger INSTANCE = new PartialUpdateAvroMerger(); + + @Override + public String getMergingStrategy() { + return HoodieRecordMerger.PARTIAL_UPDATE_MERGE_STRATEGY_UUID; + } + + @Override + public Option<Pair<HoodieRecord, Schema>> merge(HoodieRecord oldRecord, + Schema oldSchema, + HoodieRecord newRecord, + Schema newSchema, + TypedProperties props) throws IOException { + Comparable newOrderingVal = newRecord.getOrderingValue(newSchema, props); + Comparable oldOrderingVal = oldRecord.getOrderingValue(oldSchema, props); + HoodieRecord lowOrderRecord = oldRecord; + HoodieRecord highOrderRecord = newRecord; + Schema lowOrderSchema = oldSchema; + Schema highOrderSchema = newSchema; + + if (oldOrderingVal.compareTo(newOrderingVal) > 0) { + lowOrderRecord = newRecord; + lowOrderSchema = newSchema; + highOrderRecord = oldRecord; + highOrderSchema = oldSchema; + } + + if (lowOrderRecord.isDelete(lowOrderSchema, props) + || highOrderRecord.isDelete(highOrderSchema, props)) { + return Option.of(Pair.of(highOrderRecord, highOrderSchema)); + } else { + return Option.of(Pair.of( + mergeRecord(lowOrderRecord, lowOrderSchema, highOrderRecord, highOrderSchema), + highOrderSchema)); + } + } + + HoodieRecord mergeRecord(HoodieRecord lowOrderRecord, + Schema lowOrderSchema, + HoodieRecord highOrderRecord, + Schema highOrderSchema) { + // Currently assume there is no schema evolution, solve it in HUDI-9253 + ValidationUtils.checkArgument( + lowOrderSchema.getFields().size() == highOrderSchema.getFields().size()); + return new HoodieAvroIndexedRecord(mergeIndexedRecord( + (IndexedRecord) lowOrderRecord.data, (IndexedRecord) highOrderRecord.data, highOrderSchema)); + } + + protected IndexedRecord mergeIndexedRecord(IndexedRecord lowOrderRecord, + IndexedRecord highOrderRecord, + Schema schema) { Review Comment: This implies the schema is the same between old and new records, is that guaranteed to be true? -- 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]
