[HUDI-4445] S3 Incremental source improvements #6176
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * 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.testutils; | ||
|
|
||
| import org.apache.hudi.avro.MercifulJsonConverter; | ||
| import org.apache.hudi.common.util.FileIOUtils; | ||
| import org.apache.hudi.common.util.Option; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.apache.avro.Schema; | ||
| import org.apache.avro.generic.IndexedRecord; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.Map; | ||
| import java.util.zip.Deflater; | ||
| import java.util.zip.DeflaterOutputStream; | ||
| import java.util.zip.InflaterInputStream; | ||
|
|
||
| /** | ||
| * Generic class for specific payload implementations to inherit from. | ||
| */ | ||
| public abstract class GenericTestPayload { | ||
|
|
||
| protected static final transient ObjectMapper OBJECT_MAPPER = new ObjectMapper(); | ||
| protected String partitionPath; | ||
| protected String rowKey; | ||
| protected byte[] jsonDataCompressed; | ||
| protected int dataSize; | ||
| protected boolean isDeleted; | ||
| protected Comparable orderingVal; | ||
|
|
||
| public GenericTestPayload(Option<String> jsonData, String rowKey, String partitionPath, String schemaStr, | ||
| Boolean isDeleted, Comparable orderingVal) throws IOException { | ||
| if (jsonData.isPresent()) { | ||
| this.jsonDataCompressed = compressData(jsonData.get()); | ||
| this.dataSize = jsonData.get().length(); | ||
| } | ||
| this.rowKey = rowKey; | ||
| this.partitionPath = partitionPath; | ||
| this.isDeleted = isDeleted; | ||
| this.orderingVal = orderingVal; | ||
| } | ||
|
|
||
| public GenericTestPayload(String jsonData, String rowKey, String partitionPath, String schemaStr) throws IOException { | ||
| this(Option.of(jsonData), rowKey, partitionPath, schemaStr, false, 0L); | ||
| } | ||
|
|
||
| public GenericTestPayload(String jsonData) throws IOException { | ||
| this.jsonDataCompressed = compressData(jsonData); | ||
| this.dataSize = jsonData.length(); | ||
| Map<String, Object> jsonRecordMap = OBJECT_MAPPER.readValue(jsonData, Map.class); | ||
| this.rowKey = jsonRecordMap.get("_row_key").toString(); | ||
| this.partitionPath = jsonRecordMap.get("time").toString().split("T")[0].replace("-", "/"); | ||
|
Member
There was a problem hiding this comment. i recall this logic has been refactored in the current |
||
| this.isDeleted = false; | ||
| } | ||
|
|
||
| public String getPartitionPath() { | ||
| return partitionPath; | ||
| } | ||
|
|
||
| public IndexedRecord getRecordToInsert(Schema schema) throws IOException { | ||
| MercifulJsonConverter jsonConverter = new MercifulJsonConverter(); | ||
| return jsonConverter.convert(getJsonData(), schema); | ||
| } | ||
|
|
||
| public String getRowKey() { | ||
| return rowKey; | ||
| } | ||
|
|
||
| public String getJsonData() throws IOException { | ||
| return unCompressData(jsonDataCompressed); | ||
| } | ||
|
|
||
| private byte[] compressData(String jsonData) throws IOException { | ||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| DeflaterOutputStream dos = new DeflaterOutputStream(baos, new Deflater(Deflater.BEST_COMPRESSION), true); | ||
| try { | ||
| dos.write(jsonData.getBytes()); | ||
| } finally { | ||
| dos.flush(); | ||
| dos.close(); | ||
|
Member
There was a problem hiding this comment. Will this close the ByteArrayOutputStream too? |
||
| } | ||
| return baos.toByteArray(); | ||
| } | ||
|
|
||
| private String unCompressData(byte[] data) throws IOException { | ||
| try (InflaterInputStream iis = new InflaterInputStream(new ByteArrayInputStream(data))) { | ||
| return FileIOUtils.readAsUTFString(iis, dataSize); | ||
| } | ||
| } | ||
| } | ||
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,53 @@ | ||
| package org.apache.hudi.common.testutils; | ||
|
|
||
| import org.apache.hudi.avro.MercifulJsonConverter; | ||
| import org.apache.hudi.common.model.HoodieRecordPayload; | ||
| import org.apache.hudi.common.util.Option; | ||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.avro.generic.IndexedRecord; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Test payload for S3 event here (https://docs.aws.amazon.com/AmazonS3/latest/userguide/notification-content-structure.html). | ||
| */ | ||
| public class S3EventTestPayload extends GenericTestPayload implements HoodieRecordPayload<S3EventTestPayload> { | ||
|
Member
There was a problem hiding this comment. I'd suggest just test with DefaultHoodieRecordPayload with a specific S3 event schema, instead of creating a new test payload, as we want to test as close as the real scenario. Besides, we don't couple payload with schema, as payload is just responsible for how to merge
Member
There was a problem hiding this comment. there is a lot of existing misused with the RawTripTestPayload see https://issues.apache.org/jira/browse/HUDI-6164 so you may want to decouple the improvement changes from payload changes. |
||
| public S3EventTestPayload(Option<String> jsonData, String rowKey, String partitionPath, String schemaStr, | ||
| Boolean isDeleted, Comparable orderingVal) throws IOException { | ||
| super(jsonData, rowKey, partitionPath, schemaStr, isDeleted, orderingVal); | ||
| } | ||
|
|
||
| public S3EventTestPayload(String jsonData, String rowKey, String partitionPath, String schemaStr) throws IOException { | ||
| this(Option.of(jsonData), rowKey, partitionPath, schemaStr, false, 0L); | ||
| } | ||
|
|
||
| public S3EventTestPayload(String jsonData) throws IOException { | ||
| super(jsonData); | ||
| } | ||
|
|
||
| public S3EventTestPayload preCombine(S3EventTestPayload oldValue) { | ||
| throw new UnsupportedOperationException("preCombine not implemented for S3EventTestPayload"); | ||
| } | ||
|
|
||
| @Override | ||
| public Option<IndexedRecord> combineAndGetUpdateValue(IndexedRecord oldRec, Schema schema) throws IOException { | ||
| throw new UnsupportedOperationException("combineAndGetUpdateValue not implemented for S3EventTestPayload"); | ||
| } | ||
|
|
||
| @Override | ||
| public Option<IndexedRecord> getInsertValue(Schema schema) throws IOException { | ||
| if (isDeleted) { | ||
| return Option.empty(); | ||
| } else { | ||
| MercifulJsonConverter jsonConverter = new MercifulJsonConverter(); | ||
| return Option.of(jsonConverter.convert(getJsonData(), schema)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Option<Map<String, String>> getMetadata() { | ||
| return Option.empty(); | ||
| } | ||
| } | ||
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.
Maybe rename to AbstractJsonTestPayload? It's essentially for json data right?