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 42857c251f [core] Remove unused manifest scan file size
42857c251f is described below
commit 42857c251f4e2c1dcb4bd3d46854d1f49f9d2f64
Author: JingsongLi <[email protected]>
AuthorDate: Tue Aug 11 16:01:03 2026 +0800
[core] Remove unused manifest scan file size
---
.../DataEvolutionRowIdAssignmentPlanner.java | 10 +++-------
.../dataevolution/DataEvolutionRowIdReassigner.java | 8 ++------
.../DataEvolutionGlobalIndexRefreshPlanner.java | 6 ++----
.../apache/paimon/manifest/BinaryManifestEntry.java | 2 +-
.../java/org/apache/paimon/manifest/FileEntry.java | 1 -
.../java/org/apache/paimon/manifest/ManifestFile.java | 7 +++----
.../org/apache/paimon/operation/FileDeletionBase.java | 7 ++-----
.../paimon/operation/ManifestEntryExternalSort.java | 8 ++------
.../apache/paimon/operation/ManifestFileSorter.java | 5 +----
.../org/apache/paimon/manifest/ManifestFileTest.java | 18 +++++-------------
10 files changed, 21 insertions(+), 51 deletions(-)
diff --git
a/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdAssignmentPlanner.java
b/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdAssignmentPlanner.java
index 1dd3ae4508..c3cec83638 100644
---
a/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdAssignmentPlanner.java
+++
b/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdAssignmentPlanner.java
@@ -192,9 +192,7 @@ final class DataEvolutionRowIdAssignmentPlanner {
}
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
- manifestMeta.fileName(),
- manifestMeta.fileSize(),
- BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
+ manifestMeta.fileName(),
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (!entry.isDelete()) {
@@ -228,8 +226,7 @@ final class DataEvolutionRowIdAssignmentPlanner {
}
int manifestOrdinal = ordinal(manifestMeta);
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(
- manifestMeta.fileName(), manifestMeta.fileSize(),
addProjection)) {
+ manifestFile.scan(manifestMeta.fileName(), addProjection))
{
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (!entry.isAdd()) {
@@ -279,8 +276,7 @@ final class DataEvolutionRowIdAssignmentPlanner {
continue;
}
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(
- manifestMeta.fileName(), manifestMeta.fileSize(),
REWRITE_PROJECTION)) {
+ manifestFile.scan(manifestMeta.fileName(),
REWRITE_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
lookup.reset(entry.partitionBytes());
diff --git
a/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdReassigner.java
b/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdReassigner.java
index 05d173ed0a..35029ab593 100644
---
a/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdReassigner.java
+++
b/paimon-core/src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionRowIdReassigner.java
@@ -480,9 +480,7 @@ public class DataEvolutionRowIdReassigner {
ManifestFileMeta manifestMeta) {
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
- manifestMeta.fileName(),
- manifestMeta.fileSize(),
- BinaryManifestEntry.ROW_RANGE_PROJECTION)) {
+ manifestMeta.fileName(),
BinaryManifestEntry.ROW_RANGE_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
RowRangeMappingIndex mapping =
@@ -508,9 +506,7 @@ public class DataEvolutionRowIdReassigner {
boolean needsReassign = false;
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
- manifestMeta.fileName(),
- manifestMeta.fileSize(),
- BinaryManifestEntry.ROW_RANGE_PROJECTION)) {
+ manifestMeta.fileName(),
BinaryManifestEntry.ROW_RANGE_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (partitionPredicate != null &&
!partitionPredicate.test(entry.partition())) {
diff --git
a/paimon-core/src/main/java/org/apache/paimon/globalindex/DataEvolutionGlobalIndexRefreshPlanner.java
b/paimon-core/src/main/java/org/apache/paimon/globalindex/DataEvolutionGlobalIndexRefreshPlanner.java
index 53d110f827..60e2f57bb4 100644
---
a/paimon-core/src/main/java/org/apache/paimon/globalindex/DataEvolutionGlobalIndexRefreshPlanner.java
+++
b/paimon-core/src/main/java/org/apache/paimon/globalindex/DataEvolutionGlobalIndexRefreshPlanner.java
@@ -185,9 +185,7 @@ public final class DataEvolutionGlobalIndexRefreshPlanner {
}
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
- manifest.fileName(),
- manifest.fileSize(),
- BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
+ manifest.fileName(),
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (entry.isDelete() &&
groupPartitions.contains(entry.partition())) {
@@ -214,7 +212,7 @@ public final class DataEvolutionGlobalIndexRefreshPlanner {
continue;
}
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(manifest.fileName(),
manifest.fileSize(), projection)) {
+ manifestFile.scan(manifest.fileName(), projection)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (!entry.isAdd()) {
diff --git
a/paimon-core/src/main/java/org/apache/paimon/manifest/BinaryManifestEntry.java
b/paimon-core/src/main/java/org/apache/paimon/manifest/BinaryManifestEntry.java
index f1dd962bba..14a0f05822 100644
---
a/paimon-core/src/main/java/org/apache/paimon/manifest/BinaryManifestEntry.java
+++
b/paimon-core/src/main/java/org/apache/paimon/manifest/BinaryManifestEntry.java
@@ -40,7 +40,7 @@ import static
org.apache.paimon.utils.SerializationUtils.deserializeBinaryRow;
* <p>This class is intended for streaming manifest algorithms which only need
a subset of {@link
* ManifestEntry}. Unlike {@link PojoManifestEntry}, it does not deserialize
the nested {@code
* _FILE} row into a POJO. The view is mutable and remains valid while its
backing {@link
- * InternalRow} remains valid. Producers such as {@link
ManifestFile#scan(String, Long, Projection)}
+ * InternalRow} remains valid. Producers such as {@link
ManifestFile#scan(String, Projection)}
* provide independently backed entries which can be retained.
*/
public final class BinaryManifestEntry implements ManifestEntry {
diff --git
a/paimon-core/src/main/java/org/apache/paimon/manifest/FileEntry.java
b/paimon-core/src/main/java/org/apache/paimon/manifest/FileEntry.java
index e33f2e6f85..f3f93f8778 100644
--- a/paimon-core/src/main/java/org/apache/paimon/manifest/FileEntry.java
+++ b/paimon-core/src/main/java/org/apache/paimon/manifest/FileEntry.java
@@ -359,7 +359,6 @@ public interface FileEntry {
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
manifest.fileName(),
- manifest.fileSize(),
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
diff --git
a/paimon-core/src/main/java/org/apache/paimon/manifest/ManifestFile.java
b/paimon-core/src/main/java/org/apache/paimon/manifest/ManifestFile.java
index 45e0a74378..3480d0c308 100644
--- a/paimon-core/src/main/java/org/apache/paimon/manifest/ManifestFile.java
+++ b/paimon-core/src/main/java/org/apache/paimon/manifest/ManifestFile.java
@@ -161,8 +161,7 @@ public class ManifestFile extends
ObjectsFile<ManifestEntry> {
* <p>This method intentionally bypasses the manifest cache because cached
entries are
* materialized with the complete manifest schema.
*/
- public CloseableIterator<BinaryManifestEntry> scan(
- String fileName, @Nullable Long fileSize, Projection projection) {
+ public CloseableIterator<BinaryManifestEntry> scan(String fileName,
Projection projection) {
try {
CloseableIterator<InternalRow> rows =
createManifestIterator(
@@ -214,10 +213,10 @@ public class ManifestFile extends
ObjectsFile<ManifestEntry> {
return suggestedFileSize;
}
- public List<ExpireFileEntry> readExpireFileEntries(String fileName,
@Nullable Long fileSize) {
+ public List<ExpireFileEntry> readExpireFileEntries(String fileName) {
List<ExpireFileEntry> result = new ArrayList<>();
try (CloseableIterator<BinaryManifestEntry> entries =
- scan(fileName, fileSize, EXPIRE_FILE_PROJECTION)) {
+ scan(fileName, EXPIRE_FILE_PROJECTION)) {
while (entries.hasNext()) {
result.add(ExpireFileEntry.from(entries.next()));
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/FileDeletionBase.java
b/paimon-core/src/main/java/org/apache/paimon/operation/FileDeletionBase.java
index 2d21b5743b..50222d2c16 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/FileDeletionBase.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/FileDeletionBase.java
@@ -245,8 +245,7 @@ public abstract class FileDeletionBase<T extends Snapshot> {
ManifestReadThreadPool.sequentialBatchedExecute(
manifest -> {
try {
- return manifestFile.readExpireFileEntries(
- manifest.fileName(),
manifest.fileSize());
+ return
manifestFile.readExpireFileEntries(manifest.fileName());
} catch (Exception e) {
// We want to delete the data file, so just
ignore the unavailable
// files
@@ -275,9 +274,7 @@ public abstract class FileDeletionBase<T extends Snapshot> {
private Iterable<ExpireFileEntry>
readExpireFileEntries(List<ManifestFileMeta> manifests) {
return ManifestReadThreadPool.sequentialBatchedExecute(
- manifest ->
- manifestFile.readExpireFileEntries(
- manifest.fileName(), manifest.fileSize()),
+ manifest ->
manifestFile.readExpireFileEntries(manifest.fileName()),
manifests,
fileOperationParallelism);
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/ManifestEntryExternalSort.java
b/paimon-core/src/main/java/org/apache/paimon/operation/ManifestEntryExternalSort.java
index dd8bcd9d53..2b05614800 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/ManifestEntryExternalSort.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/ManifestEntryExternalSort.java
@@ -114,10 +114,7 @@ public class ManifestEntryExternalSort {
|| (manifestReadParallelism != null && manifestReadParallelism
<= 1)) {
for (ManifestFileMeta meta : section) {
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(
- meta.fileName(),
- meta.fileSize(),
- BinaryManifestEntry.fullProjection())) {
+ manifestFile.scan(meta.fileName(),
BinaryManifestEntry.fullProjection())) {
while (entries.hasNext()) {
consumer.accept(entries.next());
}
@@ -142,8 +139,7 @@ public class ManifestEntryExternalSort {
InternalRowSerializer serializer =
new InternalRowSerializer(ManifestEntry.MANIFEST_ROW_TYPE);
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(
- meta.fileName(), meta.fileSize(),
BinaryManifestEntry.fullProjection())) {
+ manifestFile.scan(meta.fileName(),
BinaryManifestEntry.fullProjection())) {
while (entries.hasNext()) {
rows.add(serializer.toBinaryRow(entries.next().fullRow()).copy());
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/ManifestFileSorter.java
b/paimon-core/src/main/java/org/apache/paimon/operation/ManifestFileSorter.java
index bee9ddc187..ad7365a6b0 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/ManifestFileSorter.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/ManifestFileSorter.java
@@ -592,10 +592,7 @@ public class ManifestFileSorter {
Set<BinaryRow> partitions,
boolean synchronize) {
try (CloseableIterator<BinaryManifestEntry> entries =
- manifestFile.scan(
- meta.fileName(),
- meta.fileSize(),
- BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
+ manifestFile.scan(meta.fileName(),
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
while (entries.hasNext()) {
BinaryManifestEntry entry = entries.next();
if (!entry.isDelete()) {
diff --git
a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestFileTest.java
b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestFileTest.java
index c1e1898a36..f0f90126a6 100644
--- a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestFileTest.java
+++ b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestFileTest.java
@@ -245,7 +245,7 @@ public class ManifestFileTest {
try (CloseableIterator<BinaryManifestEntry> entries =
manifestFile.scan(
- manifest.fileName(), null,
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
+ manifest.fileName(),
BinaryManifestEntry.DELETE_ENTRY_PROJECTION)) {
assertThatThrownBy(entries::hasNext)
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("not compatible");
@@ -475,8 +475,7 @@ public class ManifestFileTest {
ManifestFile manifestFile = createManifestFile(tempDir.toString(),
Long.MAX_VALUE);
ManifestFileMeta manifest = writeSingleManifest(manifestFile, entries);
- List<ExpireFileEntry> actual =
- manifestFile.readExpireFileEntries(manifest.fileName(),
manifest.fileSize());
+ List<ExpireFileEntry> actual =
manifestFile.readExpireFileEntries(manifest.fileName());
List<ExpireFileEntry> expected =
entries.stream().map(ExpireFileEntry::from).collect(Collectors.toList());
@@ -498,7 +497,7 @@ public class ManifestFileTest {
List<BinaryManifestEntry> actual = new ArrayList<>();
try (CloseableIterator<BinaryManifestEntry> iterator =
- manifestFile.scan(manifest.fileName(), manifest.fileSize(),
projection)) {
+ manifestFile.scan(manifest.fileName(), projection)) {
while (iterator.hasNext()) {
actual.add(iterator.next());
}
@@ -523,10 +522,7 @@ public class ManifestFileTest {
ManifestFileMeta manifest = writeSingleManifest(manifestFile, entries);
try (CloseableIterator<BinaryManifestEntry> iterator =
- manifestFile.scan(
- manifest.fileName(),
- manifest.fileSize(),
- projection(DataFileMeta.FILE_NAME))) {
+ manifestFile.scan(manifest.fileName(),
projection(DataFileMeta.FILE_NAME))) {
assertThat(iterator.hasNext()).isTrue();
BinaryManifestEntry first = iterator.next();
assertThat(first.fileName()).isEqualTo(entries.get(0).fileName());
@@ -547,10 +543,7 @@ public class ManifestFileTest {
List<BinaryManifestEntry> retained = new ArrayList<>();
try (CloseableIterator<BinaryManifestEntry> iterator =
- manifestFile.scan(
- manifest.fileName(),
- manifest.fileSize(),
- projection(DataFileMeta.FILE_NAME))) {
+ manifestFile.scan(manifest.fileName(),
projection(DataFileMeta.FILE_NAME))) {
while (iterator.hasNext()) {
BinaryManifestEntry entry = iterator.next();
retained.add(entry);
@@ -575,7 +568,6 @@ public class ManifestFileTest {
try (CloseableIterator<BinaryManifestEntry>
iterator =
manifestFile.scan(
manifest.fileName(),
- manifest.fileSize(),
projection(DataFileMeta.FILE_NAME))) {
assertThat(iterator.hasNext()).isTrue();
BinaryManifestEntry entry = iterator.next();
