This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 6c7b7bf7b [core] add table name to the log when commit failed (#4475)
6c7b7bf7b is described below
commit 6c7b7bf7b7df13d0b5cb81eafaee921cc3789573
Author: melin <[email protected]>
AuthorDate: Thu Nov 7 18:00:22 2024 +0800
[core] add table name to the log when commit failed (#4475)
---
.../src/main/java/org/apache/paimon/AbstractFileStore.java | 4 ++++
.../src/main/java/org/apache/paimon/AppendOnlyFileStore.java | 4 +---
.../src/main/java/org/apache/paimon/KeyValueFileStore.java | 4 +---
.../java/org/apache/paimon/operation/FileStoreCommitImpl.java | 8 ++++++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/paimon-core/src/main/java/org/apache/paimon/AbstractFileStore.java
b/paimon-core/src/main/java/org/apache/paimon/AbstractFileStore.java
index 55c1c72df..14665961a 100644
--- a/paimon-core/src/main/java/org/apache/paimon/AbstractFileStore.java
+++ b/paimon-core/src/main/java/org/apache/paimon/AbstractFileStore.java
@@ -72,6 +72,7 @@ abstract class AbstractFileStore<T> implements FileStore<T> {
protected final FileIO fileIO;
protected final SchemaManager schemaManager;
protected final TableSchema schema;
+ protected final String tableName;
protected final CoreOptions options;
protected final RowType partitionType;
private final CatalogEnvironment catalogEnvironment;
@@ -83,12 +84,14 @@ abstract class AbstractFileStore<T> implements FileStore<T>
{
FileIO fileIO,
SchemaManager schemaManager,
TableSchema schema,
+ String tableName,
CoreOptions options,
RowType partitionType,
CatalogEnvironment catalogEnvironment) {
this.fileIO = fileIO;
this.schemaManager = schemaManager;
this.schema = schema;
+ this.tableName = tableName;
this.options = options;
this.partitionType = partitionType;
this.catalogEnvironment = catalogEnvironment;
@@ -209,6 +212,7 @@ abstract class AbstractFileStore<T> implements FileStore<T>
{
return new FileStoreCommitImpl(
fileIO,
schemaManager,
+ tableName,
commitUser,
partitionType,
options.partitionDefaultName(),
diff --git
a/paimon-core/src/main/java/org/apache/paimon/AppendOnlyFileStore.java
b/paimon-core/src/main/java/org/apache/paimon/AppendOnlyFileStore.java
index 30208cebb..a06b98d7b 100644
--- a/paimon-core/src/main/java/org/apache/paimon/AppendOnlyFileStore.java
+++ b/paimon-core/src/main/java/org/apache/paimon/AppendOnlyFileStore.java
@@ -49,7 +49,6 @@ public class AppendOnlyFileStore extends
AbstractFileStore<InternalRow> {
private final RowType bucketKeyType;
private final RowType rowType;
- private final String tableName;
public AppendOnlyFileStore(
FileIO fileIO,
@@ -61,10 +60,9 @@ public class AppendOnlyFileStore extends
AbstractFileStore<InternalRow> {
RowType rowType,
String tableName,
CatalogEnvironment catalogEnvironment) {
- super(fileIO, schemaManager, schema, options, partitionType,
catalogEnvironment);
+ super(fileIO, schemaManager, schema, tableName, options,
partitionType, catalogEnvironment);
this.bucketKeyType = bucketKeyType;
this.rowType = rowType;
- this.tableName = tableName;
}
@Override
diff --git a/paimon-core/src/main/java/org/apache/paimon/KeyValueFileStore.java
b/paimon-core/src/main/java/org/apache/paimon/KeyValueFileStore.java
index 8a3bf0b0f..1c87a087e 100644
--- a/paimon-core/src/main/java/org/apache/paimon/KeyValueFileStore.java
+++ b/paimon-core/src/main/java/org/apache/paimon/KeyValueFileStore.java
@@ -70,7 +70,6 @@ public class KeyValueFileStore extends
AbstractFileStore<KeyValue> {
private final Supplier<Comparator<InternalRow>> keyComparatorSupplier;
private final Supplier<RecordEqualiser> logDedupEqualSupplier;
private final MergeFunctionFactory<KeyValue> mfFactory;
- private final String tableName;
public KeyValueFileStore(
FileIO fileIO,
@@ -86,7 +85,7 @@ public class KeyValueFileStore extends
AbstractFileStore<KeyValue> {
MergeFunctionFactory<KeyValue> mfFactory,
String tableName,
CatalogEnvironment catalogEnvironment) {
- super(fileIO, schemaManager, schema, options, partitionType,
catalogEnvironment);
+ super(fileIO, schemaManager, schema, tableName, options,
partitionType, catalogEnvironment);
this.crossPartitionUpdate = crossPartitionUpdate;
this.bucketKeyType = bucketKeyType;
this.keyType = keyType;
@@ -99,7 +98,6 @@ public class KeyValueFileStore extends
AbstractFileStore<KeyValue> {
options.changelogRowDeduplicate()
? ValueEqualiserSupplier.fromIgnoreFields(valueType,
logDedupIgnoreFields)
: () -> null;
- this.tableName = tableName;
}
@Override
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java
b/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java
index 9ce089992..69efce918 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java
@@ -112,6 +112,7 @@ public class FileStoreCommitImpl implements FileStoreCommit
{
private final FileIO fileIO;
private final SchemaManager schemaManager;
+ private final String tableName;
private final String commitUser;
private final RowType partitionType;
private final String partitionDefaultName;
@@ -142,6 +143,7 @@ public class FileStoreCommitImpl implements FileStoreCommit
{
public FileStoreCommitImpl(
FileIO fileIO,
SchemaManager schemaManager,
+ String tableName,
String commitUser,
RowType partitionType,
String partitionDefaultName,
@@ -165,6 +167,7 @@ public class FileStoreCommitImpl implements FileStoreCommit
{
int commitMaxRetries) {
this.fileIO = fileIO;
this.schemaManager = schemaManager;
+ this.tableName = tableName;
this.commitUser = commitUser;
this.partitionType = partitionType;
this.partitionDefaultName = partitionDefaultName;
@@ -1331,8 +1334,9 @@ public class FileStoreCommitImpl implements
FileStoreCommit {
for (SimpleFileEntry entry : mergedEntries) {
Preconditions.checkState(
entry.kind() != FileKind.DELETE,
- "Trying to delete file %s which is not previously
added.",
- entry.fileName());
+ "Trying to delete file %s for table %s which is not
previously added.",
+ entry.fileName(),
+ tableName);
}
} catch (Throwable e) {
if (partitionExpire != null &&
partitionExpire.isValueExpiration()) {
