-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-1477] Support CopyOnWriteTable in java client #2382
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
41 changes: 41 additions & 0 deletions
41
...n/java/org/apache/hudi/execution/bulkinsert/JavaBulkInsertInternalPartitionerFactory.java
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,41 @@ | ||
| /* | ||
| * 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.execution.bulkinsert; | ||
|
|
||
| import org.apache.hudi.exception.HoodieException; | ||
| import org.apache.hudi.table.BulkInsertPartitioner; | ||
|
|
||
| /** | ||
| * A factory to generate built-in partitioner to repartition input records into at least | ||
| * expected number of output spark partitions for bulk insert operation. | ||
| */ | ||
| public abstract class JavaBulkInsertInternalPartitionerFactory { | ||
|
|
||
| public static BulkInsertPartitioner get(BulkInsertSortMode sortMode) { | ||
| switch (sortMode) { | ||
| case NONE: | ||
| return new JavaNonSortPartitioner(); | ||
| case GLOBAL_SORT: | ||
| return new JavaGlobalSortPartitioner(); | ||
| default: | ||
| throw new HoodieException("The bulk insert sort mode \"" + sortMode.name() | ||
| + "\" is not supported in java client."); | ||
| } | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
...-client/src/main/java/org/apache/hudi/execution/bulkinsert/JavaGlobalSortPartitioner.java
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,67 @@ | ||
| /* | ||
| * 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.execution.bulkinsert; | ||
|
|
||
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.HoodieRecordPayload; | ||
| import org.apache.hudi.table.BulkInsertPartitioner; | ||
|
|
||
| import java.util.Comparator; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A built-in partitioner that does global sorting for the input records across partitions | ||
| * after repartition for bulk insert operation, corresponding to the | ||
| * {@code BulkInsertSortMode.GLOBAL_SORT} mode. | ||
| * | ||
| * @param <T> HoodieRecordPayload type | ||
| */ | ||
| public class JavaGlobalSortPartitioner<T extends HoodieRecordPayload> | ||
| implements BulkInsertPartitioner<List<HoodieRecord<T>>> { | ||
|
|
||
| @Override | ||
| public List<HoodieRecord<T>> repartitionRecords(List<HoodieRecord<T>> records, | ||
| int outputSparkPartitions) { | ||
| // Now, sort the records and line them up nicely for loading. | ||
| records.sort(new Comparator() { | ||
| @Override | ||
| public int compare(Object o1, Object o2) { | ||
| HoodieRecord o11 = (HoodieRecord) o1; | ||
| HoodieRecord o22 = (HoodieRecord) o2; | ||
| String left = new StringBuilder() | ||
| .append(o11.getPartitionPath()) | ||
| .append("+") | ||
| .append(o11.getRecordKey()) | ||
| .toString(); | ||
| String right = new StringBuilder() | ||
| .append(o22.getPartitionPath()) | ||
| .append("+") | ||
| .append(o22.getRecordKey()) | ||
| .toString(); | ||
| return left.compareTo(right); | ||
| } | ||
| }); | ||
| return records; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean arePartitionRecordsSorted() { | ||
| return true; | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
...ava-client/src/main/java/org/apache/hudi/execution/bulkinsert/JavaNonSortPartitioner.java
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,46 @@ | ||
| /* | ||
| * 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.execution.bulkinsert; | ||
|
|
||
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.HoodieRecordPayload; | ||
| import org.apache.hudi.table.BulkInsertPartitioner; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A built-in partitioner that only does coalesce for input records for bulk insert operation, | ||
| * corresponding to the {@code BulkInsertSortMode.NONE} mode. | ||
| * | ||
| * @param <T> HoodieRecordPayload type | ||
| */ | ||
| public class JavaNonSortPartitioner<T extends HoodieRecordPayload> | ||
| implements BulkInsertPartitioner<List<HoodieRecord<T>>> { | ||
|
|
||
| @Override | ||
| public List<HoodieRecord<T>> repartitionRecords(List<HoodieRecord<T>> records, | ||
| int outputPartitions) { | ||
| return records; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean arePartitionRecordsSorted() { | ||
| return false; | ||
| } | ||
| } |
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
67 changes: 67 additions & 0 deletions
67
...src/main/java/org/apache/hudi/table/action/commit/JavaBulkInsertCommitActionExecutor.java
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,67 @@ | ||
| /* | ||
| * 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.table.action.commit; | ||
|
|
||
| import org.apache.hudi.client.WriteStatus; | ||
| import org.apache.hudi.client.common.HoodieJavaEngineContext; | ||
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.HoodieRecordPayload; | ||
| import org.apache.hudi.common.model.WriteOperationType; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.config.HoodieWriteConfig; | ||
| import org.apache.hudi.exception.HoodieInsertException; | ||
| import org.apache.hudi.table.BulkInsertPartitioner; | ||
| import org.apache.hudi.table.HoodieTable; | ||
| import org.apache.hudi.table.action.HoodieWriteMetadata; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public class JavaBulkInsertCommitActionExecutor<T extends HoodieRecordPayload<T>> extends BaseJavaCommitActionExecutor<T> { | ||
|
|
||
| private final List<HoodieRecord<T>> inputRecords; | ||
| private final Option<BulkInsertPartitioner<List<HoodieRecord<T>>>> bulkInsertPartitioner; | ||
|
|
||
| public JavaBulkInsertCommitActionExecutor(HoodieJavaEngineContext context, HoodieWriteConfig config, HoodieTable table, | ||
| String instantTime, List<HoodieRecord<T>> inputRecords, | ||
| Option<BulkInsertPartitioner<List<HoodieRecord<T>>>> bulkInsertPartitioner) { | ||
| this(context, config, table, instantTime, inputRecords, bulkInsertPartitioner, Option.empty()); | ||
| } | ||
|
|
||
| public JavaBulkInsertCommitActionExecutor(HoodieJavaEngineContext context, HoodieWriteConfig config, HoodieTable table, | ||
| String instantTime, List<HoodieRecord<T>> inputRecords, | ||
| Option<BulkInsertPartitioner<List<HoodieRecord<T>>>> bulkInsertPartitioner, | ||
| Option<Map<String, String>> extraMetadata) { | ||
| super(context, config, table, instantTime, WriteOperationType.BULK_INSERT, extraMetadata); | ||
| this.inputRecords = inputRecords; | ||
| this.bulkInsertPartitioner = bulkInsertPartitioner; | ||
| } | ||
|
|
||
| @Override | ||
| public HoodieWriteMetadata<List<WriteStatus>> execute() { | ||
| try { | ||
| return JavaBulkInsertHelper.newInstance().bulkInsert(inputRecords, instantTime, table, config, | ||
| this, true, bulkInsertPartitioner); | ||
| } catch (HoodieInsertException ie) { | ||
| throw ie; | ||
| } catch (Throwable e) { | ||
| throw new HoodieInsertException("Failed to bulk insert for commit time " + instantTime, e); | ||
| } | ||
| } | ||
| } |
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.
do not need this dependency?