-
Notifications
You must be signed in to change notification settings - Fork 108
GH-725: Added ExtensionReader #726
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 2 commits
e1f3892
928519b
629d9af
84bf650
f9c3363
40089aa
3fe5c93
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * 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.arrow.vector.complex.reader; | ||
|
|
||
| import org.apache.arrow.vector.holders.ExtensionHolder; | ||
|
|
||
| /** Interface for reading extension types. Extends the functionality of {@link BaseReader}. */ | ||
| public interface ExtensionReader extends BaseReader { | ||
|
|
||
| /** | ||
| * Reads to the given extension holder. | ||
| * | ||
| * @param holder the {@link ExtensionHolder} to read | ||
| */ | ||
| void read(ExtensionHolder holder); | ||
|
|
||
| /** | ||
| * Reads and returns an object representation of the extension type. | ||
| * | ||
| * @return the object representation of the extension type | ||
| */ | ||
| Object readObject(); | ||
|
|
||
| /** | ||
| * Checks if the current value is set. | ||
| * | ||
| * @return true if the value is set, false otherwise | ||
| */ | ||
| boolean isSet(); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * 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.arrow.vector.complex.impl; | ||
|
|
||
| import org.apache.arrow.vector.UuidVector; | ||
| import org.apache.arrow.vector.holder.UuidHolder; | ||
| import org.apache.arrow.vector.holders.ExtensionHolder; | ||
| import org.apache.arrow.vector.types.Types.MinorType; | ||
| import org.apache.arrow.vector.types.pojo.Field; | ||
|
|
||
| public class UuidReaderImpl extends AbstractFieldReader { | ||
|
|
||
| private final UuidVector vector; | ||
|
|
||
| public UuidReaderImpl(UuidVector vector) { | ||
| super(); | ||
| this.vector = vector; | ||
| } | ||
|
|
||
| @Override | ||
| public MinorType getMinorType() { | ||
| return vector.getMinorType(); | ||
| } | ||
|
|
||
| public Field getField() { | ||
| return vector.getField(); | ||
| } | ||
|
|
||
| public boolean isSet() { | ||
| return !vector.isNull(idx()); | ||
| } | ||
|
|
||
| public void read(ExtensionHolder holder) { | ||
| UuidHolder uuidHolder = (UuidHolder) holder; | ||
| vector.get(idx(), uuidHolder); | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why don't we need to override the other methods in
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added annotation
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added read, copyAsValue. copyAsField can't find any usage for other classes where this impl exists. |
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ | |
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.UUID; | ||
| import org.apache.arrow.memory.ArrowBuf; | ||
| import org.apache.arrow.memory.BufferAllocator; | ||
| import org.apache.arrow.memory.RootAllocator; | ||
|
|
@@ -64,16 +65,19 @@ | |
| import org.apache.arrow.vector.complex.impl.UnionMapReader; | ||
| import org.apache.arrow.vector.complex.impl.UnionReader; | ||
| import org.apache.arrow.vector.complex.impl.UnionWriter; | ||
| import org.apache.arrow.vector.complex.impl.UuidWriterFactory; | ||
| import org.apache.arrow.vector.complex.reader.BaseReader.StructReader; | ||
| import org.apache.arrow.vector.complex.reader.BigIntReader; | ||
| import org.apache.arrow.vector.complex.reader.FieldReader; | ||
| import org.apache.arrow.vector.complex.reader.Float4Reader; | ||
| import org.apache.arrow.vector.complex.reader.Float8Reader; | ||
| import org.apache.arrow.vector.complex.reader.IntReader; | ||
| import org.apache.arrow.vector.complex.writer.BaseWriter.ComplexWriter; | ||
| import org.apache.arrow.vector.complex.writer.BaseWriter.ExtensionWriter; | ||
| import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter; | ||
| import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter; | ||
| import org.apache.arrow.vector.complex.writer.BaseWriter.StructWriter; | ||
| import org.apache.arrow.vector.holder.UuidHolder; | ||
| import org.apache.arrow.vector.holders.DecimalHolder; | ||
| import org.apache.arrow.vector.holders.DurationHolder; | ||
| import org.apache.arrow.vector.holders.FixedSizeBinaryHolder; | ||
|
|
@@ -93,6 +97,7 @@ | |
| import org.apache.arrow.vector.types.pojo.ArrowType.Utf8; | ||
| import org.apache.arrow.vector.types.pojo.Field; | ||
| import org.apache.arrow.vector.types.pojo.FieldType; | ||
| import org.apache.arrow.vector.types.pojo.UuidType; | ||
| import org.apache.arrow.vector.util.CallBack; | ||
| import org.apache.arrow.vector.util.DecimalUtility; | ||
| import org.apache.arrow.vector.util.JsonStringArrayList; | ||
|
|
@@ -2489,4 +2494,35 @@ public void unionWithVarCharAndBinaryHelpers() throws Exception { | |
| "row12", new String(vector.getLargeVarBinaryVector().get(11), StandardCharsets.UTF_8)); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void extensionWriterReader() throws Exception { | ||
| // test values | ||
| UUID u1 = UUID.randomUUID(); | ||
|
|
||
| try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator)) { | ||
| // write | ||
|
|
||
| ComplexWriter writer = new ComplexWriterImpl("root", parent); | ||
| StructWriter rootWriter = writer.rootAsStruct(); | ||
|
|
||
| { | ||
| ExtensionWriter extensionWriter = rootWriter.extension("uuid1", new UuidType()); | ||
| extensionWriter.setPosition(0); | ||
| extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory()); | ||
| extensionWriter.writeExtension(u1); | ||
| } | ||
| // read | ||
| StructReader rootReader = new SingleStructReaderImpl(parent).reader("root"); | ||
| { | ||
| FieldReader uuidReader = rootReader.reader("uuid1"); | ||
| uuidReader.setPosition(0); | ||
| UuidHolder uuidHolder = new UuidHolder(); | ||
| uuidReader.read(uuidHolder); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similarly we test
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added tests with read and copyAsValue usage. For copyAsField, there are no examples of how it should be used, so not sure what is the right test case for it. |
||
| final ByteBuffer bb = ByteBuffer.wrap(uuidHolder.value); | ||
| UUID actualUuid = new UUID(bb.getLong(), bb.getLong()); | ||
| assertEquals(u1, actualUuid); | ||
| } | ||
| } | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be clearer to use the signature as the error message (like other methods do below)?