forked from apache/arrow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
apacheGH-41569: [Java] ListViewVector Implementation for UnionListVie…
…wReader (apache#43077) ### Rationale for this change This PR contains the multiple components which are mainly required to add the C Data interface for `ListViewVector`. This PR solves the following major issues associated with this exercise. #### What changes are included in this PR? - [x] apache#41269 - [x] apache#41270 Apart from that, the following features have also been added - [x] JSON Writer/Reader - [x] Complex Writer functionality ### Are these changes tested? Yes ### Are there any user-facing changes? Yes, we are introducing the usage of `listview` instead of `list`, `startListView` instead of `startList` and `endListView` instead of `endList` for `ListView` related APIs in building the `ListViewVector`. * GitHub Issue: apache#41569 Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com> Signed-off-by: David Li <li.davidm96@gmail.com>
- Loading branch information
Showing
25 changed files
with
2,513 additions
and
566 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 167 additions & 0 deletions
167
java/vector/src/main/codegen/templates/PromotableViewWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| <@pp.dropOutputFile /> | ||
| <@pp.changeOutputFile name="/org/apache/arrow/vector/complex/impl/PromotableViewWriter.java" /> | ||
|
|
||
| <#include "/@includes/license.ftl" /> | ||
|
|
||
| package org.apache.arrow.vector.complex.impl; | ||
|
|
||
| import java.util.Locale; | ||
| <#include "/@includes/vv_imports.ftl" /> | ||
|
|
||
| /** | ||
| * This FieldWriter implementation delegates all FieldWriter API calls to an inner FieldWriter. This | ||
| * inner field writer can start as a specific type, and this class will promote the writer to a | ||
| * UnionWriter if a call is made that the specifically typed writer cannot handle. A new UnionVector | ||
| * is created, wrapping the original vector, and replaces the original vector in the parent vector, | ||
| * which can be either an AbstractStructVector or a ListViewVector. | ||
| * | ||
| * <p>The writer used can either be for single elements (struct) or lists. | ||
| */ | ||
| public class PromotableViewWriter extends PromotableWriter { | ||
|
|
||
| public PromotableViewWriter(ValueVector v, FixedSizeListVector fixedListVector) { | ||
| super(v, fixedListVector); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, FixedSizeListVector fixedListVector, | ||
| NullableStructWriterFactory nullableStructWriterFactory) { | ||
| super(v, fixedListVector, nullableStructWriterFactory); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, LargeListVector largeListVector) { | ||
| super(v, largeListVector); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, LargeListVector largeListVector, | ||
| NullableStructWriterFactory nullableStructWriterFactory) { | ||
| super(v, largeListVector, nullableStructWriterFactory); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, ListVector listVector) { | ||
| super(v, listVector); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, ListVector listVector, | ||
| NullableStructWriterFactory nullableStructWriterFactory) { | ||
| super(v, listVector, nullableStructWriterFactory); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, ListViewVector listViewVector, | ||
| NullableStructWriterFactory nullableStructWriterFactory) { | ||
| super(v, listViewVector, nullableStructWriterFactory); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, AbstractStructVector parentContainer) { | ||
| super(v, parentContainer); | ||
| } | ||
|
|
||
| public PromotableViewWriter(ValueVector v, AbstractStructVector parentContainer, | ||
| NullableStructWriterFactory nullableStructWriterFactory) { | ||
| super(v, parentContainer, nullableStructWriterFactory); | ||
| } | ||
|
|
||
| @Override | ||
| protected FieldWriter getWriter(MinorType type, ArrowType arrowType) { | ||
| if (state == State.UNION) { | ||
| if (requiresArrowType(type)) { | ||
| writer = ((UnionWriter) writer).toViewWriter(); | ||
| ((UnionViewWriter) writer).getWriter(type, arrowType); | ||
| } else { | ||
| writer = ((UnionWriter) writer).toViewWriter(); | ||
| ((UnionViewWriter) writer).getWriter(type); | ||
| } | ||
| } else if (state == State.UNTYPED) { | ||
| if (type == null) { | ||
| // ??? | ||
| return null; | ||
| } | ||
| if (arrowType == null) { | ||
| arrowType = type.getType(); | ||
| } | ||
| FieldType fieldType = new FieldType(addVectorAsNullable, arrowType, null, null); | ||
| ValueVector v; | ||
| if (listVector != null) { | ||
| v = listVector.addOrGetVector(fieldType).getVector(); | ||
| } else if (fixedListVector != null) { | ||
| v = fixedListVector.addOrGetVector(fieldType).getVector(); | ||
| } else if (listViewVector != null) { | ||
| v = listViewVector.addOrGetVector(fieldType).getVector(); | ||
| } else { | ||
| v = largeListVector.addOrGetVector(fieldType).getVector(); | ||
| } | ||
| v.allocateNew(); | ||
| setWriter(v); | ||
| writer.setPosition(position); | ||
| } else if (type != this.type) { | ||
| promoteToUnion(); | ||
| if (requiresArrowType(type)) { | ||
| writer = ((UnionWriter) writer).toViewWriter(); | ||
| ((UnionViewWriter) writer).getWriter(type, arrowType); | ||
| } else { | ||
| writer = ((UnionWriter) writer).toViewWriter(); | ||
| ((UnionViewWriter) writer).getWriter(type); | ||
| } | ||
| } | ||
| return writer; | ||
| } | ||
|
|
||
| @Override | ||
| public StructWriter struct() { | ||
| return getWriter(MinorType.LISTVIEW).struct(); | ||
| } | ||
|
|
||
| <#list vv.types as type><#list type.minor as minor> | ||
| <#assign lowerName = minor.class?uncap_first /> | ||
| <#if lowerName == "int" ><#assign lowerName = "integer" /></#if> | ||
| <#assign upperName = minor.class?upper_case /> | ||
| <#assign capName = minor.class?cap_first /> | ||
|
|
||
| @Override | ||
| public ${capName}Writer ${lowerName}() { | ||
| return getWriter(MinorType.LISTVIEW).${lowerName}(); | ||
| } | ||
|
|
||
| </#list></#list> | ||
|
|
||
| @Override | ||
| public void allocate() { | ||
| getWriter().allocate(); | ||
| } | ||
|
|
||
| @Override | ||
| public void clear() { | ||
| getWriter().clear(); | ||
| } | ||
|
|
||
| @Override | ||
| public Field getField() { | ||
| return getWriter().getField(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getValueCapacity() { | ||
| return getWriter().getValueCapacity(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| getWriter().close(); | ||
| } | ||
| } |
Oops, something went wrong.