garyli1019 commented on a change in pull request #2311: URL: https://github.com/apache/hudi/pull/2311#discussion_r539130578
########## File path: hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayloadV1.java ########## @@ -0,0 +1,120 @@ +/* + * 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 static org.apache.hudi.avro.HoodieAvroUtils.bytesToAvro; +import static org.apache.hudi.avro.HoodieAvroUtils.getNestedFieldVal; + +import java.util.Collections; +import java.util.Map; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.Schema; +import org.apache.avro.generic.GenericRecord; +import org.apache.avro.generic.IndexedRecord; + +import java.io.IOException; + +/** + * Default payload used for delta streamer. + * <p> + * 1. preCombine - Picks the latest delta record for a key, based on an ordering field 2. + * combineAndGetUpdateValue/getInsertValue - Simply overwrites storage with latest delta record + */ +public class OverwriteWithLatestAvroPayloadV1 extends BaseAvroPayload + implements HoodieRecordPayload<OverwriteWithLatestAvroPayloadV1> { + + private Map<String, String> props; Review comment: should we use a string to save storage? Looks like this will create a map for every record. ########## File path: hudi-spark/src/main/scala/org/apache/hudi/DataSourceOptions.scala ########## @@ -205,6 +205,12 @@ object DataSourceWriteOptions { val PRECOMBINE_FIELD_OPT_KEY = "hoodie.datasource.write.precombine.field" val DEFAULT_PRECOMBINE_FIELD_OPT_VAL = "ts" + /** + * Field when set to true, will honor ordering while merging two records. If not, incoming record will overwrite + * record in storage. + */ + val HONOR_ORDERING_WHILE_MERGING_OPT_KEY = "hoodie.datasource.honor.ordering.while.merging" + val DEFAULT_HONOR_ORDERING_WHILE_MERGING_OPT_VAL = "false" Review comment: keep this `true` is more rational for me. From a new user perspective, I don't really understand the difference between `preCombine` and `combineWithLatestValue`. It took me a while to figure this out and originally I thought this is a bug. But we need to think about the impact of the existing user. ########## File path: hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java ########## @@ -121,6 +121,10 @@ private static final String MERGE_DATA_VALIDATION_CHECK_ENABLED = "hoodie.merge.data.validation.enabled"; private static final String DEFAULT_MERGE_DATA_VALIDATION_CHECK_ENABLED = "false"; + // payload ordering field + private static final String PAYLOAD_ORDERING_FIELD_PROP = "hoodie.payload.ordering.field"; Review comment: Is there any reason we need a different config from the pre-combine field? IIUC we wanna make the merging logic consistent, so `preCombine` and `combineAndGetUpdateValue` should produce the same result? ########## File path: hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayloadV1.java ########## @@ -0,0 +1,120 @@ +/* + * 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 static org.apache.hudi.avro.HoodieAvroUtils.bytesToAvro; +import static org.apache.hudi.avro.HoodieAvroUtils.getNestedFieldVal; + +import java.util.Collections; +import java.util.Map; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.Schema; +import org.apache.avro.generic.GenericRecord; +import org.apache.avro.generic.IndexedRecord; + +import java.io.IOException; + +/** + * Default payload used for delta streamer. + * <p> + * 1. preCombine - Picks the latest delta record for a key, based on an ordering field 2. + * combineAndGetUpdateValue/getInsertValue - Simply overwrites storage with latest delta record + */ +public class OverwriteWithLatestAvroPayloadV1 extends BaseAvroPayload Review comment: naming is hard... how about `CombineWithLargestOrderingValPayload`? ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
