Skip to content

Commit 3e3bb7b

Browse files
committed
remove outdated comment
1 parent 0c60cce commit 3e3bb7b

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ public static Optional<TableInfo> parseMetadata(@NotNull final Map<String, Strin
110110
/**
111111
* Obtain schema information from a parquet file
112112
*
113-
* @param schema Parquet schema. DO NOT RELY ON {@link ParquetMetadataConverter} FOR THIS! USE
114-
* {@link ParquetFileReader}!
113+
* @param schema Parquet schema
115114
* @param keyValueMetadata Parquet key-value metadata map
116115
* @param readInstructions Parquet read instructions specifying transformations like column mappings and codecs.
117116
* Note a new read instructions based on this one may be returned by this method to provide necessary
@@ -274,8 +273,7 @@ public static ParquetInstructions readParquetSchema(
274273
/**
275274
* Convert schema information from a {@link ParquetMetadata} into {@link ColumnDefinition ColumnDefinitions}.
276275
*
277-
* @param schema Parquet schema. DO NOT RELY ON {@link ParquetMetadataConverter} FOR THIS! USE
278-
* {@link ParquetFileReader}!
276+
* @param schema Parquet schema
279277
* @param keyValueMetadata Parquet key-value metadata map
280278
* @param readInstructionsIn Input conversion {@link ParquetInstructions}
281279
* @return A {@link Pair} with {@link ColumnDefinition ColumnDefinitions} and adjusted {@link ParquetInstructions}

extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetMetadataFileLayout.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ private ParquetMetadataFileLayout(
121121
if (inputInstructions.getTableDefinition().isEmpty()) {
122122
// Infer the definition from the metadata file
123123
final Pair<List<ColumnDefinition<?>>, ParquetInstructions> leafSchemaInfo =
124-
convertSchema(metadataFileMetadata.getFileMetaData(), inputInstructions);
124+
convertSchema(metadataFileMetadata, inputInstructions);
125125
if (channelsProvider.exists(commonMetadataFileURI)) {
126126
// Infer the partitioning columns using the common metadata file
127127
final ParquetFileReader commonMetadataFileReader =
128128
ParquetFileReader.create(commonMetadataFileURI, channelsProvider);
129-
final Pair<List<ColumnDefinition<?>>, ParquetInstructions> fullSchemaInfo = convertSchema(
130-
commonMetadataFileReader.getMetadata().getFileMetaData(), leafSchemaInfo.getSecond());
129+
final Pair<List<ColumnDefinition<?>>, ParquetInstructions> fullSchemaInfo =
130+
convertSchema(commonMetadataFileReader.getMetadata(), leafSchemaInfo.getSecond());
131131
final Collection<ColumnDefinition<?>> adjustedColumnDefinitions = new ArrayList<>();
132132
final Map<String, ColumnDefinition<?>> leafDefinitionsMap =
133133
leafSchemaInfo.getFirst().stream()
@@ -230,15 +230,14 @@ private ParquetMetadataFileLayout(
230230
}
231231

232232
private static Pair<List<ColumnDefinition<?>>, ParquetInstructions> convertSchema(
233-
FileMetaData fileMetadata,
233+
ParquetMetadata metadata,
234234
@NotNull ParquetInstructions readInstructionsIn) {
235235
return ParquetSchemaReader.convertSchema(
236-
fileMetadata.getSchema(),
237-
fileMetadata.getKeyValueMetaData(),
236+
metadata.getFileMetaData().getSchema(),
237+
metadata.getFileMetaData().getKeyValueMetaData(),
238238
readInstructionsIn);
239239
}
240240

241-
242241
/**
243242
* This method takes the {@link ParquetMetadata} from the metadata file, extracts the key-value metadata specific to
244243
* the provided file, and creates a new {@link ParquetMetadata} for this file.

0 commit comments

Comments
 (0)