Reduce public visibility into io.deephaven.parquet.base (#5093)

deephaven · Feb 12, 2024 · 78e7460 · 78e7460
1 parent 168ff34
commit 78e7460
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 63 deletions.
diff --git a/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/AbstractBulkValuesWriter.java b/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/AbstractBulkValuesWriter.java
@@ -17,7 +17,7 @@
  *
  * @param <BUFFER_TYPE>
  */
-public abstract class AbstractBulkValuesWriter<BUFFER_TYPE> extends ValuesWriter
+abstract class AbstractBulkValuesWriter<BUFFER_TYPE> extends ValuesWriter
         implements BulkWriter<BUFFER_TYPE> {
     private static final int RL_FIRST_ELEM = 0;
     private static final int RL_CONSECUTIVE_ELEM = 1;

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BulkWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BulkWriter.java
@@ -16,7 +16,7 @@
  * Provides the option to write values of specific type in bulk The concrete type of the bulkValue object depends on the
  * specific implementation
  */
-public interface BulkWriter<BUFFER_TYPE> {
+interface BulkWriter<BUFFER_TYPE> {
     class WriteResult {
         final int valueCount;
         final IntBuffer nullOffsets;

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java
@@ -37,7 +37,7 @@
 import static org.apache.parquet.format.Encoding.PLAIN_DICTIONARY;
 import static org.apache.parquet.format.Encoding.RLE_DICTIONARY;
 
-public class ColumnChunkReaderImpl implements ColumnChunkReader {
+final class ColumnChunkReaderImpl implements ColumnChunkReader {
 
     private final ColumnChunk columnChunk;
     private final SeekableChannelsProvider channelsProvider;
@@ -50,7 +50,7 @@ public class ColumnChunkReaderImpl implements ColumnChunkReader {
     private final OffsetIndex offsetIndex;
     private final List<Type> fieldTypes;
     private final Function<SeekableChannelContext, Dictionary> dictionarySupplier;
-    private final PageMaterializer.Factory nullMaterializerFactory;
+    private final PageMaterializerFactory nullMaterializerFactory;
 
     private URI uri;
     /**

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java
@@ -5,8 +5,6 @@
 
 import io.deephaven.base.Pair;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.parquet.base.util.Helpers;
-import io.deephaven.parquet.base.util.RunLengthBitPackingHybridBufferDecoder;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
 import io.deephaven.parquet.compress.CompressorAdapter;
@@ -41,7 +39,7 @@
 
 import static org.apache.parquet.column.ValuesType.VALUES;
 
-public class ColumnPageReaderImpl implements ColumnPageReader {
+final class ColumnPageReaderImpl implements ColumnPageReader {
 
     private static final int MAX_HEADER = 8192;
     private static final int START_HEADER = 128;
@@ -51,7 +49,7 @@ public class ColumnPageReaderImpl implements ColumnPageReader {
     private final SeekableChannelsProvider channelsProvider;
     private final CompressorAdapter compressorAdapter;
     private final Function<SeekableChannelContext, Dictionary> dictionarySupplier;
-    private final PageMaterializer.Factory pageMaterializerFactory;
+    private final PageMaterializerFactory pageMaterializerFactory;
     private final ColumnDescriptor path;
     private final URI uri;
     private final List<Type> fieldTypes;
@@ -85,7 +83,7 @@ public class ColumnPageReaderImpl implements ColumnPageReader {
     ColumnPageReaderImpl(SeekableChannelsProvider channelsProvider,
             CompressorAdapter compressorAdapter,
             Function<SeekableChannelContext, Dictionary> dictionarySupplier,
-            PageMaterializer.Factory materializerFactory,
+            PageMaterializerFactory materializerFactory,
             ColumnDescriptor path,
             URI uri,
             List<Type> fieldTypes,
@@ -432,7 +430,7 @@ private Object readPageV1(DataPageV1 page, Object nullValue,
         }
     }
 
-    private Object materialize(PageMaterializer.Factory factory,
+    private Object materialize(PageMaterializerFactory factory,
             RunLengthBitPackingHybridBufferDecoder dlDecoder,
             RunLengthBitPackingHybridBufferDecoder rlDecoder, ValuesReader dataReader, Object nullValue)
             throws IOException {
@@ -507,7 +505,7 @@ private void readKeysNonNulls(IntBuffer keysBuffer, ValuesReader dataReader)
         }
     }
 
-    private static Object materializeWithNulls(PageMaterializer.Factory factory,
+    private static Object materializeWithNulls(PageMaterializerFactory factory,
             int numberOfValues,
             IntBuffer nullOffsets,
             ValuesReader dataReader, Object nullValue) {
@@ -553,7 +551,7 @@ private static IntBuffer combineOptionalAndRepeating(IntBuffer nullOffsets, IntB
         return result;
     }
 
-    private Object materializeWithNulls(PageMaterializer.Factory factory,
+    private Object materializeWithNulls(PageMaterializerFactory factory,
             RunLengthBitPackingHybridBufferDecoder dlDecoder,
             RunLengthBitPackingHybridBufferDecoder rlDecoder, ValuesReader dataReader, Object nullValue)
             throws IOException {
@@ -594,7 +592,7 @@ private Object materializeWithNulls(PageMaterializer.Factory factory,
         return new DataWithMultiLevelOffsets(offsetsWithNull.toArray(new IntBuffer[0]), values);
     }
 
-    private static Object materializeNonNull(PageMaterializer.Factory factory, int numberOfValues,
+    private static Object materializeNonNull(PageMaterializerFactory factory, int numberOfValues,
             ValuesReader dataReader) {
         return factory.makeMaterializerNonNull(dataReader, numberOfValues).fillAll();
     }

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java
@@ -36,7 +36,7 @@
 import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
 import static org.apache.parquet.format.Util.writePageHeader;
 
-public final class ColumnWriterImpl implements ColumnWriter {
+final class ColumnWriterImpl implements ColumnWriter {
 
     private static final int MIN_SLAB_SIZE = 64;
 

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/GenericArrayBuffer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/GenericArrayBuffer.java
diff --git a/.../deephaven/parquet/base/util/Helpers.java → ...va/io/deephaven/parquet/base/Helpers.java b/.../deephaven/parquet/base/util/Helpers.java → ...va/io/deephaven/parquet/base/Helpers.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
-package io.deephaven.parquet.base.util;
+package io.deephaven.parquet.base;
 
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.bytes.BytesUtils;
@@ -13,7 +13,7 @@
 import java.nio.IntBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-public class Helpers {
+final class Helpers {
     public static void readBytes(ReadableByteChannel f, byte[] buffer) throws IOException {
         readExact(f, ByteBuffer.wrap(buffer));
     }

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java
@@ -10,13 +10,8 @@
 import java.util.Arrays;
 
 interface PageMaterializer {
-    interface Factory {
-        PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues);
 
-        PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues);
-    }
-
-    Factory IntFactory = new Factory() {
+    PageMaterializerFactory IntFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new IntMaterializer(dataReader, (int) nullValue, numValues);
@@ -28,7 +23,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    Factory LongFactory = new Factory() {
+    PageMaterializerFactory LongFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LongMaterializer(dataReader, (long) nullValue, numValues);
@@ -40,7 +35,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    Factory FloatFactory = new Factory() {
+    PageMaterializerFactory FloatFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new FloatMaterializer(dataReader, (float) nullValue, numValues);
@@ -52,7 +47,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    Factory DoubleFactory = new Factory() {
+    PageMaterializerFactory DoubleFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new DoubleMaterializer(dataReader, (double) nullValue, numValues);
@@ -64,7 +59,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    Factory BoolFactory = new Factory() {
+    PageMaterializerFactory BoolFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new BoolMaterializer(dataReader, (byte) nullValue, numValues);
@@ -76,7 +71,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    Factory BlobFactory = new Factory() {
+    PageMaterializerFactory BlobFactory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new BlobMaterializer(dataReader, (Binary) nullValue, numValues);
@@ -88,7 +83,7 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
         }
     };
 
-    static Factory factoryForType(PrimitiveType.PrimitiveTypeName primitiveTypeName) {
+    static PageMaterializerFactory factoryForType(PrimitiveType.PrimitiveTypeName primitiveTypeName) {
         switch (primitiveTypeName) {
             case INT32:
                 return IntFactory;

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ */
+package io.deephaven.parquet.base;
+
+import org.apache.parquet.column.values.ValuesReader;
+
+interface PageMaterializerFactory {
+    PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues);
+
+    PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues);
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
 import org.apache.parquet.format.*;

diff --git a/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainBinaryChunkedWriter.java b/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainBinaryChunkedWriter.java
@@ -4,7 +4,6 @@
 package io.deephaven.parquet.base;
 
 import io.deephaven.base.ArrayUtil;
-import io.deephaven.parquet.base.util.Helpers;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.column.Encoding;
@@ -21,7 +20,7 @@
 /**
  * Plain encoding except for binary values
  */
-public class PlainBinaryChunkedWriter extends AbstractBulkValuesWriter<Binary[]> {
+final class PlainBinaryChunkedWriter extends AbstractBulkValuesWriter<Binary[]> {
 
     private static final int MAXIMUM_TOTAL_CAPACITY = ArrayUtil.MAX_ARRAY_SIZE;
 

diff --git a/...sions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainBooleanChunkedWriter.java b/...sions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainBooleanChunkedWriter.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.column.Encoding;
@@ -19,7 +18,7 @@
 /**
  * Plain encoding except for booleans
  */
-public class PlainBooleanChunkedWriter extends AbstractBulkValuesWriter<ByteBuffer> {
+final class PlainBooleanChunkedWriter extends AbstractBulkValuesWriter<ByteBuffer> {
     private final BooleanPlainValuesWriter writer;
     private IntBuffer nullOffsets;
 

diff --git a/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainDoubleChunkedWriter.java b/...nsions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainDoubleChunkedWriter.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
@@ -26,7 +25,7 @@
 /**
  * A writer for encoding doubles in the PLAIN format
  */
-public class PlainDoubleChunkedWriter extends AbstractBulkValuesWriter<DoubleBuffer> {
+final class PlainDoubleChunkedWriter extends AbstractBulkValuesWriter<DoubleBuffer> {
     private static final int MAXIMUM_TOTAL_CAPACITY = Integer.MAX_VALUE / Double.BYTES;
     private final ByteBufferAllocator allocator;
 

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainFloatChunkedWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainFloatChunkedWriter.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
@@ -26,7 +25,7 @@
 /**
  * A writer for encoding floats in the PLAIN format
  */
-public class PlainFloatChunkedWriter extends AbstractBulkValuesWriter<FloatBuffer> {
+final class PlainFloatChunkedWriter extends AbstractBulkValuesWriter<FloatBuffer> {
     private static final int MAXIMUM_TOTAL_CAPACITY = Integer.MAX_VALUE / Float.BYTES;
     private final ByteBufferAllocator allocator;
 

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainIntChunkedWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainIntChunkedWriter.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
@@ -20,7 +19,7 @@
 /**
  * A writer for encoding ints in the PLAIN format
  */
-public class PlainIntChunkedWriter extends AbstractBulkValuesWriter<IntBuffer> {
+final class PlainIntChunkedWriter extends AbstractBulkValuesWriter<IntBuffer> {
     private static final int MAXIMUM_TOTAL_CAPACITY = Integer.MAX_VALUE / Integer.BYTES;
 
     /**

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainLongChunkedWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PlainLongChunkedWriter.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
@@ -26,7 +25,7 @@
 /**
  * A writer for encoding longs in the PLAIN format
  */
-public class PlainLongChunkedWriter extends AbstractBulkValuesWriter<LongBuffer> {
+final class PlainLongChunkedWriter extends AbstractBulkValuesWriter<LongBuffer> {
     private static final int MAXIMUM_TOTAL_CAPACITY = Integer.MAX_VALUE / Long.BYTES;
     private final ByteBufferAllocator allocator;
 

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RleIntChunkedWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RleIntChunkedWriter.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.util.Helpers;
 import io.deephaven.util.QueryConstants;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.bytes.BytesInput;
@@ -24,7 +23,7 @@
 /**
  * Plain encoding except for booleans
  */
-public class RleIntChunkedWriter extends AbstractBulkValuesWriter<IntBuffer> {
+final class RleIntChunkedWriter extends AbstractBulkValuesWriter<IntBuffer> {
     private static final Logger LOG = LoggerFactory.getLogger(org.apache.parquet.column.values.plain.PlainValuesWriter.class);
 
     private final RunLengthBitPackingHybridEncoder encoder;

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupReaderImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupReaderImpl.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class RowGroupReaderImpl implements RowGroupReader {
+final class RowGroupReaderImpl implements RowGroupReader {
 
     private static final int BUFFER_SIZE = 65536;
     private final RowGroup rowGroup;

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java
@@ -16,7 +16,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class RowGroupWriterImpl implements RowGroupWriter {
+final class RowGroupWriterImpl implements RowGroupWriter {
     private final PositionedBufferedOutputStream bufferedOutput;
     private final MessageType type;
     private final int targetPageSize;

diff --git a/...nLengthBitPackingHybridBufferDecoder.java → ...nLengthBitPackingHybridBufferDecoder.java b/...nLengthBitPackingHybridBufferDecoder.java → ...nLengthBitPackingHybridBufferDecoder.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
-package io.deephaven.parquet.base.util;
+package io.deephaven.parquet.base;
 
 
 import org.apache.parquet.Preconditions;
@@ -19,7 +19,7 @@
 /**
  * Decodes values written in the grammar described in {@link RunLengthBitPackingHybridEncoder}
  */
-public class RunLengthBitPackingHybridBufferDecoder {
+final class RunLengthBitPackingHybridBufferDecoder {
     private static final Logger LOG = LoggerFactory.getLogger(RunLengthBitPackingHybridBufferDecoder.class);
     private int rangeCount;
     private final int maxLevel;