This is an automated email from the ASF dual-hosted git repository. dongjoon pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push: new b6841129e ORC-1904: Upgrade `checkstyle` to 10.25.0 b6841129e is described below commit b6841129e0bc81c86276a7d6f19b497b20dc3bd3 Author: Dongjoon Hyun <dongj...@apache.org> AuthorDate: Mon Jun 2 14:04:11 2025 -0700 ORC-1904: Upgrade `checkstyle` to 10.25.0 ### What changes were proposed in this pull request? This PR aims to upgrade `check style` to 10.25.0. ### Why are the changes needed? To apply the latest improvements and bug fixes of `checkstyle` to the Apache ORC repo. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #2248 from dongjoon-hyun/ORC-1904. Authored-by: Dongjoon Hyun <dongj...@apache.org> Signed-off-by: Dongjoon Hyun <dongj...@apache.org> --- java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java | 6 +++--- java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java | 2 +- java/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java index b4155ada8..e88cccc33 100644 --- a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java +++ b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java @@ -303,9 +303,9 @@ public class RecordReaderUtils { assert kind != OrcProto.Stream.Kind.DICTIONARY_COUNT; OrcProto.ColumnEncoding.Kind encodingKind = encoding.getKind(); return kind == OrcProto.Stream.Kind.DICTIONARY_DATA || - (kind == OrcProto.Stream.Kind.LENGTH && - (encodingKind == OrcProto.ColumnEncoding.Kind.DICTIONARY || - encodingKind == OrcProto.ColumnEncoding.Kind.DICTIONARY_V2)); + (kind == OrcProto.Stream.Kind.LENGTH && + (encodingKind == OrcProto.ColumnEncoding.Kind.DICTIONARY || + encodingKind == OrcProto.ColumnEncoding.Kind.DICTIONARY_V2)); } /** diff --git a/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java b/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java index 23afe8918..d796bcb0a 100644 --- a/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java +++ b/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java @@ -206,7 +206,7 @@ public class StripePlanner { public InStream getStream(StreamName name) throws IOException { StreamInformation stream = streams.get(name); return stream == null ? null - : InStream.create(name, stream.firstChunk, stream.offset, stream.length, + : InStream.create(name, stream.firstChunk, stream.offset, stream.length, getStreamOptions(stream.column, stream.kind)); } diff --git a/java/pom.xml b/java/pom.xml index 2572927b7..42c2c9d95 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -62,7 +62,7 @@ <properties> <bouncycastle.version>1.80</bouncycastle.version> <brotli4j.version>1.18.0</brotli4j.version> - <checkstyle.version>10.23.1</checkstyle.version> + <checkstyle.version>10.25.0</checkstyle.version> <example.dir>${project.basedir}/../../examples</example.dir> <hadoop.version>3.4.1</hadoop.version> <java.version>17</java.version>