[HUDI-1284] preCombine all HoodieRecords and update all fields according to orderingVal #2106
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * 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.avro.Schema; | ||
| import org.apache.avro.generic.GenericRecord; | ||
| import org.apache.avro.generic.IndexedRecord; | ||
| import org.apache.hudi.common.util.Option; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * subclass of OverwriteWithLatestAvroPayload. | ||
| * | ||
| * Extract the function precombine of UpdatePrecombineAvroPayload and combineAndGetUpdateValue of OverwriteNonDefaultsWithLatestAvroPayload. | ||
| * Which means When more than one HoodieRecord have the same HoodieKey, this function will combine all fields(which is not null) | ||
| * Before attempting to insert/upsert And when insert/upsert into storage. | ||
| */ | ||
| public class PartialAvroPayload extends UpdatePrecombineAvroPayload { | ||
| public PartialAvroPayload(GenericRecord record, Comparable orderingVal) { | ||
| super(record, orderingVal); | ||
| } | ||
|
|
||
| public PartialAvroPayload(Option<GenericRecord> record) { | ||
| super(record); | ||
| } | ||
|
|
||
| @Override | ||
| public Option<IndexedRecord> combineAndGetUpdateValue(IndexedRecord currentValue, Schema schema) throws IOException { | ||
| Option<IndexedRecord> recordOption = getInsertValue(schema); | ||
| if (!recordOption.isPresent()) { | ||
| return Option.empty(); | ||
| } | ||
|
|
||
| GenericRecord insertRecord = (GenericRecord) recordOption.get(); | ||
| GenericRecord currentRecord = (GenericRecord) currentValue; | ||
|
|
||
| if (isDeleteRecord(insertRecord)) { | ||
| return Option.empty(); | ||
| } else { | ||
| List<Schema.Field> fields = schema.getFields(); | ||
| fields.forEach(field -> { | ||
| Object value = insertRecord.get(field.name()); | ||
| Object defaultValue = field.defaultVal(); | ||
| if (!overwriteField(value, defaultValue)) { | ||
| currentRecord.put(field.name(), value); | ||
| } | ||
| }); | ||
| return Option.of(currentRecord); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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.avro.Schema; | ||
| import org.apache.avro.generic.GenericRecord; | ||
| import org.apache.hudi.avro.HoodieAvroUtils; | ||
| import org.apache.hudi.common.util.Option; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * subclass of OverwriteWithLatestAvroPayload. | ||
| * | ||
| * <ol> | ||
| * <li>preCombine - When more than one HoodieRecord have the same HoodieKey, this function combines all fields(which is not null) | ||
| * before attempting to insert/upsert. | ||
| * eg: 1) | ||
| * Before: | ||
| * id name age ts | ||
| * 1 Karl null 0.0 | ||
| * 1 null 18 0.0 | ||
| * After: | ||
| * id name age ts | ||
| * 1 Karl 18 0.0 | ||
| * </ol> | ||
| */ | ||
| public class UpdatePrecombineAvroPayload extends OverwriteWithLatestAvroPayload { | ||
| public UpdatePrecombineAvroPayload(GenericRecord record, Comparable orderingVal) { | ||
| super(record, orderingVal); | ||
| } | ||
|
|
||
| public UpdatePrecombineAvroPayload(Option<GenericRecord> record) { | ||
| super(record); | ||
| } | ||
|
|
||
| @Override | ||
| public OverwriteWithLatestAvroPayload preCombine(OverwriteWithLatestAvroPayload another, Schema schema) throws IOException { | ||
| // pick the payload with greatest ordering value and aggregate all the fields,choosing the | ||
| // value that is not null | ||
| GenericRecord thisValue = HoodieAvroUtils.bytesToAvro(this.recordBytes, schema); | ||
| GenericRecord anotherValue = HoodieAvroUtils.bytesToAvro(another.recordBytes, schema); | ||
| List<Schema.Field> fields = schema.getFields(); | ||
|
|
||
| if (another.orderingVal.compareTo(orderingVal) > 0) { | ||
| GenericRecord anotherRoc = combineAllFields(fields, anotherValue, thisValue); | ||
| another.recordBytes = HoodieAvroUtils.avroToBytes(anotherRoc); | ||
| return another; | ||
| } else { | ||
| GenericRecord thisRoc = combineAllFields(fields, thisValue, anotherValue); | ||
| this.recordBytes = HoodieAvroUtils.avroToBytes(thisRoc); | ||
| return this; | ||
| } | ||
| } | ||
|
|
||
| public GenericRecord combineAllFields(List<Schema.Field> fields, GenericRecord priorRec, GenericRecord secPriorRoc) { | ||
| for (int i = 0; i < fields.size(); i++) { | ||
| Object priorValue = priorRec.get(fields.get(i).name()); | ||
| Object secPriorValue = secPriorRoc.get(fields.get(i).name()); | ||
| Object defaultVal = fields.get(i).defaultVal(); | ||
| if (overwriteField(priorValue, defaultVal) && !overwriteField(secPriorValue, defaultVal)) { | ||
| priorRec.put(fields.get(i).name(), secPriorValue); | ||
| } | ||
| } | ||
| return priorRec; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.