Skip to content

Commit 1193df6

Browse files
committed
apacheGH-3817: Pass a missing chunker as null, like a missing bloom filter writer
The column writer resolves it to the no-op chunker once, as the value collector resolves a missing bloom filter writer to a no-op bloom filter.
1 parent 66b540c commit 1193df6

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public ColumnWriter getColumnWriter(ColumnDescriptor path) {
138138
Map<ColumnDescriptor, ColumnWriterBase> mcolumns = new TreeMap<>();
139139
for (ColumnDescriptor path : schema.getColumns()) {
140140
PageWriter pageWriter = pageWriteStore.getPageWriter(path);
141-
ContentDefinedChunker chunker =
142-
columnChunkers != null ? columnChunkers.next() : ContentDefinedChunker.noop();
141+
ContentDefinedChunker chunker = columnChunkers != null ? columnChunkers.next() : null;
143142
if (props.isBloomFilterEnabled(path)) {
144143
BloomFilterWriter bloomFilterWriter = bloomFilterWriteStore.getBloomFilterWriter(path);
145144
mcolumns.put(path, createColumnWriterBase(path, pageWriter, bloomFilterWriter, chunker, props));
@@ -164,7 +163,7 @@ private ColumnWriterBase createColumnWriterBase(
164163
PageWriter pageWriter,
165164
BloomFilterWriter bloomFilterWriter,
166165
ParquetProperties props) {
167-
return createColumnWriterBase(path, pageWriter, bloomFilterWriter, ContentDefinedChunker.noop(), props);
166+
return createColumnWriterBase(path, pageWriter, bloomFilterWriter, null, props);
168167
}
169168

170169
private ColumnWriterBase createColumnWriterBase(

‎parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ abstract class ColumnWriterBase implements ColumnWriter {
6363
private final ContentDefinedChunker chunker;
6464

6565
ColumnWriterBase(ColumnDescriptor path, PageWriter pageWriter, ParquetProperties props) {
66-
this(path, pageWriter, null, ContentDefinedChunker.noop(), props);
66+
this(path, pageWriter, null, null, props);
6767
}
6868

6969
ColumnWriterBase(
@@ -80,7 +80,7 @@ abstract class ColumnWriterBase implements ColumnWriter {
8080
this.dataColumn = props.newValuesWriter(path);
8181

8282
this.collector = new ColumnValueCollector(path, bloomFilterWriter, props);
83-
this.chunker = chunker;
83+
this.chunker = chunker != null ? chunker : ContentDefinedChunker.noop();
8484
}
8585

8686
void initStatusManager(StatusManager statusManager) {

0 commit comments

Comments
 (0)