Skip to content

[core] Validate DATE partitions by their date value in partition.timestamp-format.strict #10874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thswlsqls wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[core] Validate DATE partitions by their date value in partition.timestamp-format.strict #10874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions paimon-core/src/main/java/org/apache/paimon/operation/AbstractFileStoreWrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.paimon.partition.PartitionTimeExtractor;
import org.apache.paimon.table.sink.CommitMessage;
import org.apache.paimon.table.sink.CommitMessageImpl;
import org.apache.paimon.types.DataTypeRoot;
import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.CommitIncrement;
import org.apache.paimon.utils.ExecutorThreadFactory;
Expand All @@ -53,6 +54,7 @@

import javax.annotation.Nullable;

import java.time.LocalDate;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -820,6 +822,14 @@ private static PartitionTimestampValidator create(

private void validate(BinaryRow partition) {
Object[] array = partitionConverter.convert(partition);
RowType partitionType = partitionConverter.rowType();
for (int i = 0; i < array.length; i++) {
// DATE is stored as an epoch day, same as PartitionExpireStrategy#convertPartition.
if (array[i] != null
&& partitionType.getTypeAt(i).getTypeRoot() == DataTypeRoot.DATE) {
array[i] = LocalDate.ofEpochDay((Integer) array[i]);
}
}
try {
timeExtractor.extract(partitionKeys, Arrays.asList(array));
} catch (DateTimeParseException e) {
Expand Down
46 changes: 46 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/table/sink/TableWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -317,6 +318,51 @@ public void testPartitionTimestampValidation() throws Exception {
write.close();
}

@Test
public void testPartitionTimestampValidationWithDatePartition() throws Exception {
RowType rowType =
RowType.of(
new DataType[] {
DataTypes.DATE().notNull(),
DataTypes.INT().notNull(),
DataTypes.BIGINT()
},
new String[] {"dt", "k", "v"});
int dt = (int) LocalDate.of(2026, 10, 29).toEpochDay();

// valid partition value: 2026-10-29 matches yyyy-MM-dd
Options conf = new Options();
conf.set(CoreOptions.PARTITION_TIMESTAMP_FORMATTER, "yyyy-MM-dd");
conf.set(CoreOptions.PARTITION_TIMESTAMP_PATTERN, "$dt");
conf.set(CoreOptions.PARTITION_TIMESTAMP_FORMAT_STRICT, true);
FileStoreTable table =
createFileStoreTable(
rowType, Collections.singletonList("dt"), Arrays.asList("dt", "k"), conf);
TableWriteImpl<?> write = table.newWrite(commitUser);
StreamTableCommit commit = table.newCommit(commitUser);
write.write(GenericRow.of(dt, 1, 1L));
commit.commit(0, write.prepareCommit(false, 0));
assertThat(readRows(table)).hasSize(1);
write.close();
commit.close();

// invalid partition value: 2026-10-29 does not match yyyyMMdd
Options mismatchConf = new Options();
mismatchConf.set(CoreOptions.PARTITION_TIMESTAMP_FORMATTER, "yyyyMMdd");
mismatchConf.set(CoreOptions.PARTITION_TIMESTAMP_FORMAT_STRICT, true);
FileStoreTable mismatchTable =
createFileStoreTable(
rowType,
Collections.singletonList("dt"),
Arrays.asList("dt", "k"),
mismatchConf);
TableWriteImpl<?> mismatchWrite = mismatchTable.newWrite(commitUser);
assertThatThrownBy(() -> mismatchWrite.write(GenericRow.of(dt, 1, 1L)))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("dt=2026-10-29");
mismatchWrite.close();
}

@Test
public void testDeduplicateDeleteWithPrimaryKeyOnly() throws Exception {
FileStoreTable table = createNotNullFileStoreTable(new Options());
Expand Down
Loading