-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
[HUDI-8215] Support composite compaction strategy #11963
Open
TheR1sing3un
wants to merge
3
commits into
apache:master
Choose a base branch
from
TheR1sing3un:feat_compaction_strategy_chain
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+144
−22
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 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 |
---|---|---|
|
@@ -146,7 +146,7 @@ public class HoodieCompactionConfig extends HoodieConfig { | |
.markAdvanced() | ||
.withDocumentation("Compaction strategy decides which file groups are picked up for " | ||
+ "compaction during each compaction run. By default. Hudi picks the log file " | ||
+ "with most accumulated unmerged data"); | ||
+ "with most accumulated unmerged data. Support composite strategy by providing, format: strategy_class_name1,strategy_class_name2,..."); | ||
|
||
public static final ConfigProperty<String> TARGET_PARTITIONS_PER_DAYBASED_COMPACTION = ConfigProperty | ||
.key("hoodie.compaction.daybased.target.partitions") | ||
|
@@ -408,8 +408,12 @@ public Builder approxRecordSize(int recordSizeEstimate) { | |
return this; | ||
} | ||
|
||
public Builder withCompactionStrategy(CompactionStrategy compactionStrategy) { | ||
compactionConfig.setValue(COMPACTION_STRATEGY, compactionStrategy.getClass().getName()); | ||
public Builder withCompactionStrategy(CompactionStrategy... compactionStrategies) { | ||
StringBuilder compactionStrategyBuilder = new StringBuilder(); | ||
for (CompactionStrategy compactionStrategy : compactionStrategies) { | ||
compactionStrategyBuilder.append(compactionStrategy.getClass().getName()).append(","); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we trim out the tailing |
||
} | ||
compactionConfig.setValue(COMPACTION_STRATEGY, compactionStrategyBuilder.toString()); | ||
return this; | ||
} | ||
|
||
|
This file contains 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 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 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
69 changes: 69 additions & 0 deletions
69
.../main/java/org/apache/hudi/table/action/compact/strategy/CompositeCompactionStrategy.java
This file contains 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.table.action.compact.strategy; | ||
|
||
import org.apache.hudi.avro.model.HoodieCompactionOperation; | ||
import org.apache.hudi.avro.model.HoodieCompactionPlan; | ||
import org.apache.hudi.config.HoodieWriteConfig; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* CompositeCompactionStrategy chains multiple compaction strategies together. | ||
* The order of the strategies in the chain is important as the output of one strategy is passed as input to the next. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we address that the compisition predicate is |
||
*/ | ||
public class CompositeCompactionStrategy extends CompactionStrategy { | ||
|
||
private List<CompactionStrategy> strategies; | ||
|
||
public CompositeCompactionStrategy(List<CompactionStrategy> strategies) { | ||
this.strategies = strategies; | ||
} | ||
|
||
@Override | ||
public List<HoodieCompactionOperation> orderAndFilter(HoodieWriteConfig writeConfig, List<HoodieCompactionOperation> operations, List<HoodieCompactionPlan> pendingCompactionPlans) { | ||
List<HoodieCompactionOperation> finalOperations = operations; | ||
for (CompactionStrategy strategy : strategies) { | ||
finalOperations = strategy.orderAndFilter(writeConfig, finalOperations, pendingCompactionPlans); | ||
} | ||
return finalOperations; | ||
} | ||
|
||
@Override | ||
public List<String> filterPartitionPaths(HoodieWriteConfig writeConfig, List<String> allPartitionPaths) { | ||
List<String> finalPartitionPaths = allPartitionPaths; | ||
for (CompactionStrategy strategy : strategies) { | ||
finalPartitionPaths = strategy.filterPartitionPaths(writeConfig, finalPartitionPaths); | ||
} | ||
return finalPartitionPaths; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
StringBuilder builder = new StringBuilder(); | ||
builder.append("CompactionStrategyChain ["); | ||
for (CompactionStrategy strategy : strategies) { | ||
builder.append(strategy.getClass()); | ||
builder.append(" ===> "); | ||
} | ||
builder.append("]"); | ||
return builder.toString(); | ||
} | ||
} |
This file contains 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 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 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.
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.
The strategy can be composed with multiple strategies by concatenating the class names with ','.