Skip to content

Add operationMetrics to CommitInfoEntry in Delta Lake #24368

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.

Sign up for GitHub

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 1 commit into from
Dec 5, 2024
Merged

Add operationMetrics to CommitInfoEntry in Delta Lake #24368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3090,7 +3090,8 @@ private CommitInfoEntry getCommitInfoEntry(
"trino-" + nodeVersion + "-" + nodeId,
readVersion,
isolationLevel.getValue(),
Optional.of(isBlindAppend));
Optional.of(isBlindAppend),
ImmutableMap.of());
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...no-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/CommitInfoEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public record CommitInfoEntry(
String clusterId,
long readVersion,
String isolationLevel,
Optional<Boolean> isBlindAppend)
Optional<Boolean> isBlindAppend,
Map<String, String> operationMetrics)
{
public CommitInfoEntry
{
Expand All @@ -39,7 +40,7 @@ public record CommitInfoEntry(

public CommitInfoEntry withVersion(long version)
{
return new CommitInfoEntry(version, timestamp, userId, userName, operation, operationParameters, job, notebook, clusterId, readVersion, isolationLevel, isBlindAppend);
return new CommitInfoEntry(version, timestamp, userId, userName, operation, operationParameters, job, notebook, clusterId, readVersion, isolationLevel, isBlindAppend, operationMetrics);
}

public record Job(String jobId, String jobName, String runId, String jobOwnerId, String triggerType) {}
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointEntryIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,8 @@ private DeltaLakeTransactionLogEntry buildCommitInfoEntry(ConnectorSession sessi
commitInfo.getString("clusterId"),
commitInfo.getInt("readVersion"),
commitInfo.getString("isolationLevel"),
Optional.of(commitInfo.getBoolean("isBlindAppend")));
Optional.of(commitInfo.getBoolean("isBlindAppend")),
commitInfo.getMap(stringMap, "operationMetrics"));
log.debug("Result: %s", result);
return DeltaLakeTransactionLogEntry.commitInfoEntry(result);
}
Expand Down
56 changes: 28 additions & 28 deletions ...lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAlluxioCacheFileOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ public void testCacheFileOperations()
assertFileSystemAccesses(
"SELECT * FROM test_cache_file_operations",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 794))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 816))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000002.json"))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.newStream", "00000000000000000002.json"))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000003.json"))
.add(new CacheOperation("InputFile.newStream", "_last_checkpoint"))
.add(new CacheOperation("Alluxio.readCached", "key=p1/", 0, 220))
Expand All @@ -105,11 +105,11 @@ public void testCacheFileOperations()
assertFileSystemAccesses(
"SELECT * FROM test_cache_file_operations",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 794))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 816))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000002.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000003.json"))
.add(new CacheOperation("InputFile.newStream", "_last_checkpoint"))
Expand All @@ -122,19 +122,19 @@ public void testCacheFileOperations()
assertFileSystemAccesses(
"SELECT * FROM test_cache_file_operations",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 794))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 816))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000002.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000003.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000003.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000003.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000004.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000004.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000004.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000005.json", 0, 636))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000005.json", 0, 636))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000005.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000005.json", 0, 658))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000005.json", 0, 658))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000005.json", 0, 658))
.add(new CacheOperation("InputFile.newStream", "00000000000000000005.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000005.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000006.json"))
Expand All @@ -154,17 +154,17 @@ public void testCacheFileOperations()
assertFileSystemAccesses(
"SELECT * FROM test_cache_file_operations",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 794))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 816))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000001.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000002.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000002.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000003.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000003.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000003.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000004.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000004.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000004.json"))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000005.json", 0, 636))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000005.json", 0, 658))
.add(new CacheOperation("InputFile.length", "00000000000000000005.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000006.json"))
.add(new CacheOperation("InputFile.newStream", "_last_checkpoint"))
Expand Down Expand Up @@ -488,10 +488,10 @@ public void testCreateOrReplaceTable()

assertFileSystemAccesses("CREATE OR REPLACE TABLE test_create_or_replace (id VARCHAR, age INT)",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 799))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000000.json", 0, 799))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 821))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000000.json", 0, 821))
.add(new CacheOperation("InputFile.newStream", "00000000000000000000.json"))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000000.json", 0, 799))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000000.json", 0, 821))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("InputFile.exists", "00000000000000000001.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
Expand All @@ -515,9 +515,9 @@ public void testCreateOrReplaceTableAsSelect()
assertFileSystemAccesses(
"CREATE OR REPLACE TABLE test_create_or_replace_as_select AS SELECT 1 col_name",
ImmutableMultiset.<CacheOperation>builder()
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 1041))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000000.json", 0, 1041))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000000.json", 0, 1041))
.add(new CacheOperation("Alluxio.readCached", "00000000000000000000.json", 0, 1063))
.add(new CacheOperation("Alluxio.readExternalStream", "00000000000000000000.json", 0, 1063))
.add(new CacheOperation("Alluxio.writeCache", "00000000000000000000.json", 0, 1063))
.add(new CacheOperation("InputFile.newStream", "00000000000000000000.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000000.json"))
.add(new CacheOperation("InputFile.length", "00000000000000000001.json"))
Expand Down
Loading