Skip to content

Commit 530d5a8

Browse files
tmatertmater
committed
Build fix
1 parent 43ecb6b commit 530d5a8

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,9 @@ public void testEmptyRunEndEncodedVector() {
810810

811811
@Test
812812
public void testExtensionTypeVector() {
813-
ExtensionTypeRegistry.register(new UuidType());
813+
ExtensionTypeRegistry.register(UuidType.INSTANCE);
814814
final Schema schema =
815-
new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
815+
new Schema(Collections.singletonList(Field.nullable("a", UuidType.INSTANCE)));
816816
try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
817817
// Fill with data
818818
UUID u1 = UUID.randomUUID();
@@ -830,13 +830,12 @@ public void testExtensionTypeVector() {
830830
assertEquals(root.getSchema(), importedRoot.getSchema());
831831

832832
final Field field = importedRoot.getSchema().getFields().get(0);
833-
final UuidType expectedType = new UuidType();
834833
assertEquals(
835834
field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
836-
expectedType.extensionName());
835+
UuidType.INSTANCE.extensionName());
837836
assertEquals(
838837
field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
839-
expectedType.serialize());
838+
UuidType.INSTANCE.serialize());
840839

841840
final UuidVector deserialized = (UuidVector) importedRoot.getFieldVectors().get(0);
842841
assertEquals(vector.getValueCount(), deserialized.getValueCount());
@@ -1139,7 +1138,7 @@ public ArrowType deserialize(ArrowType storageType, String serializedData) {
11391138
throw new UnsupportedOperationException(
11401139
"Cannot construct UuidType from underlying type " + storageType);
11411140
}
1142-
return new UuidType();
1141+
return UuidType.INSTANCE;
11431142
}
11441143

11451144
@Override

‎vector/src/main/java/org/apache/arrow/vector/UuidVector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector>
6969
public UuidVector(
7070
String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
7171
super(name, allocator, underlyingVector);
72-
this.field = new Field(name, FieldType.nullable(new UuidType()), null);
72+
this.field = new Field(name, FieldType.nullable(UuidType.INSTANCE), null);
7373
}
7474

7575
/**
@@ -99,7 +99,7 @@ public UuidVector(
9999
*/
100100
public UuidVector(String name, BufferAllocator allocator) {
101101
super(name, allocator, new FixedSizeBinaryVector(name, allocator, UUID_BYTE_WIDTH));
102-
this.field = new Field(name, FieldType.nullable(new UuidType()), null);
102+
this.field = new Field(name, FieldType.nullable(UuidType.INSTANCE), null);
103103
}
104104

