From 9aab233cb92c60ff0309dec1aec26e11f776ded9 Mon Sep 17 00:00:00 2001 From: liyafan82 Date: Wed, 11 Aug 2021 15:17:21 +0800 Subject: [PATCH 1/2] ARROW-13604 [Java]: Remove deprecation annotations for APIs representing unsupported operations --- java/vector/src/main/codegen/templates/UnionVector.java | 1 - java/vector/src/main/codegen/templates/ValueHolders.java | 8 +++----- .../org/apache/arrow/vector/BaseFixedWidthVector.java | 1 - .../org/apache/arrow/vector/BaseVariableWidthVector.java | 1 - .../arrow/vector/complex/BaseRepeatedValueVector.java | 1 - .../apache/arrow/vector/complex/FixedSizeListVector.java | 1 - .../org/apache/arrow/vector/complex/LargeListVector.java | 1 - .../java/org/apache/arrow/vector/complex/ListVector.java | 1 - .../org/apache/arrow/vector/complex/StructVector.java | 1 - 9 files changed, 3 insertions(+), 13 deletions(-) diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index bd5202977b8..410bb0c272c 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -190,7 +190,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use geFieldBuffers"); } diff --git a/java/vector/src/main/codegen/templates/ValueHolders.java b/java/vector/src/main/codegen/templates/ValueHolders.java index 789c00af085..a70dcf63478 100644 --- a/java/vector/src/main/codegen/templates/ValueHolders.java +++ b/java/vector/src/main/codegen/templates/ValueHolders.java @@ -53,17 +53,15 @@ public final class ${className} implements ValueHolder{ <#list fields as field> public ${field.type} ${field.name}; - - @Deprecated + public int hashCode(){ throw new UnsupportedOperationException(); } /* - * Reason for deprecation is that ValueHolders are potential scalar replacements - * and hence we don't want any methods to be invoked on them. + * Reason for not supporting the operation is that ValueHolders are potential scalar + * replacements and hence we don't want any methods to be invoked on them. */ - @Deprecated public String toString(){ throw new UnsupportedOperationException(); } 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 ea31a4f7846..b7218a34a15 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 @@ -458,7 +458,6 @@ public void reAlloc() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } 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 7fd19196733..d126cef12f9 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 @@ -273,7 +273,6 @@ public void clear() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } 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 f96c7423050..d75eb0834b7 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 @@ -139,7 +139,6 @@ protected void reallocOffsetBuffer() { } @Override - @Deprecated public UInt4Vector getOffsetVector() { throw new UnsupportedOperationException("There is no inner offset vector"); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java index c22cba43c56..f7e7f0a870a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java @@ -184,7 +184,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } 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 31e30cc44d4..b97445ab6e7 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 @@ -274,7 +274,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } 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 7e969263cb9..dd91ef1ce58 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 @@ -247,7 +247,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } 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 18d8eec615d..6d93ef5d474 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 @@ -142,7 +142,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } From de40484e4e536a0fadfb44861bf585dd6685fd75 Mon Sep 17 00:00:00 2001 From: liyafan82 Date: Mon, 6 Sep 2021 16:13:17 +0800 Subject: [PATCH 2/2] ARROW-13604 [Java]: Resolve comments --- .../main/codegen/templates/DenseUnionVector.java | 7 +++++++ .../src/main/codegen/templates/UnionVector.java | 8 ++++++++ .../src/main/codegen/templates/ValueHolders.java | 6 +++++- .../apache/arrow/vector/BaseFixedWidthVector.java | 8 ++++++++ .../vector/BaseLargeVariableWidthVector.java | 7 +++++++ .../arrow/vector/BaseVariableWidthVector.java | 8 ++++++++ .../apache/arrow/vector/ExtensionTypeVector.java | 8 ++++++++ .../java/org/apache/arrow/vector/FieldVector.java | 3 +++ .../java/org/apache/arrow/vector/NullVector.java | 8 ++++++++ .../vector/complex/BaseRepeatedValueVector.java | 7 +++++++ .../arrow/vector/complex/FixedSizeListVector.java | 8 ++++++++ .../arrow/vector/complex/LargeListVector.java | 15 +++++++++++++++ .../apache/arrow/vector/complex/ListVector.java | 8 ++++++++ .../arrow/vector/complex/RepeatedValueVector.java | 3 +++ .../apache/arrow/vector/complex/StructVector.java | 8 ++++++++ 15 files changed, 111 insertions(+), 1 deletion(-) diff --git a/java/vector/src/main/codegen/templates/DenseUnionVector.java b/java/vector/src/main/codegen/templates/DenseUnionVector.java index c1991f65b92..6ce20dcbc15 100644 --- a/java/vector/src/main/codegen/templates/DenseUnionVector.java +++ b/java/vector/src/main/codegen/templates/DenseUnionVector.java @@ -207,6 +207,13 @@ private void setReaderAndWriterIndex() { offsetBuffer.writerIndex((long) valueCount * OFFSET_WIDTH); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index 410bb0c272c..6bb26a8ae6d 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -189,6 +189,14 @@ private void setReaderAndWriterIndex() { typeBuffer.writerIndex(valueCount * TYPE_WIDTH); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use geFieldBuffers"); diff --git a/java/vector/src/main/codegen/templates/ValueHolders.java b/java/vector/src/main/codegen/templates/ValueHolders.java index a70dcf63478..973efd870a6 100644 --- a/java/vector/src/main/codegen/templates/ValueHolders.java +++ b/java/vector/src/main/codegen/templates/ValueHolders.java @@ -54,11 +54,15 @@ public final class ${className} implements ValueHolder{ public ${field.type} ${field.name}; + /** + * Reason for not supporting the operation is that ValueHolders are potential scalar + * replacements and hence we don't want any methods to be invoked on them. + */ public int hashCode(){ throw new UnsupportedOperationException(); } - /* + /** * Reason for not supporting the operation is that ValueHolders are potential scalar * replacements and hence we don't want any methods to be invoked on them. */ 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 b7218a34a15..ded58b22b00 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 @@ -457,6 +457,14 @@ public void reAlloc() { lastValueCapacity = getValueCapacity(); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); 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 64c79483288..90694db830c 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 @@ -254,6 +254,13 @@ public void clear() { valueCount = 0; } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { 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 d126cef12f9..bbfaecb9742 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 @@ -272,6 +272,14 @@ public void clear() { valueCount = 0; } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); 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 516077d8328..57a04bc5a36 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 @@ -214,6 +214,14 @@ public List getFieldBuffers() { return underlyingVector.getFieldBuffers(); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { return underlyingVector.getFieldInnerVectors(); 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 2723fd71f76..b00581a040e 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 @@ -63,8 +63,11 @@ public interface FieldVector extends ValueVector { /** * Get the inner vectors. * + * @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 db9a8acfd83..501e0ebd340 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 @@ -166,6 +166,14 @@ public List getFieldBuffers() { return Collections.emptyList(); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { return Collections.emptyList(); 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 d75eb0834b7..62d4a1299de 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 @@ -138,7 +138,14 @@ protected void reallocOffsetBuffer() { offsetAllocationSizeInBytes = newAllocationSize; } + /** + * Get the offset vector. + * @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 public UInt4Vector getOffsetVector() { throw new UnsupportedOperationException("There is no inner offset vector"); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java index f7e7f0a870a..0d418501065 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java @@ -183,6 +183,14 @@ private void setReaderAndWriterIndex() { validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount)); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); 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 b97445ab6e7..5bb0c3b0ee6 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 @@ -273,6 +273,14 @@ private void setReaderAndWriterIndex() { } } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); @@ -441,7 +449,14 @@ public void copyFrom(int inIndex, int outIndex, ValueVector from) { ComplexCopier.copy(in, out); } + /** + * Get the offset vector. + * @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 public UInt4Vector getOffsetVector() { throw new UnsupportedOperationException("There is no inner offset vector"); } 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 dd91ef1ce58..f57802c2a1f 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 @@ -246,6 +246,14 @@ private void setReaderAndWriterIndex() { } } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); 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 f39ab27b1b2..1cae881dde5 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 @@ -34,8 +34,11 @@ public interface RepeatedValueVector extends ValueVector, DensityAwareVector { /** * Get the offset vector. + * @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 6d93ef5d474..2dabc6e0149 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 @@ -141,6 +141,14 @@ private void setReaderAndWriterIndex() { validityBuffer.writerIndex(BitVectorHelper.getValidityBufferSize(valueCount)); } + /** + * Get the inner vectors. + * + * @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 public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers");