diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java index 28c9f81e353..2cfe69349e5 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java @@ -96,7 +96,7 @@ public static ParquetInstructions readParquetSchema( @NotNull final ParquetInstructions readInstructions, @NotNull final ColumnDefinitionConsumer consumer, @NotNull final BiFunction, String> legalizeColumnNameFunc) throws IOException { - final ParquetFileReader parquetFileReader = ParquetTools.getParquetFileReaderIo(new File(filePath)); + final ParquetFileReader parquetFileReader = ParquetTools.getParquetFileReaderChecked(new File(filePath)); final ParquetMetadata parquetMetadata = new ParquetMetadataConverter().fromParquetMetadata(parquetFileReader.fileMetaData); return readParquetSchema(parquetFileReader.getSchema(), parquetMetadata.getFileMetaData().getKeyValueMetaData(), diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java index ab5631734cb..883819a93ae 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java @@ -611,14 +611,15 @@ private static ParquetSchemaReader.ColumnDefinitionConsumer makeSchemaReaderCons } /** - * Make a {@link ParquetFileReader} for the supplied {@link File}. + * Make a {@link ParquetFileReader} for the supplied {@link File}. Wraps {@link IOException} as + * {@link TableDataException}. * * @param parquetFile The {@link File} to read * @return The new {@link ParquetFileReader} */ public static ParquetFileReader getParquetFileReader(@NotNull final File parquetFile) { try { - return getParquetFileReaderIo(parquetFile); + return getParquetFileReaderChecked(parquetFile); } catch (IOException e) { throw new TableDataException("Failed to create Parquet file reader: " + parquetFile, e); } @@ -631,7 +632,7 @@ public static ParquetFileReader getParquetFileReader(@NotNull final File parquet * @return The new {@link ParquetFileReader} * @throws IOException if an IO exception occurs */ - public static ParquetFileReader getParquetFileReaderIo(@NotNull File parquetFile) throws IOException { + public static ParquetFileReader getParquetFileReaderChecked(@NotNull File parquetFile) throws IOException { return new ParquetFileReader( parquetFile.getAbsolutePath(), new CachedChannelProvider( diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java index 1cb75f73072..4a7d277863a 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java @@ -4,7 +4,6 @@ package io.deephaven.parquet.table.layout; import io.deephaven.parquet.table.location.ParquetTableLocationKey; -import io.deephaven.parquet.table.ParquetTableWriter; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java index a96d10ed1e4..8e1292be3d6 100644 --- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java +++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java @@ -71,7 +71,8 @@ public String getImplementationName() { *
  • is a corrupt parquet file
  • * * - * Callers wishing to handle these cases more explicit may call {@link ParquetTools#getParquetFileReaderIo(File)}. + * Callers wishing to handle these cases more explicit may call + * {@link ParquetTools#getParquetFileReaderChecked(File)}. * * @return true if the file reader exists or was successfully created */ @@ -80,7 +81,7 @@ public synchronized boolean verifyFileReader() { return true; } try { - fileReader = ParquetTools.getParquetFileReaderIo(file); + fileReader = ParquetTools.getParquetFileReaderChecked(file); } catch (IOException e) { return false; }