From 794069548913f2218c3af417c7356e1c5e0047b8 Mon Sep 17 00:00:00 2001 From: smdsbz Date: Mon, 20 Jan 2025 14:29:17 +0800 Subject: [PATCH] refine CommitMessage toString --- .../org/apache/paimon/io/CompactIncrement.java | 14 ++++---------- .../java/org/apache/paimon/io/DataIncrement.java | 9 ++++----- .../java/org/apache/paimon/io/IndexIncrement.java | 13 +++++++------ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/paimon-core/src/main/java/org/apache/paimon/io/CompactIncrement.java b/paimon-core/src/main/java/org/apache/paimon/io/CompactIncrement.java index 23f64b5cd2f1..ad51642a2a4b 100644 --- a/paimon-core/src/main/java/org/apache/paimon/io/CompactIncrement.java +++ b/paimon-core/src/main/java/org/apache/paimon/io/CompactIncrement.java @@ -78,16 +78,10 @@ public int hashCode() { @Override public String toString() { return String.format( - "CompactIncrement {compactBefore = [\n%s\n], compactAfter = [\n%s\n], changelogFiles = [\n%s\n]}", - compactBefore.stream() - .map(DataFileMeta::fileName) - .collect(Collectors.joining(",\n")), - compactAfter.stream() - .map(DataFileMeta::fileName) - .collect(Collectors.joining(",\n")), - changelogFiles.stream() - .map(DataFileMeta::fileName) - .collect(Collectors.joining(",\n"))); + "CompactIncrement {compactBefore = %s, compactAfter = %s, changelogFiles = %s}", + compactBefore.stream().map(DataFileMeta::fileName).collect(Collectors.toList()), + compactAfter.stream().map(DataFileMeta::fileName).collect(Collectors.toList()), + changelogFiles.stream().map(DataFileMeta::fileName).collect(Collectors.toList())); } public static CompactIncrement emptyIncrement() { diff --git a/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java b/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java index f343940dfe0c..b7860fb15e79 100644 --- a/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java +++ b/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java @@ -82,10 +82,9 @@ public int hashCode() { @Override public String toString() { return String.format( - "NewFilesIncrement {newFiles = [\n%s\n], changelogFiles = [\n%s\n]}", - newFiles.stream().map(DataFileMeta::fileName).collect(Collectors.joining(",\n")), - changelogFiles.stream() - .map(DataFileMeta::fileName) - .collect(Collectors.joining(",\n"))); + "DataIncrement {newFiles = %s, deletedFiles = %s, changelogFiles = %s}", + newFiles.stream().map(DataFileMeta::fileName).collect(Collectors.toList()), + deletedFiles.stream().map(DataFileMeta::fileName).collect(Collectors.toList()), + changelogFiles.stream().map(DataFileMeta::fileName).collect(Collectors.toList())); } } diff --git a/paimon-core/src/main/java/org/apache/paimon/io/IndexIncrement.java b/paimon-core/src/main/java/org/apache/paimon/io/IndexIncrement.java index 8e53adfbfc4a..9f985f54ed41 100644 --- a/paimon-core/src/main/java/org/apache/paimon/io/IndexIncrement.java +++ b/paimon-core/src/main/java/org/apache/paimon/io/IndexIncrement.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** Incremental index files. */ public class IndexIncrement { @@ -77,11 +78,11 @@ public int hashCode() { @Override public String toString() { - return "IndexIncrement{" - + "newIndexFiles=" - + newIndexFiles - + ",deletedIndexFiles=" - + deletedIndexFiles - + "}"; + return String.format( + "IndexIncrement {newIndexFiles = %s, deletedIndexFiles = %s}", + newIndexFiles.stream().map(IndexFileMeta::fileName).collect(Collectors.toList()), + deletedIndexFiles.stream() + .map(IndexFileMeta::fileName) + .collect(Collectors.toList())); } }