105105
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,15 +1208,15 @@ public void testGetTransferPairWithField() {
12081208

12091209
@Test
12101210
public void testListVectorWithExtensionType() throws Exception {
1211-
final FieldType type = FieldType.nullable(new UuidType());
1211+
final FieldType type = FieldType.nullable(UuidType.INSTANCE);
12121212
try (final ListVector inVector = new ListVector("list", allocator, type, null)) {
12131213
UnionListWriter writer = inVector.getWriter();
12141214
writer.allocate();
12151215
writer.setPosition(0);
12161216
UUID u1 = UUID.randomUUID();
12171217
UUID u2 = UUID.randomUUID();
12181218
writer.startList();
1219-
ExtensionWriter extensionWriter = writer.extension(new UuidType());
1219+
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
12201220
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
12211221
extensionWriter.writeExtension(u1);
12221222
extensionWriter.writeExtension(u2);
@@ -1236,15 +1236,15 @@ public void testListVectorWithExtensionType() throws Exception {
12361236

12371237
@Test
12381238
public void testListVectorReaderForExtensionType() throws Exception {
1239-
final FieldType type = FieldType.nullable(new UuidType());
1239+
final FieldType type = FieldType.nullable(UuidType.INSTANCE);
12401240
try (final ListVector inVector = new ListVector("list", allocator, type, null)) {
12411241
UnionListWriter writer = inVector.getWriter();
12421242
writer.allocate();
12431243
writer.setPosition(0);
12441244
UUID u1 = UUID.randomUUID();
12451245
UUID u2 = UUID.randomUUID();
12461246
writer.startList();
1247-
ExtensionWriter extensionWriter = writer.extension(new UuidType());
1247+
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
12481248
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
12491249
extensionWriter.writeExtension(u1);
12501250
extensionWriter.writeExtension(u2);
@@ -1279,7 +1279,7 @@ public void testCopyFromForExtensionType() throws Exception {
12791279
UUID u1 = UUID.randomUUID();
12801280
UUID u2 = UUID.randomUUID();
12811281
writer.startList();
1282-
ExtensionWriter extensionWriter = writer.extension(new UuidType());
1282+
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
12831283
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
12841284
extensionWriter.writeExtension(u1);
12851285
extensionWriter.writeExtension(u2);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,13 +1284,13 @@ public void testMapVectorWithExtensionType() throws Exception {
12841284
writer.startMap();
12851285
writer.startEntry();
12861286
writer.key().bigInt().writeBigInt(0);
1287-
ExtensionWriter extensionWriter = writer.value().extension(new UuidType());
1287+
ExtensionWriter extensionWriter = writer.value().extension(UuidType.INSTANCE);
12881288
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
12891289
extensionWriter.writeExtension(u1);
12901290
writer.endEntry();
12911291
writer.startEntry();
12921292
writer.key().bigInt().writeBigInt(1);
1293-
extensionWriter = writer.value().extension(new UuidType());
1293+
extensionWriter = writer.value().extension(UuidType.INSTANCE);
12941294
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
12951295
extensionWriter.writeExtension(u2);
12961296
writer.endEntry();
@@ -1326,13 +1326,13 @@ public void testCopyFromForExtensionType() throws Exception {
13261326
writer.startMap();
13271327
writer.startEntry();
13281328
writer.key().bigInt().writeBigInt(0);
1329-
ExtensionWriter extensionWriter = writer.value().extension(new UuidType());
1329+
ExtensionWriter extensionWriter = writer.value().extension(UuidType.INSTANCE);
13301330
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
13311331
extensionWriter.writeExtension(u1);
13321332
writer.endEntry();
13331333
writer.startEntry();
13341334
writer.key().bigInt().writeBigInt(1);
1335-
extensionWriter = writer.value().extension(new UuidType());
1335+
extensionWriter = writer.value().extension(UuidType.INSTANCE);
13361336
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
13371337
extensionWriter.writeExtension(u2);
13381338
writer.endEntry();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public void testGetTransferPairWithFieldAndCallBack() {
341341

342342
@Test
343343
public void testStructVectorWithExtensionTypes() {
344-
UuidType uuidType = new UuidType();
344+
UuidType uuidType = UuidType.INSTANCE;
345345
Field uuidField = new Field("struct_child", FieldType.nullable(uuidType), null);
346346
Field structField =
347347
new Field("struct", FieldType.nullable(new ArrowType.Struct()), List.of(uuidField));
@@ -353,7 +353,7 @@ public void testStructVectorWithExtensionTypes() {
353353

354354
@Test
355355
public void testStructVectorTransferPairWithExtensionType() {
356-
UuidType uuidType = new UuidType();
356+
UuidType uuidType = UuidType.INSTANCE;
357357
Field uuidField = new Field("uuid_child", FieldType.nullable(uuidType), null);
358358
Field structField =
359359
new Field("struct", FieldType.nullable(new ArrowType.Struct()), List.of(uuidField));

‎vector/src/test/java/org/apache/arrow/vector/TestUuidType.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ void testConstants() {
7575

7676
@Test
7777
void testStorageType() {
78-
UuidType type = new UuidType();
78+
UuidType type = UuidType.INSTANCE;
7979
assertEquals(UuidType.STORAGE_TYPE, type.storageType());
8080
assertInstanceOf(ArrowType.FixedSizeBinary.class, type.storageType());
8181
}
8282

8383
@Test
8484
void testExtensionName() {
85-
UuidType type = new UuidType();
85+
UuidType type = UuidType.INSTANCE;
8686
assertEquals("arrow.uuid", type.extensionName());
8787
}
8888

8989
@Test
9090
void testExtensionEquals() {
91-
UuidType type1 = new UuidType();
92-
UuidType type2 = new UuidType();
91+
UuidType type1 = UuidType.INSTANCE;
92+
UuidType type2 = UuidType.INSTANCE;
9393
UuidType type3 = UuidType.INSTANCE;
9494

9595
assertTrue(type1.extensionEquals(type2));
@@ -99,20 +99,20 @@ void testExtensionEquals() {
9999

100100
@Test
101101
void testIsComplex() {
102-
UuidType type = new UuidType();
102+
UuidType type = UuidType.INSTANCE;
103103
assertFalse(type.isComplex());
104104
}
105105

106106
@Test
107107
void testSerialize() {
108-
UuidType type = new UuidType();
108+
UuidType type = UuidType.INSTANCE;
109109
String serialized = type.serialize();
110110
assertEquals("", serialized);
111111
}
112112

113113
@Test
114114
void testDeserializeValid() {
115-
UuidType type = new UuidType();
115+
UuidType type = UuidType.INSTANCE;
116116
ArrowType storageType = new ArrowType.FixedSizeBinary(UuidType.UUID_BYTE_WIDTH);
117117

118118
ArrowType deserialized = assertDoesNotThrow(() -> type.deserialize(storageType, ""));
@@ -122,15 +122,15 @@ void testDeserializeValid() {
122122

123123
@Test
124124
void testDeserializeInvalidStorageType() {
125-
UuidType type = new UuidType();
125+
UuidType type = UuidType.INSTANCE;
126126
ArrowType wrongStorageType = new ArrowType.FixedSizeBinary(32);
127127

128128
assertThrows(UnsupportedOperationException.class, () -> type.deserialize(wrongStorageType, ""));
129129
}
130130

131131
@Test
132132
void testGetNewVector() {
133-
UuidType type = new UuidType();
133+
UuidType type = UuidType.INSTANCE;
134134
try (FieldVector vector =
135135
type.getNewVector("uuid_field", FieldType.nullable(type), allocator)) {
136136
assertInstanceOf(UuidVector.class, vector);
@@ -141,7 +141,7 @@ void testGetNewVector() {
141141

142142
@Test
143143
void testVectorOperations() {
144-
UuidType type = new UuidType();
144+
UuidType type = UuidType.INSTANCE;
145145
try (FieldVector vector =
146146
type.getNewVector("uuid_field", FieldType.nullable(type), allocator)) {
147147
UuidVector uuidVector = (UuidVector) vector;
@@ -218,7 +218,7 @@ void testVectorIpcRoundTrip() throws IOException {
218218

219219
@Test
220220
void testVectorByteArrayOperations() {
221-
UuidType type = new UuidType();
221+
UuidType type = UuidType.INSTANCE;
222222
try (FieldVector vector =
223223
type.getNewVector("uuid_field", FieldType.nullable(type), allocator)) {
224224
UuidVector uuidVector = (UuidVector) vector;
@@ -240,7 +240,7 @@ void testVectorByteArrayOperations() {
240240

241241
@Test
242242
void testGetNewVectorWithCustomFieldType() {
243-
UuidType type = new UuidType();
243+
UuidType type = UuidType.INSTANCE;
244244
FieldType fieldType = new FieldType(false, type, null);
245245

246246
try (FieldVector vector = type.getNewVector("non_nullable_uuid", fieldType, allocator)) {
@@ -262,7 +262,7 @@ void testSingleton() {
262262

263263
@Test
264264
void testUnderlyingVector() {
265-
UuidType type = new UuidType();
265+
UuidType type = UuidType.INSTANCE;
266266
try (FieldVector vector =
267267
type.getNewVector("uuid_field", FieldType.nullable(type), allocator)) {
268268
UuidVector uuidVector = (UuidVector) vector;

‎vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ public void testCopyListVectorWithExtensionType() {
860860
for (int i = 0; i < COUNT; i++) {
861861
listWriter.setPosition(i);
862862
listWriter.startList();
863-
ExtensionWriter extensionWriter = listWriter.extension(new UuidType());
863+
ExtensionWriter extensionWriter = listWriter.extension(UuidType.INSTANCE);
864864
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
865865
extensionWriter.writeExtension(UUID.randomUUID());
866866
extensionWriter.writeExtension(UUID.randomUUID());
@@ -896,10 +896,10 @@ public void testCopyMapVectorWithExtensionType() {
896896
mapWriter.setPosition(i);
897897
mapWriter.startMap();
898898
mapWriter.startEntry();
899-
ExtensionWriter extensionKeyWriter = mapWriter.key().extension(new UuidType());
899+
ExtensionWriter extensionKeyWriter = mapWriter.key().extension(UuidType.INSTANCE);
900900
extensionKeyWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
901901
extensionKeyWriter.writeExtension(UUID.randomUUID());
902-
ExtensionWriter extensionValueWriter = mapWriter.value().extension(new UuidType());
902+
ExtensionWriter extensionValueWriter = mapWriter.value().extension(UuidType.INSTANCE);
903903
extensionValueWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
904904
extensionValueWriter.writeExtension(UUID.randomUUID());
905905
mapWriter.endEntry();
@@ -934,10 +934,10 @@ public void testCopyStructVectorWithExtensionType() {
934934
for (int i = 0; i < COUNT; i++) {
935935
structWriter.setPosition(i);
936936
structWriter.start();
937-
ExtensionWriter extensionWriter1 = structWriter.extension("timestamp1", new UuidType());
937+
ExtensionWriter extensionWriter1 = structWriter.extension("timestamp1", UuidType.INSTANCE);
938938
extensionWriter1.addExtensionTypeWriterFactory(new UuidWriterFactory());
939939
extensionWriter1.writeExtension(UUID.randomUUID());
940-
ExtensionWriter extensionWriter2 = structWriter.extension("timestamp2", new UuidType());
940+
ExtensionWriter extensionWriter2 = structWriter.extension("timestamp2", UuidType.INSTANCE);
941941
extensionWriter2.addExtensionTypeWriterFactory(new UuidWriterFactory());
942942
extensionWriter2.writeExtension(UUID.randomUUID());
943943
structWriter.end();

‎vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ public void testExtensionType() throws Exception {
785785
try (final NonNullableStructVector container =
786786
NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
787787
final UuidVector v =
788-
container.addOrGet("uuid", FieldType.nullable(new UuidType()), UuidVector.class);
788+
container.addOrGet("uuid", FieldType.nullable(UuidType.INSTANCE), UuidVector.class);
789789
final PromotableWriter writer = new PromotableWriter(v, container)) {
790790
UUID u1 = UUID.randomUUID();
791791
UUID u2 = UUID.randomUUID();
@@ -810,7 +810,8 @@ public void testExtensionType() throws Exception {
810810
public void testExtensionTypeForList() throws Exception {
811811
try (final ListVector container = ListVector.empty(EMPTY_SCHEMA_PATH, allocator);
812812
final UuidVector v =
813-
(UuidVector) container.addOrGetVector(FieldType.nullable(new UuidType())).getVector();
813+
(UuidVector)
814+
container.addOrGetVector(FieldType.nullable(UuidType.INSTANCE)).getVector();
814815
final PromotableWriter writer = new PromotableWriter(v, container)) {
815816
UUID u1 = UUID.randomUUID();
816817
UUID u2 = UUID.randomUUID();

‎vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2510,7 +2510,7 @@ public void extensionWriterReader() throws Exception {
25102510
StructWriter rootWriter = writer.rootAsStruct();
25112511

25122512
{
2513-
ExtensionWriter extensionWriter = rootWriter.extension("uuid1", new UuidType());
2513+
ExtensionWriter extensionWriter = rootWriter.extension("uuid1", UuidType.INSTANCE);
25142514
extensionWriter.setPosition(0);
25152515
extensionWriter.addExtensionTypeWriterFactory(new UuidWriterFactory());
25162516
extensionWriter.writeExtension(u1);

0 commit comments

Comments
 (0)