This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 048e797a6 [core] Rename FieldStatsCollector to TableStatsCollector
048e797a6 is described below
commit 048e797a66678e5466edfd19bf3acdd324eb0972
Author: JingsongLi <[email protected]>
AuthorDate: Mon Jul 3 17:56:26 2023 +0800
[core] Rename FieldStatsCollector to TableStatsCollector
---
.../java/org/apache/paimon/format/FileFormat.java | 2 +-
...tatsCollector.java => TableStatsCollector.java} | 4 ++--
...tatsExtractor.java => TableStatsExtractor.java} | 2 +-
...tBase.java => TableStatsExtractorTestBase.java} | 8 +++----
.../apache/paimon/io/KeyValueDataFileWriter.java | 6 ++---
.../paimon/io/KeyValueFileWriterFactory.java | 10 ++++-----
.../org/apache/paimon/io/RowDataFileWriter.java | 6 ++---
.../paimon/io/StatsCollectingSingleFileWriter.java | 26 +++++++++++-----------
.../org/apache/paimon/manifest/ManifestFile.java | 6 ++---
.../format/FileStatsExtractingAvroFormat.java | 8 +++----
.../paimon/io/DataFileTestDataGenerator.java | 10 ++++-----
.../paimon/manifest/ManifestTestDataGenerator.java | 6 ++---
...ectorTest.java => TableStatsCollectorTest.java} | 8 +++----
...Extractor.java => TestTableStatsExtractor.java} | 14 ++++++------
.../apache/paimon/format/orc/OrcFileFormat.java | 8 +++----
...sExtractor.java => OrcTableStatsExtractor.java} | 8 +++----
.../paimon/format/parquet/ParquetFileFormat.java | 6 ++---
...ractor.java => ParquetTableStatsExtractor.java} | 8 +++----
...orTest.java => OrcTableStatsExtractorTest.java} | 8 +++----
...st.java => ParquetTableStatsExtractorTest.java} | 6 ++---
20 files changed, 80 insertions(+), 80 deletions(-)
diff --git
a/paimon-common/src/main/java/org/apache/paimon/format/FileFormat.java
b/paimon-common/src/main/java/org/apache/paimon/format/FileFormat.java
index a8164d4c2..015a80ec0 100644
--- a/paimon-common/src/main/java/org/apache/paimon/format/FileFormat.java
+++ b/paimon-common/src/main/java/org/apache/paimon/format/FileFormat.java
@@ -75,7 +75,7 @@ public abstract class FileFormat {
return createReaderFactory(rowType, projection, new ArrayList<>());
}
- public Optional<FileStatsExtractor> createStatsExtractor(RowType type) {
+ public Optional<TableStatsExtractor> createStatsExtractor(RowType type) {
return Optional.empty();
}
diff --git
a/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
b/paimon-common/src/main/java/org/apache/paimon/format/TableStatsCollector.java
similarity index 97%
rename from
paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
rename to
paimon-common/src/main/java/org/apache/paimon/format/TableStatsCollector.java
index d1c399aab..f85273be4 100644
---
a/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
+++
b/paimon-common/src/main/java/org/apache/paimon/format/TableStatsCollector.java
@@ -25,7 +25,7 @@ import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.RowDataToObjectArrayConverter;
/** Collector to extract statistics of each fields from a series of records. */
-public class FieldStatsCollector {
+public class TableStatsCollector {
private final Object[] minValues;
private final Object[] maxValues;
@@ -33,7 +33,7 @@ public class FieldStatsCollector {
private final RowDataToObjectArrayConverter converter;
private final Serializer<Object>[] fieldSerializers;
- public FieldStatsCollector(RowType rowType) {
+ public TableStatsCollector(RowType rowType) {
int numFields = rowType.getFieldCount();
this.minValues = new Object[numFields];
this.maxValues = new Object[numFields];
diff --git
a/paimon-common/src/main/java/org/apache/paimon/format/FileStatsExtractor.java
b/paimon-common/src/main/java/org/apache/paimon/format/TableStatsExtractor.java
similarity index 96%
rename from
paimon-common/src/main/java/org/apache/paimon/format/FileStatsExtractor.java
rename to
paimon-common/src/main/java/org/apache/paimon/format/TableStatsExtractor.java
index 6be6f82a9..e5e8e3eb0 100644
---
a/paimon-common/src/main/java/org/apache/paimon/format/FileStatsExtractor.java
+++
b/paimon-common/src/main/java/org/apache/paimon/format/TableStatsExtractor.java
@@ -24,7 +24,7 @@ import org.apache.paimon.fs.Path;
import java.io.IOException;
/** Extracts statistics directly from file. */
-public interface FileStatsExtractor {
+public interface TableStatsExtractor {
FieldStats[] extract(FileIO fileIO, Path path) throws IOException;
}
diff --git
a/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
b/paimon-common/src/test/java/org/apache/paimon/format/TableStatsExtractorTestBase.java
similarity index 97%
rename from
paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
rename to
paimon-common/src/test/java/org/apache/paimon/format/TableStatsExtractorTestBase.java
index 3d545fa6d..69bf6b86b 100644
---
a/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
+++
b/paimon-common/src/test/java/org/apache/paimon/format/TableStatsExtractorTestBase.java
@@ -59,8 +59,8 @@ import java.util.concurrent.ThreadLocalRandom;
import static org.apache.paimon.types.DataTypeChecks.getPrecision;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link org.apache.paimon.format.FileStatsExtractor}. */
-public abstract class FileStatsExtractorTestBase {
+/** Tests for {@link TableStatsExtractor}. */
+public abstract class TableStatsExtractorTestBase {
@TempDir java.nio.file.Path tempDir;
@@ -82,13 +82,13 @@ public abstract class FileStatsExtractorTestBase {
}
writer.finish();
- FieldStatsCollector collector = new FieldStatsCollector(rowType);
+ TableStatsCollector collector = new TableStatsCollector(rowType);
for (GenericRow row : data) {
collector.collect(row);
}
FieldStats[] expected = collector.extract();
- FileStatsExtractor extractor =
format.createStatsExtractor(rowType).get();
+ TableStatsExtractor extractor =
format.createStatsExtractor(rowType).get();
assertThat(extractor).isNotNull();
FieldStats[] actual = extractor.extract(fileIO, path);
for (int i = 0; i < expected.length; i++) {
diff --git
a/paimon-core/src/main/java/org/apache/paimon/io/KeyValueDataFileWriter.java
b/paimon-core/src/main/java/org/apache/paimon/io/KeyValueDataFileWriter.java
index 135b7ad0a..4ee489f00 100644
--- a/paimon-core/src/main/java/org/apache/paimon/io/KeyValueDataFileWriter.java
+++ b/paimon-core/src/main/java/org/apache/paimon/io/KeyValueDataFileWriter.java
@@ -23,8 +23,8 @@ import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.stats.BinaryTableStats;
@@ -73,7 +73,7 @@ public class KeyValueDataFileWriter
Function<KeyValue, InternalRow> converter,
RowType keyType,
RowType valueType,
- @Nullable FileStatsExtractor fileStatsExtractor,
+ @Nullable TableStatsExtractor tableStatsExtractor,
long schemaId,
int level,
String compression) {
@@ -83,7 +83,7 @@ public class KeyValueDataFileWriter
path,
converter,
KeyValue.schema(keyType, valueType),
- fileStatsExtractor,
+ tableStatsExtractor,
compression);
this.keyType = keyType;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/io/KeyValueFileWriterFactory.java
b/paimon-core/src/main/java/org/apache/paimon/io/KeyValueFileWriterFactory.java
index 1c2086f95..f0a322c2d 100644
---
a/paimon-core/src/main/java/org/apache/paimon/io/KeyValueFileWriterFactory.java
+++
b/paimon-core/src/main/java/org/apache/paimon/io/KeyValueFileWriterFactory.java
@@ -23,8 +23,8 @@ import org.apache.paimon.KeyValueSerializer;
import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FileFormat;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.types.RowType;
@@ -42,7 +42,7 @@ public class KeyValueFileWriterFactory {
private final RowType keyType;
private final RowType valueType;
private final FormatWriterFactory writerFactory;
- @Nullable private final FileStatsExtractor fileStatsExtractor;
+ @Nullable private final TableStatsExtractor tableStatsExtractor;
private final DataFilePathFactory pathFactory;
private final long suggestedFileSize;
private final Map<Integer, String> levelCompressions;
@@ -54,7 +54,7 @@ public class KeyValueFileWriterFactory {
RowType keyType,
RowType valueType,
FormatWriterFactory writerFactory,
- @Nullable FileStatsExtractor fileStatsExtractor,
+ @Nullable TableStatsExtractor tableStatsExtractor,
DataFilePathFactory pathFactory,
long suggestedFileSize,
Map<Integer, String> levelCompressions,
@@ -64,7 +64,7 @@ public class KeyValueFileWriterFactory {
this.keyType = keyType;
this.valueType = valueType;
this.writerFactory = writerFactory;
- this.fileStatsExtractor = fileStatsExtractor;
+ this.tableStatsExtractor = tableStatsExtractor;
this.pathFactory = pathFactory;
this.suggestedFileSize = suggestedFileSize;
this.levelCompressions = levelCompressions;
@@ -115,7 +115,7 @@ public class KeyValueFileWriterFactory {
kvSerializer::toRow,
keyType,
valueType,
- fileStatsExtractor,
+ tableStatsExtractor,
schemaId,
level,
compression);
diff --git
a/paimon-core/src/main/java/org/apache/paimon/io/RowDataFileWriter.java
b/paimon-core/src/main/java/org/apache/paimon/io/RowDataFileWriter.java
index 471e044b9..241f41ec8 100644
--- a/paimon-core/src/main/java/org/apache/paimon/io/RowDataFileWriter.java
+++ b/paimon-core/src/main/java/org/apache/paimon/io/RowDataFileWriter.java
@@ -20,8 +20,8 @@
package org.apache.paimon.io;
import org.apache.paimon.data.InternalRow;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.stats.BinaryTableStats;
@@ -49,7 +49,7 @@ public class RowDataFileWriter extends
StatsCollectingSingleFileWriter<InternalR
FormatWriterFactory factory,
Path path,
RowType writeSchema,
- @Nullable FileStatsExtractor fileStatsExtractor,
+ @Nullable TableStatsExtractor tableStatsExtractor,
long schemaId,
LongCounter seqNumCounter,
String fileCompression) {
@@ -59,7 +59,7 @@ public class RowDataFileWriter extends
StatsCollectingSingleFileWriter<InternalR
path,
Function.identity(),
writeSchema,
- fileStatsExtractor,
+ tableStatsExtractor,
fileCompression);
this.schemaId = schemaId;
this.seqNumCounter = seqNumCounter;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/io/StatsCollectingSingleFileWriter.java
b/paimon-core/src/main/java/org/apache/paimon/io/StatsCollectingSingleFileWriter.java
index 30a2be40b..03742b1d3 100644
---
a/paimon-core/src/main/java/org/apache/paimon/io/StatsCollectingSingleFileWriter.java
+++
b/paimon-core/src/main/java/org/apache/paimon/io/StatsCollectingSingleFileWriter.java
@@ -21,9 +21,9 @@ package org.apache.paimon.io;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FieldStatsCollector;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsCollector;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.types.RowType;
@@ -42,8 +42,8 @@ import java.util.function.Function;
*/
public abstract class StatsCollectingSingleFileWriter<T, R> extends
SingleFileWriter<T, R> {
- @Nullable private final FileStatsExtractor fileStatsExtractor;
- @Nullable private FieldStatsCollector fieldStatsCollector = null;
+ @Nullable private final TableStatsExtractor tableStatsExtractor;
+ @Nullable private TableStatsCollector tableStatsCollector = null;
public StatsCollectingSingleFileWriter(
FileIO fileIO,
@@ -51,29 +51,29 @@ public abstract class StatsCollectingSingleFileWriter<T, R>
extends SingleFileWr
Path path,
Function<T, InternalRow> converter,
RowType writeSchema,
- @Nullable FileStatsExtractor fileStatsExtractor,
+ @Nullable TableStatsExtractor tableStatsExtractor,
String compression) {
super(fileIO, factory, path, converter, compression);
- this.fileStatsExtractor = fileStatsExtractor;
- if (this.fileStatsExtractor == null) {
- this.fieldStatsCollector = new FieldStatsCollector(writeSchema);
+ this.tableStatsExtractor = tableStatsExtractor;
+ if (this.tableStatsExtractor == null) {
+ this.tableStatsCollector = new TableStatsCollector(writeSchema);
}
}
@Override
public void write(T record) throws IOException {
InternalRow rowData = writeImpl(record);
- if (fieldStatsCollector != null) {
- fieldStatsCollector.collect(rowData);
+ if (tableStatsCollector != null) {
+ tableStatsCollector.collect(rowData);
}
}
public FieldStats[] fieldStats() throws IOException {
Preconditions.checkState(closed, "Cannot access metric unless the
writer is closed.");
- if (fileStatsExtractor != null) {
- return fileStatsExtractor.extract(fileIO, path);
+ if (tableStatsExtractor != null) {
+ return tableStatsExtractor.extract(fileIO, path);
} else {
- return fieldStatsCollector.extract();
+ return tableStatsCollector.extract();
}
}
}
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 989502afa..e5da04c94 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
@@ -20,10 +20,10 @@ package org.apache.paimon.manifest;
import org.apache.paimon.CoreOptions;
import org.apache.paimon.annotation.VisibleForTesting;
-import org.apache.paimon.format.FieldStatsCollector;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FormatReaderFactory;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsCollector;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.io.RollingFileWriter;
@@ -100,7 +100,7 @@ public class ManifestFile extends
ObjectsFile<ManifestEntry> {
private class ManifestEntryWriter extends SingleFileWriter<ManifestEntry,
ManifestFileMeta> {
- private final FieldStatsCollector partitionStatsCollector;
+ private final TableStatsCollector partitionStatsCollector;
private final FieldStatsArraySerializer partitionStatsSerializer;
private long numAddedFiles = 0;
@@ -110,7 +110,7 @@ public class ManifestFile extends
ObjectsFile<ManifestEntry> {
ManifestEntryWriter(FormatWriterFactory factory, Path path, String
fileCompression) {
super(ManifestFile.this.fileIO, factory, path, serializer::toRow,
fileCompression);
- this.partitionStatsCollector = new
FieldStatsCollector(partitionType);
+ this.partitionStatsCollector = new
TableStatsCollector(partitionType);
this.partitionStatsSerializer = new
FieldStatsArraySerializer(partitionType);
}
diff --git
a/paimon-core/src/test/java/org/apache/paimon/format/FileStatsExtractingAvroFormat.java
b/paimon-core/src/test/java/org/apache/paimon/format/FileStatsExtractingAvroFormat.java
index 9aaccd56c..82ce6e2fd 100644
---
a/paimon-core/src/test/java/org/apache/paimon/format/FileStatsExtractingAvroFormat.java
+++
b/paimon-core/src/test/java/org/apache/paimon/format/FileStatsExtractingAvroFormat.java
@@ -20,7 +20,7 @@ package org.apache.paimon.format;
import org.apache.paimon.options.Options;
import org.apache.paimon.predicate.Predicate;
-import org.apache.paimon.stats.TestFileStatsExtractor;
+import org.apache.paimon.stats.TestTableStatsExtractor;
import org.apache.paimon.types.RowType;
import javax.annotation.Nullable;
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.Optional;
-/** An avro {@link FileFormat} for test. It provides a {@link
FileStatsExtractor}. */
+/** An avro {@link FileFormat} for test. It provides a {@link
TableStatsExtractor}. */
public class FileStatsExtractingAvroFormat extends FileFormat {
private final FileFormat avro;
@@ -55,7 +55,7 @@ public class FileStatsExtractingAvroFormat extends FileFormat
{
}
@Override
- public Optional<FileStatsExtractor> createStatsExtractor(RowType type) {
- return Optional.of(new TestFileStatsExtractor(this, type));
+ public Optional<TableStatsExtractor> createStatsExtractor(RowType type) {
+ return Optional.of(new TestTableStatsExtractor(this, type));
}
}
diff --git
a/paimon-core/src/test/java/org/apache/paimon/io/DataFileTestDataGenerator.java
b/paimon-core/src/test/java/org/apache/paimon/io/DataFileTestDataGenerator.java
index 0765be376..cbdcbf4ec 100644
---
a/paimon-core/src/test/java/org/apache/paimon/io/DataFileTestDataGenerator.java
+++
b/paimon-core/src/test/java/org/apache/paimon/io/DataFileTestDataGenerator.java
@@ -21,7 +21,7 @@ package org.apache.paimon.io;
import org.apache.paimon.KeyValue;
import org.apache.paimon.TestKeyValueGenerator;
import org.apache.paimon.data.BinaryRow;
-import org.apache.paimon.format.FieldStatsCollector;
+import org.apache.paimon.format.TableStatsCollector;
import org.apache.paimon.stats.FieldStatsArraySerializer;
import java.util.ArrayList;
@@ -99,10 +99,10 @@ public class DataFileTestDataGenerator {
}
private Data createDataFile(List<KeyValue> kvs, int level, BinaryRow
partition, int bucket) {
- FieldStatsCollector keyStatsCollector =
- new FieldStatsCollector(TestKeyValueGenerator.KEY_TYPE);
- FieldStatsCollector valueStatsCollector =
- new
FieldStatsCollector(TestKeyValueGenerator.DEFAULT_ROW_TYPE);
+ TableStatsCollector keyStatsCollector =
+ new TableStatsCollector(TestKeyValueGenerator.KEY_TYPE);
+ TableStatsCollector valueStatsCollector =
+ new
TableStatsCollector(TestKeyValueGenerator.DEFAULT_ROW_TYPE);
FieldStatsArraySerializer keyStatsSerializer =
new FieldStatsArraySerializer(TestKeyValueGenerator.KEY_TYPE);
FieldStatsArraySerializer valueStatsSerializer =
diff --git
a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestTestDataGenerator.java
b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestTestDataGenerator.java
index 260fcfad5..81098d767 100644
---
a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestTestDataGenerator.java
+++
b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestTestDataGenerator.java
@@ -21,7 +21,7 @@ package org.apache.paimon.manifest;
import org.apache.paimon.KeyValue;
import org.apache.paimon.TestKeyValueGenerator;
import org.apache.paimon.data.BinaryRow;
-import org.apache.paimon.format.FieldStatsCollector;
+import org.apache.paimon.format.TableStatsCollector;
import org.apache.paimon.io.DataFileTestDataGenerator;
import org.apache.paimon.stats.FieldStatsArraySerializer;
import org.apache.paimon.utils.Preconditions;
@@ -82,8 +82,8 @@ public class ManifestTestDataGenerator {
Preconditions.checkArgument(
!entries.isEmpty(), "Manifest entries are empty. Invalid test
data.");
- FieldStatsCollector collector =
- new
FieldStatsCollector(TestKeyValueGenerator.DEFAULT_PART_TYPE);
+ TableStatsCollector collector =
+ new
TableStatsCollector(TestKeyValueGenerator.DEFAULT_PART_TYPE);
FieldStatsArraySerializer serializer =
new
FieldStatsArraySerializer(TestKeyValueGenerator.DEFAULT_PART_TYPE);
diff --git
a/paimon-core/src/test/java/org/apache/paimon/stats/FieldStatsCollectorTest.java
b/paimon-core/src/test/java/org/apache/paimon/stats/TableStatsCollectorTest.java
similarity index 95%
rename from
paimon-core/src/test/java/org/apache/paimon/stats/FieldStatsCollectorTest.java
rename to
paimon-core/src/test/java/org/apache/paimon/stats/TableStatsCollectorTest.java
index 111d738c2..57f137d01 100644
---
a/paimon-core/src/test/java/org/apache/paimon/stats/FieldStatsCollectorTest.java
+++
b/paimon-core/src/test/java/org/apache/paimon/stats/TableStatsCollectorTest.java
@@ -22,7 +22,7 @@ import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.GenericArray;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FieldStatsCollector;
+import org.apache.paimon.format.TableStatsCollector;
import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.IntType;
import org.apache.paimon.types.RowType;
@@ -32,14 +32,14 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link FieldStatsCollector}. */
-public class FieldStatsCollectorTest {
+/** Tests for {@link TableStatsCollector}. */
+public class TableStatsCollectorTest {
@Test
public void testCollect() {
RowType rowType =
RowType.of(new IntType(), new VarCharType(10), new
ArrayType(new IntType()));
- FieldStatsCollector collector = new FieldStatsCollector(rowType);
+ TableStatsCollector collector = new TableStatsCollector(rowType);
collector.collect(
GenericRow.of(
diff --git
a/paimon-core/src/test/java/org/apache/paimon/stats/TestFileStatsExtractor.java
b/paimon-core/src/test/java/org/apache/paimon/stats/TestTableStatsExtractor.java
similarity index 84%
rename from
paimon-core/src/test/java/org/apache/paimon/stats/TestFileStatsExtractor.java
rename to
paimon-core/src/test/java/org/apache/paimon/stats/TestTableStatsExtractor.java
index c77a30610..2146c1bca 100644
---
a/paimon-core/src/test/java/org/apache/paimon/stats/TestFileStatsExtractor.java
+++
b/paimon-core/src/test/java/org/apache/paimon/stats/TestTableStatsExtractor.java
@@ -20,10 +20,10 @@ package org.apache.paimon.stats;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FieldStatsCollector;
import org.apache.paimon.format.FileFormat;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatReaderFactory;
+import org.apache.paimon.format.TableStatsCollector;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.types.RowType;
@@ -34,15 +34,15 @@ import java.io.IOException;
import java.util.List;
/**
- * {@link FileStatsExtractor} for test. It reads all records from the file and
use {@link
- * FieldStatsCollector} to collect the stats.
+ * {@link TableStatsExtractor} for test. It reads all records from the file
and use {@link
+ * TableStatsCollector} to collect the stats.
*/
-public class TestFileStatsExtractor implements FileStatsExtractor {
+public class TestTableStatsExtractor implements TableStatsExtractor {
private final FileFormat format;
private final RowType rowType;
- public TestFileStatsExtractor(FileFormat format, RowType rowType) {
+ public TestTableStatsExtractor(FileFormat format, RowType rowType) {
this.format = format;
this.rowType = rowType;
}
@@ -53,7 +53,7 @@ public class TestFileStatsExtractor implements
FileStatsExtractor {
FormatReaderFactory readerFactory =
format.createReaderFactory(rowType);
List<InternalRow> records =
FileUtils.readListFromFile(fileIO, path, serializer,
readerFactory);
- FieldStatsCollector statsCollector = new FieldStatsCollector(rowType);
+ TableStatsCollector statsCollector = new TableStatsCollector(rowType);
for (InternalRow record : records) {
statsCollector.collect(record);
}
diff --git
a/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcFileFormat.java
b/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcFileFormat.java
index 0fc7113ac..5677973c6 100644
---
a/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcFileFormat.java
+++
b/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcFileFormat.java
@@ -22,12 +22,12 @@ import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FileFormatFactory.FormatContext;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatReaderFactory;
import org.apache.paimon.format.FormatWriterFactory;
-import org.apache.paimon.format.orc.filter.OrcFileStatsExtractor;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.format.orc.filter.OrcFilters;
import org.apache.paimon.format.orc.filter.OrcPredicateFunctionVisitor;
+import org.apache.paimon.format.orc.filter.OrcTableStatsExtractor;
import org.apache.paimon.format.orc.reader.OrcSplitReaderUtil;
import org.apache.paimon.format.orc.writer.RowDataVectorizer;
import org.apache.paimon.format.orc.writer.Vectorizer;
@@ -86,8 +86,8 @@ public class OrcFileFormat extends FileFormat {
}
@Override
- public Optional<FileStatsExtractor> createStatsExtractor(RowType type) {
- return Optional.of(new OrcFileStatsExtractor(type));
+ public Optional<TableStatsExtractor> createStatsExtractor(RowType type) {
+ return Optional.of(new OrcTableStatsExtractor(type));
}
@Override
diff --git
a/paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcFileStatsExtractor.java
b/paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcTableStatsExtractor.java
similarity index 97%
rename from
paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcFileStatsExtractor.java
rename to
paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcTableStatsExtractor.java
index c9a7e28d9..800024547 100644
---
a/paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcFileStatsExtractor.java
+++
b/paimon-format/src/main/java/org/apache/paimon/format/orc/filter/OrcTableStatsExtractor.java
@@ -22,7 +22,7 @@ import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.Decimal;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FileStatsExtractor;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.format.orc.OrcReaderFactory;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
@@ -49,12 +49,12 @@ import java.sql.Date;
import java.util.List;
import java.util.stream.IntStream;
-/** {@link FileStatsExtractor} for orc files. */
-public class OrcFileStatsExtractor implements FileStatsExtractor {
+/** {@link TableStatsExtractor} for orc files. */
+public class OrcTableStatsExtractor implements TableStatsExtractor {
private final RowType rowType;
- public OrcFileStatsExtractor(RowType rowType) {
+ public OrcTableStatsExtractor(RowType rowType) {
this.rowType = rowType;
}
diff --git
a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileFormat.java
b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileFormat.java
index ed2553a2b..dea46559b 100644
---
a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileFormat.java
+++
b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileFormat.java
@@ -21,9 +21,9 @@ package org.apache.paimon.format.parquet;
import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FileFormatFactory.FormatContext;
-import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatReaderFactory;
import org.apache.paimon.format.FormatWriterFactory;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.format.parquet.writer.RowDataParquetBuilder;
import org.apache.paimon.options.Options;
import org.apache.paimon.predicate.Predicate;
@@ -72,8 +72,8 @@ public class ParquetFileFormat extends FileFormat {
}
@Override
- public Optional<FileStatsExtractor> createStatsExtractor(RowType type) {
- return Optional.of(new ParquetFileStatsExtractor(type));
+ public Optional<TableStatsExtractor> createStatsExtractor(RowType type) {
+ return Optional.of(new ParquetTableStatsExtractor(type));
}
public static Options getParquetConfiguration(Options options) {
diff --git
a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractor.java
b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractor.java
similarity index 97%
rename from
paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractor.java
rename to
paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractor.java
index fa321bcf0..115d9879c 100644
---
a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractor.java
+++
b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractor.java
@@ -22,7 +22,7 @@ import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.Decimal;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.format.FieldStats;
-import org.apache.paimon.format.FileStatsExtractor;
+import org.apache.paimon.format.TableStatsExtractor;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.types.DataField;
@@ -52,14 +52,14 @@ import java.util.stream.IntStream;
import static org.apache.paimon.format.parquet.ParquetUtil.assertStatsClass;
-/** {@link FileStatsExtractor} for parquet files. */
-public class ParquetFileStatsExtractor implements FileStatsExtractor {
+/** {@link TableStatsExtractor} for parquet files. */
+public class ParquetTableStatsExtractor implements TableStatsExtractor {
private final RowType rowType;
private static final OffsetDateTime EPOCH =
Instant.ofEpochSecond(0).atOffset(ZoneOffset.UTC);
private static final LocalDate EPOCH_DAY = EPOCH.toLocalDate();
- public ParquetFileStatsExtractor(RowType rowType) {
+ public ParquetTableStatsExtractor(RowType rowType) {
this.rowType = rowType;
}
diff --git
a/paimon-format/src/test/java/org/apache/paimon/format/orc/OrcFileStatsExtractorTest.java
b/paimon-format/src/test/java/org/apache/paimon/format/orc/OrcTableStatsExtractorTest.java
similarity index 92%
rename from
paimon-format/src/test/java/org/apache/paimon/format/orc/OrcFileStatsExtractorTest.java
rename to
paimon-format/src/test/java/org/apache/paimon/format/orc/OrcTableStatsExtractorTest.java
index e3f983bee..d5a899b65 100644
---
a/paimon-format/src/test/java/org/apache/paimon/format/orc/OrcFileStatsExtractorTest.java
+++
b/paimon-format/src/test/java/org/apache/paimon/format/orc/OrcTableStatsExtractorTest.java
@@ -19,8 +19,8 @@
package org.apache.paimon.format.orc;
import org.apache.paimon.format.FileFormat;
-import org.apache.paimon.format.FileStatsExtractorTestBase;
-import org.apache.paimon.format.orc.filter.OrcFileStatsExtractor;
+import org.apache.paimon.format.TableStatsExtractorTestBase;
+import org.apache.paimon.format.orc.filter.OrcTableStatsExtractor;
import org.apache.paimon.options.Options;
import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.BigIntType;
@@ -43,8 +43,8 @@ import org.apache.paimon.types.TinyIntType;
import org.apache.paimon.types.VarBinaryType;
import org.apache.paimon.types.VarCharType;
-/** Tests for {@link OrcFileStatsExtractor}. */
-public class OrcFileStatsExtractorTest extends FileStatsExtractorTestBase {
+/** Tests for {@link OrcTableStatsExtractor}. */
+public class OrcTableStatsExtractorTest extends TableStatsExtractorTestBase {
@Override
protected FileFormat createFormat() {
diff --git
a/paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractorTest.java
b/paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractorTest.java
similarity index 95%
rename from
paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractorTest.java
rename to
paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractorTest.java
index 34f2abbd2..5f10de670 100644
---
a/paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetFileStatsExtractorTest.java
+++
b/paimon-format/src/test/java/org/apache/paimon/format/parquet/ParquetTableStatsExtractorTest.java
@@ -20,7 +20,7 @@ package org.apache.paimon.format.parquet;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FileFormat;
-import org.apache.paimon.format.FileStatsExtractorTestBase;
+import org.apache.paimon.format.TableStatsExtractorTestBase;
import org.apache.paimon.options.Options;
import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.BigIntType;
@@ -42,8 +42,8 @@ import org.apache.paimon.types.TinyIntType;
import org.apache.paimon.types.VarBinaryType;
import org.apache.paimon.types.VarCharType;
-/** Tests for {@link ParquetFileStatsExtractor}. */
-public class ParquetFileStatsExtractorTest extends FileStatsExtractorTestBase {
+/** Tests for {@link ParquetTableStatsExtractor}. */
+public class ParquetTableStatsExtractorTest extends
TableStatsExtractorTestBase {
@Override
protected FileFormat createFormat() {
