diff --git a/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java b/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java index b1af1c93942f..e53e1956ca7b 100644 --- a/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java +++ b/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java @@ -35,7 +35,13 @@ public class CreateTagProcedure extends CreateOrReplaceTagBaseProcedure { @Override void createOrReplaceTag(Table table, String tagName, Long snapshotId, Duration timeRetained) { - if (snapshotId == null) { + if (timeRetained == null) { + if (snapshotId == null) { + table.createTag(tagName); + } else { + table.createTag(tagName, snapshotId); + } + } else if (snapshotId == null) { table.createTag(tagName, timeRetained); } else { table.createTag(tagName, snapshotId, timeRetained); diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java index b1af1c93942f..e53e1956ca7b 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateTagProcedure.java @@ -35,7 +35,13 @@ public class CreateTagProcedure extends CreateOrReplaceTagBaseProcedure { @Override void createOrReplaceTag(Table table, String tagName, Long snapshotId, Duration timeRetained) { - if (snapshotId == null) { + if (timeRetained == null) { + if (snapshotId == null) { + table.createTag(tagName); + } else { + table.createTag(tagName, snapshotId); + } + } else if (snapshotId == null) { table.createTag(tagName, timeRetained); } else { table.createTag(tagName, snapshotId, timeRetained); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/procedure/ExpireTagsProcedureITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/procedure/ExpireTagsProcedureITCase.java index 1c59fbbb5c79..cc1aca29f57e 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/procedure/ExpireTagsProcedureITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/procedure/ExpireTagsProcedureITCase.java @@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test; import java.io.IOException; +import java.time.Duration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -36,6 +37,28 @@ /** IT Case for {@link ExpireTagsProcedure}. */ public class ExpireTagsProcedureITCase extends CatalogITCaseBase { + @Test + public void testCreateTagUsesDefaultRetention() throws Exception { + sql("CREATE TABLE T (id INT) WITH ('tag.default-time-retained' = '1d')"); + sql("INSERT INTO T VALUES (1)"); + sql("INSERT INTO T VALUES (2)"); + + sql("CALL sys.create_tag(`table` => 'default.T', tag => 'latest')"); + sql("CALL sys.create_tag(`table` => 'default.T', tag => 'by-id', snapshot_id => 1)"); + sql( + "CALL sys.create_tag(`table` => 'default.T', tag => 'override', time_retained => '1h')"); + + FileStoreTable table = paimonTable("T"); + assertThat(table.tagManager().getOrThrow("latest").id()).isEqualTo(2L); + assertThat(table.tagManager().getOrThrow("by-id").id()).isEqualTo(1L); + assertThat(table.tagManager().getOrThrow("latest").getTagTimeRetained()) + .isEqualTo(Duration.ofDays(1)); + assertThat(table.tagManager().getOrThrow("by-id").getTagTimeRetained()) + .isEqualTo(Duration.ofDays(1)); + assertThat(table.tagManager().getOrThrow("override").getTagTimeRetained()) + .isEqualTo(Duration.ofHours(1)); + } + @Test public void testExpireTagsByTagCreateTimeAndTagTimeRetained() throws Exception { boolean tagTimeExpireEnabled = ThreadLocalRandom.current().nextBoolean(); diff --git a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CreateTagProcedure.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CreateTagProcedure.java index 157743f9892e..33a85ef8adc5 100644 --- a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CreateTagProcedure.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CreateTagProcedure.java @@ -33,7 +33,13 @@ private CreateTagProcedure(TableCatalog tableCatalog) { @Override void createOrReplaceTag(Table table, String tagName, Long snapshotId, Duration timeRetained) { - if (snapshotId == null) { + if (timeRetained == null) { + if (snapshotId == null) { + table.createTag(tagName); + } else { + table.createTag(tagName, snapshotId); + } + } else if (snapshotId == null) { table.createTag(tagName, timeRetained); } else { table.createTag(tagName, snapshotId, timeRetained);