From 82ad57dd45418eec6596cccdaa4b44f703002d28 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Wed, 17 Jul 2024 17:38:43 -0400 Subject: [PATCH 01/15] MINOR: [Java] Bump com.puppycrawl.tools:checkstyle from 8.29 to 10.17.0 in /java --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index c62ae332b10..372fb1c7112 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -719,7 +719,7 @@ under the License. com.puppycrawl.tools checkstyle - 8.29 + 10.17.0 org.slf4j From ce763d78c2f5369e97d9b06e28df378af73d99d8 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Wed, 24 Jul 2024 11:50:41 -0400 Subject: [PATCH 02/15] Pin maven-checkstyle-plugin to latest version --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 372fb1c7112..5990db7069c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -403,7 +403,7 @@ under the License. org.apache.maven.plugins maven-checkstyle-plugin - [0,) + 3.4.0 check From 32de2b7f0e206db21e8332013c0f005c167a9adb Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 12:14:17 -0400 Subject: [PATCH 03/15] Use default checkstyle version 9.3 --- java/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 5990db7069c..9931983f2fd 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -719,7 +719,6 @@ under the License. com.puppycrawl.tools checkstyle - 10.17.0 org.slf4j From b8b2102311a4f41085ff25fd5abc825d38ef885d Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 12:17:38 -0400 Subject: [PATCH 04/15] Delete checkstyle version pin --- java/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 9931983f2fd..4d5d7b2ad74 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -716,10 +716,6 @@ under the License. false - - com.puppycrawl.tools - checkstyle - org.slf4j jcl-over-slf4j From f820e991123097a1686cc4b4e81cbdcd64ea41a3 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 12:23:15 -0400 Subject: [PATCH 05/15] Revert maven-checkstyle-plugin version change --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 4d5d7b2ad74..c6e58363b3b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -403,7 +403,7 @@ under the License. org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + [0,) check From 50c2f7b3c59afa0bbe9491a9645620c185c06f3f Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 12:29:20 -0400 Subject: [PATCH 06/15] Update checkstyle config --- java/dev/checkstyle/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/dev/checkstyle/checkstyle.xml b/java/dev/checkstyle/checkstyle.xml index eb63c3ff0fc..4b546ac56ea 100644 --- a/java/dev/checkstyle/checkstyle.xml +++ b/java/dev/checkstyle/checkstyle.xml @@ -180,7 +180,7 @@ - + From 5f1654f616482e94a3aec1b9c6281170bd1a7e19 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 12:37:59 -0400 Subject: [PATCH 07/15] (javadoc) AtclauseOrder: Block tags have to appear in the order '[@param, @return, @throws, @deprecated] --- .../java/org/apache/arrow/vector/BaseFixedWidthVector.java | 2 +- .../org/apache/arrow/vector/BaseLargeVariableWidthVector.java | 2 +- .../java/org/apache/arrow/vector/BaseVariableWidthVector.java | 2 +- .../org/apache/arrow/vector/BaseVariableWidthViewVector.java | 2 +- .../java/org/apache/arrow/vector/ExtensionTypeVector.java | 2 +- .../src/main/java/org/apache/arrow/vector/FieldVector.java | 2 +- .../src/main/java/org/apache/arrow/vector/NullVector.java | 2 +- .../apache/arrow/vector/complex/BaseRepeatedValueVector.java | 2 +- .../java/org/apache/arrow/vector/complex/LargeListVector.java | 4 ++-- .../main/java/org/apache/arrow/vector/complex/ListVector.java | 2 +- .../org/apache/arrow/vector/complex/RepeatedValueVector.java | 2 +- .../java/org/apache/arrow/vector/complex/StructVector.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java index 50ddf30bf7e..387033f0d2f 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java @@ -453,9 +453,9 @@ public void reAlloc() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java index 3a177f84c98..552a896ea8c 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java @@ -259,9 +259,9 @@ public void clear() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Override @Deprecated diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java index 5d761ffbee9..aaccec602f2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java @@ -275,9 +275,9 @@ public void clear() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java index f0c84bd4106..aee5233f9d4 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java @@ -315,9 +315,9 @@ public void clearDataBuffers() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java index 208c8b416cf..3762fecd0bd 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java @@ -233,9 +233,9 @@ public List getFieldBuffers() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java index e58f7bba844..391ef778169 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java @@ -111,9 +111,9 @@ default void exportCDataBuffers(List buffers, ArrowBuf buffersPtr, lon /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated List getFieldInnerVectors(); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java index 25e5bdc6f46..227ca716f63 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java @@ -224,9 +224,9 @@ public List getFieldBuffers() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java index 10637304df0..1cdb87eba03 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java @@ -142,9 +142,9 @@ protected void reallocOffsetBuffer() { /** * Get the offset vector. * + * @return the underlying offset vector or null if none exists. * @deprecated This API will be removed, as the current implementations no longer hold inner * offset vectors. - * @return the underlying offset vector or null if none exists. */ @Override @Deprecated diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java index ef2e7383a91..b5b32c8032d 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java @@ -319,9 +319,9 @@ private void setReaderAndWriterIndex() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override @@ -494,9 +494,9 @@ public void copyFrom(int inIndex, int outIndex, ValueVector from) { /** * Get the offset vector. * + * @return the underlying offset vector or null if none exists. * @deprecated This API will be removed, as the current implementations no longer hold inner * offset vectors. - * @return the underlying offset vector or null if none exists. */ @Override @Deprecated diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java index 17708167ff4..a1e18210fc6 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java @@ -277,9 +277,9 @@ private void setReaderAndWriterIndex() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java index 16492aec747..de7966a0aee 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java @@ -35,9 +35,9 @@ public interface RepeatedValueVector extends ValueVector, DensityAwareVector { /** * Get the offset vector. * + * @return the underlying offset vector or null if none exists. * @deprecated This API will be removed, as the current implementations no longer hold inner * offset vectors. - * @return the underlying offset vector or null if none exists. */ @Deprecated UInt4Vector getOffsetVector(); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java index 53f83fdfa7c..dda9b6547f7 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java @@ -188,9 +188,9 @@ private void setReaderAndWriterIndex() { /** * Get the inner vectors. * + * @return the inner vectors for this field as defined by the TypeLayout * @deprecated This API will be removed as the current implementations no longer support inner * vectors. - * @return the inner vectors for this field as defined by the TypeLayout */ @Deprecated @Override From 48b98718c42c26a12685031bd55f2ecb36a73110 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 13:03:38 -0400 Subject: [PATCH 08/15] (javadoc) MissingJavadocMethod: Missing a Javadoc comment. --- .../jdbc/utils/VectorSchemaRootTransformer.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java index b651e1eb9bc..20b5ebad179 100644 --- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java +++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java @@ -17,6 +17,7 @@ package org.apache.arrow.driver.jdbc.utils; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.List; import org.apache.arrow.memory.BufferAllocator; @@ -44,6 +45,12 @@ class Builder { private final List newFields = new ArrayList<>(); private final Collection tasks = new ArrayList<>(); + /** + * Constructor for the VectorSchemaRootTransformer's Builder. + * + * @param schema The Arrow schema. + * @param bufferAllocator The BufferAllocator to use for allocating memory. + */ public Builder(final Schema schema, final BufferAllocator bufferAllocator) { this.schema = schema; this.bufferAllocator = @@ -127,6 +134,11 @@ public Builder addEmptyField(final String fieldName, final ArrowType fieldType) return this; } + /** + * Build the {@link VectorSchemaRoot} with applied transformation tasks. + * + * @return The built {@link VectorSchemaRoot}. + */ public VectorSchemaRootTransformer build() { return (originalRoot, transformedRoot) -> { if (transformedRoot == null) { From 0d9036f39ef8d9f878f97f2e6f4ef74f910d60ff Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 13:10:56 -0400 Subject: [PATCH 09/15] Remove accidental import --- .../arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java index 20b5ebad179..b3c7a1ee5c6 100644 --- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java +++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java @@ -17,7 +17,6 @@ package org.apache.arrow.driver.jdbc.utils; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; import java.util.List; import org.apache.arrow.memory.BufferAllocator; From fcd5c807ce7b2aa5e725619f8b1a03ed595195a5 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 14:26:57 -0400 Subject: [PATCH 10/15] (misc) NewlineAtEndOfFile: Expected line ending for file is LF(\n), but CRLF(\r\n) is detected. --- java/dev/checkstyle/checkstyle.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/dev/checkstyle/checkstyle.xml b/java/dev/checkstyle/checkstyle.xml index 4b546ac56ea..8dae96895d3 100644 --- a/java/dev/checkstyle/checkstyle.xml +++ b/java/dev/checkstyle/checkstyle.xml @@ -48,9 +48,7 @@ - - - + From e1c85f9f62aba877ab42894dafd8933fe47e34f0 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Fri, 26 Jul 2024 14:40:24 -0400 Subject: [PATCH 11/15] Pin checkstyle to 10.17.0 --- java/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/pom.xml b/java/pom.xml index c6e58363b3b..838e60b0372 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -105,6 +105,7 @@ under the License. 1.11.3 2 + 10.17.0 true 2.29.2 5.11.0 @@ -716,6 +717,11 @@ under the License. false + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + org.slf4j jcl-over-slf4j From 3a20a9f5859c7167f4b746036af4c6047133104c Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Mon, 29 Jul 2024 13:47:01 -0400 Subject: [PATCH 12/15] Add lf newline back --- java/dev/checkstyle/checkstyle.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/dev/checkstyle/checkstyle.xml b/java/dev/checkstyle/checkstyle.xml index 8dae96895d3..4b546ac56ea 100644 --- a/java/dev/checkstyle/checkstyle.xml +++ b/java/dev/checkstyle/checkstyle.xml @@ -48,7 +48,9 @@ - + + + From a8db1d32dc42baea5a06654b6cbd4c32749c2ac7 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Mon, 29 Jul 2024 14:08:58 -0400 Subject: [PATCH 13/15] Disable auto crlf on windows --- .github/workflows/java.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index d4211c2c81c..0ad2848dff5 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -150,6 +150,7 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'temurin' + - run: git config --global core.autocrlf false - name: Checkout Arrow uses: actions/checkout@v4 with: From 8f72c751cb7204949ad0eb65d6a0d0b4e841f322 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Mon, 29 Jul 2024 14:18:46 -0400 Subject: [PATCH 14/15] Try .gitattributes instead --- .github/workflows/java.yml | 1 - java/.gitattributes | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 0ad2848dff5..d4211c2c81c 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -150,7 +150,6 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'temurin' - - run: git config --global core.autocrlf false - name: Checkout Arrow uses: actions/checkout@v4 with: diff --git a/java/.gitattributes b/java/.gitattributes index 596615322fb..360439a1d51 100644 --- a/java/.gitattributes +++ b/java/.gitattributes @@ -1,2 +1,3 @@ .gitattributes export-ignore .gitignore export-ignore +* text eol=lf From 24a762b3ffaa56684682028ef027425cc982f1f7 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Mon, 29 Jul 2024 17:27:32 -0400 Subject: [PATCH 15/15] Use text=auto --- java/.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/.gitattributes b/java/.gitattributes index 360439a1d51..366d3c2b3cd 100644 --- a/java/.gitattributes +++ b/java/.gitattributes @@ -1,3 +1,3 @@ .gitattributes export-ignore .gitignore export-ignore -* text eol=lf +* text=auto eol=lf