Skip to content

Commit 4e8de67

Browse files
committed
GH-825: Move UuidType to arrow.vector from test
1 parent 9f68d08 commit 4e8de67

File tree

15 files changed

+20
-19
lines changed

15 files changed

+20
-19
lines changed

vector/src/test/java/org/apache/arrow/vector/UuidVector.java renamed to vector/src/main/java/org/apache/arrow/vector/UuidVector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
2323
import org.apache.arrow.vector.complex.impl.UuidReaderImpl;
2424
import org.apache.arrow.vector.complex.reader.FieldReader;
25-
import org.apache.arrow.vector.holder.UuidHolder;
25+
import org.apache.arrow.vector.extension.UuidType;
26+
import org.apache.arrow.vector.holders.UuidHolder;
2627
import org.apache.arrow.vector.types.pojo.Field;
2728
import org.apache.arrow.vector.types.pojo.FieldType;
28-
import org.apache.arrow.vector.types.pojo.UuidType;
2929
import org.apache.arrow.vector.util.TransferPair;
3030

3131
public class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector>

vector/src/main/java/org/apache/arrow/vector/complex/impl/ExtensionTypeWriterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.arrow.vector.complex.writer.FieldWriter;
2121

2222
/**
23-
* A factory interface for creating instances of {@link ExtensionTypeWriter}. This factory allows
23+
* A factory interface for creating instances of {@link AbstractExtensionTypeWriter}. This factory allows
2424
* configuring writer implementations for specific {@link ExtensionTypeVector}.
2525
*
2626
* @param <T> the type of writer implementation for a specific {@link ExtensionTypeVector}.

vector/src/test/java/org/apache/arrow/vector/complex/impl/UuidReaderImpl.java renamed to vector/src/main/java/org/apache/arrow/vector/complex/impl/UuidReaderImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.arrow.vector.complex.impl;
1818

1919
import org.apache.arrow.vector.UuidVector;
20-
import org.apache.arrow.vector.holder.UuidHolder;
2120
import org.apache.arrow.vector.holders.ExtensionHolder;
21+
import org.apache.arrow.vector.holders.UuidHolder;
2222
import org.apache.arrow.vector.types.Types.MinorType;
2323
import org.apache.arrow.vector.types.pojo.Field;
2424

vector/src/test/java/org/apache/arrow/vector/complex/impl/UuidWriterImpl.java renamed to vector/src/main/java/org/apache/arrow/vector/complex/impl/UuidWriterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.nio.ByteBuffer;
2020
import java.util.UUID;
2121
import org.apache.arrow.vector.UuidVector;
22-
import org.apache.arrow.vector.holder.UuidHolder;
2322
import org.apache.arrow.vector.holders.ExtensionHolder;
23+
import org.apache.arrow.vector.holders.UuidHolder;
2424

2525
public class UuidWriterImpl extends AbstractExtensionTypeWriter<UuidVector> {
2626

vector/src/test/java/org/apache/arrow/vector/types/pojo/UuidType.java renamed to vector/src/main/java/org/apache/arrow/vector/extension/UuidType.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.arrow.vector.types.pojo;
17+
package org.apache.arrow.vector.extension;
1818

1919
import org.apache.arrow.memory.BufferAllocator;
2020
import org.apache.arrow.vector.FieldVector;
2121
import org.apache.arrow.vector.FixedSizeBinaryVector;
2222
import org.apache.arrow.vector.UuidVector;
23+
import org.apache.arrow.vector.types.pojo.ArrowType;
2324
import org.apache.arrow.vector.types.pojo.ArrowType.ExtensionType;
25+
import org.apache.arrow.vector.types.pojo.FieldType;
2426

2527
public class UuidType extends ExtensionType {
2628

vector/src/test/java/org/apache/arrow/vector/holder/UuidHolder.java renamed to vector/src/main/java/org/apache/arrow/vector/holders/UuidHolder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.arrow.vector.holder;
18-
19-
import org.apache.arrow.vector.holders.ExtensionHolder;
17+
package org.apache.arrow.vector.holders;
2018

2119
public class UuidHolder extends ExtensionHolder {
2220
public byte[] value;

vector/src/test/java/org/apache/arrow/vector/TestListVector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
import org.apache.arrow.vector.complex.impl.UuidWriterFactory;
4040
import org.apache.arrow.vector.complex.reader.FieldReader;
4141
import org.apache.arrow.vector.complex.writer.BaseWriter.ExtensionWriter;
42-
import org.apache.arrow.vector.holder.UuidHolder;
42+
import org.apache.arrow.vector.extension.UuidType;
4343
import org.apache.arrow.vector.holders.DurationHolder;
4444
import org.apache.arrow.vector.holders.FixedSizeBinaryHolder;
4545
import org.apache.arrow.vector.holders.TimeStampMilliTZHolder;
46+
import org.apache.arrow.vector.holders.UuidHolder;
4647
import org.apache.arrow.vector.types.TimeUnit;
4748
import org.apache.arrow.vector.types.Types.MinorType;
4849
import org.apache.arrow.vector.types.pojo.ArrowType;
4950
import org.apache.arrow.vector.types.pojo.Field;
5051
import org.apache.arrow.vector.types.pojo.FieldType;
51-
import org.apache.arrow.vector.types.pojo.UuidType;
5252
import org.apache.arrow.vector.util.TransferPair;
5353
import org.junit.jupiter.api.AfterEach;
5454
import org.junit.jupiter.api.BeforeEach;

vector/src/test/java/org/apache/arrow/vector/TestMapVector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
4141
import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter;
4242
import org.apache.arrow.vector.complex.writer.FieldWriter;
43-
import org.apache.arrow.vector.holder.UuidHolder;
43+
import org.apache.arrow.vector.extension.UuidType;
44+
import org.apache.arrow.vector.holders.UuidHolder;
4445
import org.apache.arrow.vector.types.Types.MinorType;
4546
import org.apache.arrow.vector.types.pojo.ArrowType;
4647
import org.apache.arrow.vector.types.pojo.Field;
4748
import org.apache.arrow.vector.types.pojo.FieldType;
48-
import org.apache.arrow.vector.types.pojo.UuidType;
4949
import org.apache.arrow.vector.util.JsonStringArrayList;
5050
import org.apache.arrow.vector.util.TransferPair;
5151
import org.junit.jupiter.api.AfterEach;

vector/src/test/java/org/apache/arrow/vector/TestStructVector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import org.apache.arrow.vector.complex.impl.NullableStructWriter;
3636
import org.apache.arrow.vector.complex.writer.Float8Writer;
3737
import org.apache.arrow.vector.complex.writer.IntWriter;
38+
import org.apache.arrow.vector.extension.UuidType;
3839
import org.apache.arrow.vector.holders.ComplexHolder;
3940
import org.apache.arrow.vector.types.Types;
4041
import org.apache.arrow.vector.types.Types.MinorType;
4142
import org.apache.arrow.vector.types.pojo.ArrowType;
4243
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
4344
import org.apache.arrow.vector.types.pojo.Field;
4445
import org.apache.arrow.vector.types.pojo.FieldType;
45-
import org.apache.arrow.vector.types.pojo.UuidType;
4646
import org.apache.arrow.vector.util.TransferPair;
4747
import org.junit.jupiter.api.AfterEach;
4848
import org.junit.jupiter.api.BeforeEach;

0 commit comments

Comments
 (0)