vinothchandar commented on a change in pull request #2311: URL: https://github.com/apache/hudi/pull/2311#discussion_r543976521
########## File path: hudi-common/src/main/java/org/apache/hudi/common/model/DefaultHoodieRecordPayload.java ########## @@ -0,0 +1,123 @@ +/* + * 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; +import java.util.Properties; + +/** + * 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 - Chooses the latest record based on ordering field value. + */ +public class DefaultHoodieRecordPayload extends BaseAvroPayload + implements HoodieRecordPayload<DefaultHoodieRecordPayload> { + + public DefaultHoodieRecordPayload(GenericRecord record, Comparable orderingVal) { + super(record, orderingVal); + } + + public DefaultHoodieRecordPayload(Option<GenericRecord> record) { + this(record.isPresent() ? record.get() : null, (record1) -> 0); // natural order + } + + @Override + public DefaultHoodieRecordPayload preCombine(DefaultHoodieRecordPayload another) { + // pick the payload with greatest ordering value + if (another.orderingVal.compareTo(orderingVal) > 0) { + return another; + } else { + return this; + } + } + + @Override + public Option<IndexedRecord> getInsertValue(Schema schema) throws IOException { + if (recordBytes.length == 0) { + return Option.empty(); + } + IndexedRecord indexedRecord = bytesToAvro(recordBytes, schema); + if (isDeleteRecord((GenericRecord) indexedRecord)) { + return Option.empty(); + } else { + return Option.of(indexedRecord); + } + } + + @Override + public Option<IndexedRecord> combineAndGetUpdateValue(IndexedRecord currentValue, Schema schema) throws IOException{ + return getInsertValue(schema); + } + + @Override + public Option<IndexedRecord> combineAndGetUpdateValue(IndexedRecord currentValue, Schema schema, Properties properties) throws IOException { + if (recordBytes.length == 0) { + return Option.empty(); + } + GenericRecord incomingRecord = bytesToAvro(recordBytes, schema); + /* + * Combining strategy here returns currentValue on disk if incoming record is older. + * The incoming record can be either a delete (sent as an upsert with _hoodie_is_deleted set to true) + * or an insert/update record. In any case, if it is older than the record in disk, the currentValue + * in disk is returned (to be rewritten with new commit time). + * + * NOTE: Deletes sent via EmptyHoodieRecordPayload and/or Delete operation type do not hit this code path + * and need to be dealt with separately. + */ + Object persistedOrderingVal = getNestedFieldVal((GenericRecord) currentValue, properties.getProperty(HoodiePayloadProps.PAYLOAD_ORDERING_FIELD_PROP), true); + Comparable incomingOrderingVal = (Comparable) getNestedFieldVal(incomingRecord, properties.getProperty(HoodiePayloadProps.PAYLOAD_ORDERING_FIELD_PROP), false); + + // Null check is needed here to support schema evolution. The record in storage may be from old schema where + // the new ordering column might not be present and hence returns null. + if (persistedOrderingVal != null && ((Comparable) persistedOrderingVal).compareTo(incomingOrderingVal) > 0) { Review comment: yes . nts = note to self. sorry :/ ---------------------------------------------------------------- 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: us...@infra.apache.org
