This is an automated email from the ASF dual-hosted git repository.
JingsongLi 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 f6ccc0902d Revert "[core] Fix manifest file not cleaned if
compact_manifest failed (#6257)"
f6ccc0902d is described below
commit f6ccc0902da55ebf1e763cd60ff25f3e05372563
Author: JingsongLi <[email protected]>
AuthorDate: Sun May 24 19:18:29 2026 +0800
Revert "[core] Fix manifest file not cleaned if compact_manifest failed
(#6257)"
This reverts commit 24e7e1ad4cb82dc421360d678ba8821b71cfbfeb.
---
.../java/org/apache/paimon/operation/FileStoreCommitImpl.java | 10 +---------
.../paimon/spark/procedure/CompactManifestProcedure.java | 5 -----
2 files changed, 1 insertion(+), 14 deletions(-)
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 9f452776db..3f9fdb9f1c 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
@@ -1233,15 +1233,7 @@ public class FileStoreCommitImpl implements
FileStoreCommit {
latestSnapshot.properties(),
latestSnapshot.nextRowId());
- boolean success = commitSnapshotImpl(newSnapshot, emptyList());
- if (!success) {
- LOG.info(
- "Commit failed for compact manifest, clean unused legacy
manifest files, commit will be retried.");
- manifestList.delete(deltaManifestList.getLeft());
- commitCleaner.cleanUpNoReuseTmpManifests(
- baseManifestList, mergeBeforeManifests,
mergeAfterManifests);
- }
- return success;
+ return commitSnapshotImpl(newSnapshot, emptyList());
}
private boolean commitSnapshotImpl(Snapshot newSnapshot,
List<PartitionEntry> deltaStatistics) {
diff --git
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactManifestProcedure.java
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactManifestProcedure.java
index 4c55674768..5a6837f6c1 100644
---
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactManifestProcedure.java
+++
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactManifestProcedure.java
@@ -18,7 +18,6 @@
package org.apache.paimon.spark.procedure;
-import org.apache.paimon.CoreOptions;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.sink.BatchTableCommit;
import org.apache.paimon.utils.ProcedureUtils;
@@ -44,8 +43,6 @@ import static org.apache.spark.sql.types.DataTypes.StringType;
*/
public class CompactManifestProcedure extends BaseProcedure {
- private static final String COMMIT_USER =
"Compact-Manifest-Procedure-Committer";
-
private static final ProcedureParameter[] PARAMETERS =
new ProcedureParameter[] {
ProcedureParameter.required("table", StringType),
@@ -80,8 +77,6 @@ public class CompactManifestProcedure extends BaseProcedure {
Table table = loadSparkTable(tableIdent).getTable();
HashMap<String, String> dynamicOptions = new HashMap<>();
- ProcedureUtils.putIfNotEmpty(
- dynamicOptions, CoreOptions.COMMIT_USER_PREFIX.key(),
COMMIT_USER);
ProcedureUtils.putAllOptions(dynamicOptions, options);
table = table.copy(dynamicOptions);