From 33b6f94f716d014cbb8ebc42d8fb0f4bda87a65d Mon Sep 17 00:00:00 2001 From: yuzelin Date: Mon, 20 Jan 2025 17:59:00 +0800 Subject: [PATCH] [hotfix] remove_orphan_files action shouldn't check table argument (table=null means clean whole database) --- .../flink/action/RemoveOrphanFilesActionFactory.java | 2 +- .../action/RemoveOrphanFilesActionITCaseBase.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionFactory.java index 279bc87baf65..9db1b7263a74 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionFactory.java @@ -38,7 +38,7 @@ public Optional create(MultipleParameterToolAdapter params) { RemoveOrphanFilesAction action = new RemoveOrphanFilesAction( params.getRequired(DATABASE), - params.getRequired(TABLE), + params.get(TABLE), params.get(PARALLELISM), catalogConfigMap(params)); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCaseBase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCaseBase.java index 8bdb8979a280..54e211ed3b1f 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCaseBase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCaseBase.java @@ -175,9 +175,13 @@ public void testRemoveDatabaseOrphanFilesITCase(boolean isNamedArgument) throws "--warehouse", warehouse, "--database", - database, - "--table", - "*")); + database)); + + if (ThreadLocalRandom.current().nextBoolean()) { + args.add("--table"); + args.add("*"); + } + RemoveOrphanFilesAction action1 = createAction(RemoveOrphanFilesAction.class, args); assertThatCode(action1::run).doesNotThrowAnyException();