diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 002028cdf5..675b55b828 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -761,7 +761,7 @@ public EncodingStats convertEncodingStats(List stats) { switch (stat.getPage_type()) { case DATA_PAGE_V2: builder.withV2Pages(); - // falls through + // falls through case DATA_PAGE: builder.addDataEncoding(getEncoding(stat.getEncoding()), stat.getCount()); break; diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java index eee5fa6083..f11d4e6892 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java @@ -323,7 +323,7 @@ private String cacheKey(CompressionCodecName codecName) { level = conf.get("parquet.compression.codec.zstd.level"); break; default: - // compression level is not supported; ignore it + // compression level is not supported; ignore it } String codecClass = codecName.getHadoopCompressionCodecClassName(); return level == null ? codecClass : codecClass + ":" + level; diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java index 92f7db413c..5142506d2a 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java @@ -546,7 +546,7 @@ private void validateBoundaryOrder( prevMaxValue::toString); break; case UNORDERED: - // No checks necessary. + // No checks necessary. } } } diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java index b2b5233eeb..5d02e84632 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java @@ -103,8 +103,8 @@ protected BytesCompressor createCompressor(final CompressionCodecName codecName) return new SnappyCompressor(); case ZSTD: return new ZstdCompressor(); - // todo: create class similar to the SnappyCompressor for zlib and exclude it as - // snappy is above since it also generates allocateDirect calls. + // todo: create class similar to the SnappyCompressor for zlib and exclude it as + // snappy is above since it also generates allocateDirect calls. default: return super.createCompressor(codecName); } diff --git a/parquet-jackson/src/main/java/org/apache/parquet/jackson/ParquetJackson.java b/parquet-jackson/src/main/java/org/apache/parquet/jackson/ParquetJackson.java new file mode 100644 index 0000000000..523a195857 --- /dev/null +++ b/parquet-jackson/src/main/java/org/apache/parquet/jackson/ParquetJackson.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.parquet.jackson; + +/** + * Apache Parquet Jackson module placeholder class. + * + *

This module provides shaded Jackson dependencies for use by other Parquet modules. + * All Jackson classes are relocated under the {@code parquet.com.fasterxml.jackson.core} namespace. + * + *

This class exists solely to enable javadoc generation for this module. + * The actual functionality is provided by shaded Jackson classes. + * + * @see Jackson + */ +public final class ParquetJackson { + private ParquetJackson() { + // Utility class - prevent instantiation + } +} diff --git a/parquet-jackson/src/main/java/org/apache/parquet/jackson/package-info.java b/parquet-jackson/src/main/java/org/apache/parquet/jackson/package-info.java new file mode 100644 index 0000000000..f5277552d6 --- /dev/null +++ b/parquet-jackson/src/main/java/org/apache/parquet/jackson/package-info.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * Apache Parquet Jackson module. + * + *

This module provides shaded Jackson dependencies for use by other Parquet modules. + * It contains no public API classes - all classes are shaded from Jackson libraries. + * + * @see Jackson + */ +package org.apache.parquet.jackson; diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/BufferedProtocolReadToWrite.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/BufferedProtocolReadToWrite.java index 7e8a1633f8..72ada5ae38 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/BufferedProtocolReadToWrite.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/BufferedProtocolReadToWrite.java @@ -226,7 +226,7 @@ private boolean readOneValue(TProtocol in, byte type, List buffer, Thrif writeShortAction(buffer, s); break; case TType.ENUM: // same as i32 => actually never seen in the protocol layer as enums are written as a i32 - // field + // field case TType.I32: final int i = in.readI32(); checkEnum(expectedType, i); diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/ProtocolReadToWrite.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/ProtocolReadToWrite.java index 94c68b0081..830a5c605b 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/ProtocolReadToWrite.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/ProtocolReadToWrite.java @@ -74,7 +74,7 @@ void readOneValue(TProtocol in, TProtocol out, byte type) throws TException { out.writeI16(in.readI16()); break; case TType.ENUM: // same as i32 => actually never seen in the protocol layer as enums are written as a i32 - // field + // field case TType.I32: out.writeI32(in.readI32()); break; diff --git a/pom.xml b/pom.xml index 1e2ae85319..9a2cef0696 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 2.19.2 0.23.1 1.3.2 - 2.30.0 + 3.1.0 shaded.parquet 3.3.0