[HUDI-9527] Switch to HoodieFileGroupReader in HoodieTableMetadataUtil #13445
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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.avro; | ||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.avro.generic.IndexedRecord; | ||
|
|
||
| public class IndexedDeleteRecord implements IndexedRecord { | ||
| private final String[] metaFields; | ||
| private final IndexedRecord record; | ||
|
|
||
| public IndexedDeleteRecord(String recordKey, String partitionPath, IndexedRecord record) { | ||
| this.metaFields = new String[] { | ||
| null, | ||
| null, | ||
| recordKey, | ||
| partitionPath, | ||
| null | ||
| }; | ||
| this.record = record; | ||
| } | ||
|
|
||
| @Override | ||
| public void put(int i, Object v) { | ||
| throw new UnsupportedOperationException("IndexedDeleteRecord does not support put operation"); | ||
| } | ||
|
|
||
| @Override | ||
| public Object get(int i) { | ||
| if (i < metaFields.length) { | ||
| return metaFields[i]; | ||
| } | ||
| return record == null ? null : record.get(i); | ||
| } | ||
|
|
||
| @Override | ||
| public Schema getSchema() { | ||
| return record == null ? Schema.create(Schema.Type.NULL) : record.getSchema(); | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -24,10 +24,10 @@ | |
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.HoodieRecordMerger; | ||
| import org.apache.hudi.common.serialization.CustomSerializer; | ||
| import org.apache.hudi.common.table.HoodieTableConfig; | ||
| import org.apache.hudi.common.table.log.InstantRange; | ||
| import org.apache.hudi.common.table.read.BufferedRecord; | ||
| import org.apache.hudi.common.table.read.BufferedRecordSerializer; | ||
| import org.apache.hudi.common.table.read.FileGroupReaderSchemaHandler; | ||
| import org.apache.hudi.common.util.HoodieRecordSizeEstimator; | ||
| import org.apache.hudi.common.util.LocalAvroSchemaCache; | ||
|
|
@@ -192,7 +192,7 @@ public SizeEstimator<BufferedRecord<T>> getRecordSizeEstimator() { | |
| } | ||
|
|
||
| public CustomSerializer<BufferedRecord<T>> getRecordSerializer() { | ||
| return new BufferedRecordSerializer<>(); | ||
|
There was a problem hiding this comment. why this change? It seems not necessary based on the benchmark: #13408 (comment) |
||
| } | ||
|
|
||
| /** | ||
|
|
@@ -491,4 +491,12 @@ public Integer encodeAvroSchema(Schema schema) { | |
| protected Schema decodeAvroSchema(Object versionId) { | ||
| return this.localAvroSchemaCache.getSchema((Integer) versionId).orElse(null); | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the record is a delete operation. | ||
| * | ||
| * @param record The record to check. | ||
| * @return true if the record is a delete operation, false otherwise. | ||
| */ | ||
| public abstract boolean isDeleteOperation(T record); | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why remove this? The record should already been marked as
deletein this case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The spark row doesn't have an operation type field like the flink row data does. Now this will always use an internal row to represent the row.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you saying the records written to log data block from spark is always not a delete? This is not true as when the customized delete marker is there.
Can we return
HoodieInternalRowwithisDeleteset up in there?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When we read the data from the log block, it is not going to have an operation type set. We can determine it is a delete by inspecting the record for
_hoodie_is_deleteor by a field used to mark deletes or the merger will output an empty option to signal a delete in the case of custom mergers and payloads.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Returns a
InternalRowwith just record key and patition path set up there will lost the other payload fields, not sure if it works for cdc read scenarios(the deletes for retraction)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated the handling here to simply wrap the row if it is non-null so we can still detect it is a delete but otherwise do not modify it.