-
Notifications
You must be signed in to change notification settings - Fork 52
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
Initial draft for timestamping DLO generation and compaction. #182
Open
anjagruenheid
wants to merge
4
commits into
linkedin:main
Choose a base branch
from
anjagruenheid:timestamps
base: main
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.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
558eaba
Initial draft for timestamping DLO generation and compaction.
anjagruenheid 8136a0a
Merge main branch.
anjagruenheid b17bd5a
Merge branch 'main' into timestamps
anjagruenheid 7dcc3ba
Formalize compaction event for table properties.
anjagruenheid 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 |
---|---|---|
@@ -1,15 +1,21 @@ | ||
package com.linkedin.openhouse.jobs.spark; | ||
|
||
import com.google.gson.Gson; | ||
import com.google.gson.GsonBuilder; | ||
import com.google.gson.reflect.TypeToken; | ||
import com.linkedin.openhouse.datalayout.config.DataCompactionConfig; | ||
import com.linkedin.openhouse.jobs.spark.state.StateManager; | ||
import com.linkedin.openhouse.jobs.util.AppConstants; | ||
import com.linkedin.openhouse.jobs.util.CompactionEvent; | ||
import io.opentelemetry.api.common.AttributeKey; | ||
import io.opentelemetry.api.common.Attributes; | ||
import java.lang.reflect.Type; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.apache.commons.cli.CommandLine; | ||
import org.apache.commons.cli.Option; | ||
import org.apache.commons.lang.StringEscapeUtils; | ||
import org.apache.commons.lang3.math.NumberUtils; | ||
import org.apache.iceberg.actions.RewriteDataFiles; | ||
|
||
|
@@ -24,6 +30,7 @@ | |
@Slf4j | ||
public class DataCompactionSparkApp extends BaseTableSparkApp { | ||
private final DataCompactionConfig config; | ||
public static final String DATA_LAYOUT_COMPACTION_PROPERTY_KEY = "write.data-layout.compaction"; | ||
|
||
protected DataCompactionSparkApp( | ||
String jobId, StateManager stateManager, String fqtn, DataCompactionConfig config) { | ||
|
@@ -58,6 +65,23 @@ protected void runInner(Operations ops) { | |
fileGroupRewriteResult.rewrittenDataFilesCount(), | ||
fileGroupRewriteResult.rewrittenBytesCount()); | ||
} | ||
// Add compaction timestamp to table properties. | ||
CompactionEvent event = | ||
CompactionEvent.builder() | ||
.compactionTimestamp(System.currentTimeMillis()) | ||
.addedDataFilesCount(result.addedDataFilesCount()) | ||
.rewrittenDataFilesCount(result.rewrittenDataFilesCount()) | ||
.rewrittenBytesCount(result.rewrittenBytesCount()) | ||
.build(); | ||
Gson gson = new GsonBuilder().create(); | ||
Type type = new TypeToken<CompactionEvent>() {}.getType(); | ||
ops.spark() | ||
.sql( | ||
String.format( | ||
"ALTER TABLE %s SET TBLPROPERTIES ('%s' = '%s')", | ||
ops.getTable(fqtn), | ||
DATA_LAYOUT_COMPACTION_PROPERTY_KEY, | ||
StringEscapeUtils.escapeJava(gson.toJson(event, type)))); | ||
Comment on lines
+76
to
+84
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. 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. Hmm, but it's not related to the strategy, right? It's a compaction event. Should I push this functionality into a separate util? |
||
METER | ||
.counterBuilder(AppConstants.ADDED_DATA_FILE_COUNT) | ||
.build() | ||
|
14 changes: 14 additions & 0 deletions
14
apps/spark/src/main/java/com/linkedin/openhouse/jobs/util/CompactionEvent.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,14 @@ | ||
package com.linkedin.openhouse.jobs.util; | ||
|
||
import lombok.Builder; | ||
import lombok.Data; | ||
|
||
/** Compaction event to be logged as part of the table properties. */ | ||
@Data | ||
@Builder | ||
public class CompactionEvent { | ||
private final long compactionTimestamp; | ||
private final long addedDataFilesCount; | ||
private final long rewrittenDataFilesCount; | ||
private final long rewrittenBytesCount; | ||
} |
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.
@teamurko can you confirm if this will be run after all partitions are compacted in Table or after each partition is compacted in a Table?
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.
it will run after compaction is done on the whole table