pvary commented on code in PR #12298:
URL: https://github.com/apache/iceberg/pull/12298#discussion_r2382325229
##########
parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java:
##########
@@ -1315,61 +1676,12 @@ public <D> CloseableIterable<D> build() {
Preconditions.checkState(fileAADPrefix == null, "AAD prefix set with
null encryption key");
}
- if (readerFunc != null || readerFuncWithSchema != null ||
batchedReaderFunc != null) {
- ParquetReadOptions.Builder optionsBuilder;
- if (file instanceof HadoopInputFile) {
- // remove read properties already set that may conflict with this
read
- Configuration conf = new Configuration(((HadoopInputFile)
file).getConf());
- for (String property : READ_PROPERTIES_TO_REMOVE) {
- conf.unset(property);
- }
- optionsBuilder = HadoopReadOptions.builder(conf);
- } else {
- optionsBuilder = ParquetReadOptions.builder(new
PlainParquetConfiguration());
- }
-
- for (Map.Entry<String, String> entry : properties.entrySet()) {
- optionsBuilder.set(entry.getKey(), entry.getValue());
- }
-
- if (start != null) {
- optionsBuilder.withRange(start, start + length);
- }
-
- if (fileDecryptionProperties != null) {
- optionsBuilder.withDecryption(fileDecryptionProperties);
- }
-
- ParquetReadOptions options = optionsBuilder.build();
-
- NameMapping mapping;
- if (nameMapping != null) {
- mapping = nameMapping;
- } else if
(SystemConfigs.NETFLIX_UNSAFE_PARQUET_ID_FALLBACK_ENABLED.value()) {
- mapping = null;
- } else {
- mapping = NameMapping.empty();
- }
-
- if (batchedReaderFunc != null) {
- return new VectorizedParquetReader<>(
- file,
- schema,
- options,
- batchedReaderFunc,
- mapping,
- filter,
- reuseContainers,
- caseSensitive,
- maxRecordsPerBatch);
- } else {
- Function<MessageType, ParquetValueReader<?>> readBuilder =
- readerFuncWithSchema != null
- ? fileType -> readerFuncWithSchema.apply(schema, fileType)
- : readerFunc;
- return new org.apache.iceberg.parquet.ParquetReader<>(
- file, schema, options, readBuilder, mapping, filter,
reuseContainers, caseSensitive);
- }
+ if (readerFunc != null
+ || readerFuncWithSchema != null
+ || batchedReaderFunc != null
+ || readerFunction != null
+ || batchReaderFunction != null) {
+ return buildFunctionBasedReader(options(fileDecryptionProperties));
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
