Skip to content

Commit 6680c41

Browse files
committed
Remove UuidType/UuidVector implementation from c RoundtripTest
1 parent cd32ddb commit 6680c41

1 file changed

Lines changed: 2 additions & 72 deletions

File tree

c/src/test/java/org/apache/arrow/c/RoundtripTest.java

Lines changed: 2 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.apache.arrow.memory.ArrowBuf;
3636
import org.apache.arrow.memory.BufferAllocator;
3737
import org.apache.arrow.memory.RootAllocator;
38-
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
3938
import org.apache.arrow.vector.BaseLargeVariableWidthVector;
4039
import org.apache.arrow.vector.BaseVariableWidthVector;
4140
import org.apache.arrow.vector.BigIntVector;
@@ -44,7 +43,6 @@
4443
import org.apache.arrow.vector.DateMilliVector;
4544
import org.apache.arrow.vector.DecimalVector;
4645
import org.apache.arrow.vector.DurationVector;
47-
import org.apache.arrow.vector.ExtensionTypeVector;
4846
import org.apache.arrow.vector.FieldVector;
4947
import org.apache.arrow.vector.FixedSizeBinaryVector;
5048
import org.apache.arrow.vector.Float2Vector;
@@ -74,6 +72,7 @@
7472
import org.apache.arrow.vector.UInt2Vector;
7573
import org.apache.arrow.vector.UInt4Vector;
7674
import org.apache.arrow.vector.UInt8Vector;
75+
import org.apache.arrow.vector.UuidVector;
7776
import org.apache.arrow.vector.ValueVector;
7877
import org.apache.arrow.vector.VarBinaryVector;
7978
import org.apache.arrow.vector.VarCharVector;
@@ -92,6 +91,7 @@
9291
import org.apache.arrow.vector.complex.StructVector;
9392
import org.apache.arrow.vector.complex.UnionVector;
9493
import org.apache.arrow.vector.complex.impl.UnionMapWriter;
94+
import org.apache.arrow.vector.extension.UuidType;
9595
import org.apache.arrow.vector.holders.IntervalDayHolder;
9696
import org.apache.arrow.vector.holders.NullableLargeVarBinaryHolder;
9797
import org.apache.arrow.vector.holders.NullableUInt4Holder;
@@ -100,7 +100,6 @@
100100
import org.apache.arrow.vector.types.Types.MinorType;
101101
import org.apache.arrow.vector.types.pojo.ArrowType;
102102
import org.apache.arrow.vector.types.pojo.ArrowType.ExtensionType;
103-
import org.apache.arrow.vector.types.pojo.ExtensionTypeRegistry;
104103
import org.apache.arrow.vector.types.pojo.Field;
105104
import org.apache.arrow.vector.types.pojo.FieldType;
106105
import org.apache.arrow.vector.types.pojo.Schema;
@@ -810,7 +809,6 @@ public void testEmptyRunEndEncodedVector() {
810809

811810
@Test
812811
public void testExtensionTypeVector() {
813-
ExtensionTypeRegistry.register(UuidType.INSTANCE);
814812
final Schema schema =
815813
new Schema(Collections.singletonList(Field.nullable("a", UuidType.INSTANCE)));
816814
try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
@@ -1114,72 +1112,4 @@ private VectorSchemaRoot createTestVSR() {
11141112

11151113
return new VectorSchemaRoot(fields, vectors);
11161114
}
1117-
1118-
static class UuidType extends ExtensionType {
1119-
1120-
@Override
1121-
public ArrowType storageType() {
1122-
return new ArrowType.FixedSizeBinary(16);
1123-
}
1124-
1125-
@Override
1126-
public String extensionName() {
1127-
return "uuid";
1128-
}
1129-
1130-
@Override
1131-
public boolean extensionEquals(ExtensionType other) {
1132-
return other instanceof UuidType;
1133-
}
1134-
1135-
@Override
1136-
public ArrowType deserialize(ArrowType storageType, String serializedData) {
1137-
if (!storageType.equals(storageType())) {
1138-
throw new UnsupportedOperationException(
1139-
"Cannot construct UuidType from underlying type " + storageType);
1140-
}
1141-
return UuidType.INSTANCE;
1142-
}
1143-
1144-
@Override
1145-
public String serialize() {
1146-
return "";
1147-
}
1148-
1149-
@Override
1150-
public FieldVector getNewVector(String name, FieldType fieldType, BufferAllocator allocator) {
1151-
return new UuidVector(name, allocator, new FixedSizeBinaryVector(name, allocator, 16));
1152-
}
1153-
}
1154-
1155-
static class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector> {
1156-
1157-
public UuidVector(
1158-
String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
1159-
super(name, allocator, underlyingVector);
1160-
}
1161-
1162-
@Override
1163-
public UUID getObject(int index) {
1164-
final ByteBuffer bb = ByteBuffer.wrap(getUnderlyingVector().getObject(index));
1165-
return new UUID(bb.getLong(), bb.getLong());
1166-
}
1167-
1168-
@Override
1169-
public int hashCode(int index) {
1170-
return hashCode(index, null);
1171-
}
1172-
1173-
@Override
1174-
public int hashCode(int index, ArrowBufHasher hasher) {
1175-
return getUnderlyingVector().hashCode(index, hasher);
1176-
}
1177-
1178-
public void set(int index, UUID uuid) {
1179-
ByteBuffer bb = ByteBuffer.allocate(16);
1180-
bb.putLong(uuid.getMostSignificantBits());
1181-
bb.putLong(uuid.getLeastSignificantBits());
1182-
getUnderlyingVector().set(index, bb.array());
1183-
}
1184-
}
11851115
}

0 commit comments

Comments
 (0)