Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -595,47 +595,109 @@ public void markDonePartitions(Identifier identifier, List<Map<String, String>>
public List<org.apache.paimon.partition.Partition> listPartitions(Identifier identifier)
throws TableNotExistException {
FileStoreTable table = (FileStoreTable) getTable(identifier);
String tagToPartitionField = table.coreOptions().tagToPartitionField();
CoreOptions coreOptions = table.coreOptions();
String tagToPartitionField = coreOptions.tagToPartitionField();
List<org.apache.paimon.partition.Partition> partitions;
if (tagToPartitionField != null) {
try {
List<Partition> partitions = listPartitionsFromHms(identifier);
return partitions.stream()
.map(
part -> {
Map<String, String> parameters = part.getParameters();
long recordCount =
Long.parseLong(
parameters.getOrDefault(NUM_ROWS_PROP, "1"));
long fileSizeInBytes =
Long.parseLong(
parameters.getOrDefault(TOTAL_SIZE_PROP, "1"));
long fileCount =
Long.parseLong(
parameters.getOrDefault(NUM_FILES_PROP, "1"));
long lastFileCreationTime =
Long.parseLong(
parameters.getOrDefault(
LAST_UPDATE_TIME_PROP,
System.currentTimeMillis() + ""));
int totalBuckets =
Integer.parseInt(
parameters.getOrDefault(TOTAL_BUCKETS, "0"));
return new org.apache.paimon.partition.Partition(
Collections.singletonMap(
tagToPartitionField, part.getValues().get(0)),
recordCount,
fileSizeInBytes,
fileCount,
lastFileCreationTime,
totalBuckets,
false);
})
.collect(Collectors.toList());
List<Partition> hivePartitions = listPartitionsFromHms(identifier);
partitions =
hivePartitions.stream()
.map(
part -> {
Map<String, String> parameters = part.getParameters();
long recordCount =
Long.parseLong(
parameters.getOrDefault(
NUM_ROWS_PROP, "1"));
long fileSizeInBytes =
Long.parseLong(
parameters.getOrDefault(
TOTAL_SIZE_PROP, "1"));
long fileCount =
Long.parseLong(
parameters.getOrDefault(
NUM_FILES_PROP, "1"));
long lastFileCreationTime =
Long.parseLong(
parameters.getOrDefault(
LAST_UPDATE_TIME_PROP,
System.currentTimeMillis()
+ ""));
int totalBuckets =
Integer.parseInt(
parameters.getOrDefault(
TOTAL_BUCKETS, "0"));
return new org.apache.paimon.partition.Partition(
Collections.singletonMap(
tagToPartitionField,
part.getValues().get(0)),
recordCount,
fileSizeInBytes,
fileCount,
lastFileCreationTime,
totalBuckets,
false);
})
.collect(Collectors.toList());
} catch (Exception e) {
throw new RuntimeException(e);
}
} else {
partitions = listPartitionsFromFileSystem(table);
}

if (coreOptions.partitionedTableInMetastore()
&& coreOptions
.partitionMarkDoneActions()
.contains(CoreOptions.PartitionMarkDoneAction.MARK_EVENT)) {
return withDoneStatus(identifier, partitions);
}
return listPartitionsFromFileSystem(table);
return partitions;
}

private List<org.apache.paimon.partition.Partition> withDoneStatus(
Identifier identifier, List<org.apache.paimon.partition.Partition> partitions)
throws TableNotExistException {
try {
return clients()
.run(
client -> {
List<org.apache.paimon.partition.Partition> result =
new ArrayList<>(partitions.size());
for (org.apache.paimon.partition.Partition partition : partitions) {
boolean done =
client.isPartitionMarkedForEvent(
identifier.getDatabaseName(),
identifier.getTableName(),
partition.spec(),
PartitionEventType.LOAD_DONE);
result.add(copyWithDone(partition, done));
}
return result;
});
} catch (UnknownTableException e) {
throw new TableNotExistException(identifier);
} catch (TException | InterruptedException e) {
throw new RuntimeException(e);
}
}

private org.apache.paimon.partition.Partition copyWithDone(
org.apache.paimon.partition.Partition partition, boolean done) {
return new org.apache.paimon.partition.Partition(
partition.spec(),
partition.recordCount(),
partition.fileSizeInBytes(),
partition.fileCount(),
partition.lastFileCreationTime(),
partition.totalBuckets(),
done,
partition.createdAt(),
partition.createdBy(),
partition.updatedAt(),
partition.updatedBy(),
partition.options());
}

@VisibleForTesting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.paimon.catalog.CatalogTestBase;
import org.apache.paimon.catalog.Identifier;
import org.apache.paimon.client.ClientPool;
import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.fs.Path;
import org.apache.paimon.options.CatalogOptions;
import org.apache.paimon.options.Options;
Expand All @@ -33,6 +35,9 @@
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
import org.apache.paimon.table.object.ObjectTable;
import org.apache.paimon.table.sink.BatchTableCommit;
import org.apache.paimon.table.sink.BatchTableWrite;
import org.apache.paimon.table.sink.BatchWriteBuilder;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.utils.CommonTestUtils;
Expand Down Expand Up @@ -579,6 +584,48 @@ public void testTagToPartitionTable() throws Exception {
Collections.singletonMap("dt", "20250101"));
}

@Test
public void testListPartitionsWithDoneStatus() throws Exception {
String databaseName = "testListPartitionsWithDoneStatus";
catalog.createDatabase(databaseName, false);
Identifier identifier = Identifier.create(databaseName, "table");
catalog.createTable(
identifier,
Schema.newBuilder()
.option(METASTORE_PARTITIONED_TABLE.key(), "true")
.option(CoreOptions.PARTITION_MARK_DONE_ACTION.key(), "mark-event")
.column("col", DataTypes.INT())
.column("dt", DataTypes.STRING())
.partitionKeys("dt")
.build(),
false);

List<Map<String, String>> partitionSpecs =
Arrays.asList(
Collections.singletonMap("dt", "20250101"),
Collections.singletonMap("dt", "20250102"));
BatchWriteBuilder writeBuilder = catalog.getTable(identifier).newBatchWriteBuilder();
try (BatchTableWrite write = writeBuilder.newWrite();
BatchTableCommit commit = writeBuilder.newCommit()) {
for (Map<String, String> partitionSpec : partitionSpecs) {
write.write(GenericRow.of(0, BinaryString.fromString(partitionSpec.get("dt"))));
}
commit.commit(write.prepareCommit());
}

assertThat(catalog.listPartitions(identifier)).allMatch(partition -> !partition.done());

catalog.markDonePartitions(identifier, Collections.singletonList(partitionSpecs.get(0)));

Map<Map<String, String>, Boolean> doneByPartition = new HashMap<>();
for (Partition partition : catalog.listPartitions(identifier)) {
doneByPartition.put(partition.spec(), partition.done());
}
assertThat(doneByPartition)
.containsEntry(partitionSpecs.get(0), true)
.containsEntry(partitionSpecs.get(1), false);
}

@Test
public void testCreateTableWithBlob() throws Exception {
String databaseName = "testCreateTableWithBlob";
Expand Down
Loading