Skip to content

Commit 4d92fa0

Browse files
xxlaykxxxxlaykxx
committed
removed cherry-pick for uuid vector
1 parent 3b3d208 commit 4d92fa0

File tree

18 files changed

+257
-1571
lines changed

18 files changed

+257
-1571
lines changed

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

Lines changed: 0 additions & 481 deletions
This file was deleted.

‎vector/src/main/java/org/apache/arrow/vector/holders/NullableUuidHolder.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎vector/src/main/java/org/apache/arrow/vector/util/UuidUtility.java‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static org.junit.jupiter.api.Assertions.assertSame;
2323
import static org.junit.jupiter.api.Assertions.assertTrue;
2424

25+
import java.nio.ByteBuffer;
2526
import java.util.ArrayList;
2627
import java.util.Arrays;
2728
import java.util.List;
@@ -35,14 +36,13 @@
3536
import org.apache.arrow.vector.complex.impl.UnionLargeListWriter;
3637
import org.apache.arrow.vector.complex.reader.FieldReader;
3738
import org.apache.arrow.vector.complex.writer.BaseWriter.ExtensionWriter;
38-
import org.apache.arrow.vector.extension.UuidType;
39-
import org.apache.arrow.vector.holders.UuidHolder;
39+
import org.apache.arrow.vector.holder.UuidHolder;
4040
import org.apache.arrow.vector.types.Types.MinorType;
4141
import org.apache.arrow.vector.types.pojo.ArrowType;
4242
import org.apache.arrow.vector.types.pojo.Field;
4343
import org.apache.arrow.vector.types.pojo.FieldType;
44+
import org.apache.arrow.vector.types.pojo.UuidType;
4445
import org.apache.arrow.vector.util.TransferPair;
45-
import org.apache.arrow.vector.util.UuidUtility;
4646
import org.junit.jupiter.api.AfterEach;
4747
import org.junit.jupiter.api.BeforeEach;
4848
import org.junit.jupiter.api.Test;
@@ -1038,17 +1038,17 @@ public void testCopyValueSafeForExtensionType() throws Exception {
10381038
UUID u1 = UUID.randomUUID();
10391039
UUID u2 = UUID.randomUUID();
10401040
writer.startList();
1041-
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
1042-
extensionWriter.writeExtension(u1);
1043-
extensionWriter.writeExtension(u2);
1041+
ExtensionWriter extensionWriter = writer.extension(new UuidType());
1042+
extensionWriter.writeExtension(u1, new UuidType());
1043+
extensionWriter.writeExtension(u2, new UuidType());
10441044
writer.endList();
10451045

10461046
// Create second list with UUIDs
10471047
writer.setPosition(1);
10481048
UUID u3 = UUID.randomUUID();
10491049
UUID u4 = UUID.randomUUID();
10501050
writer.startList();
1051-
extensionWriter = writer.extension(UuidType.INSTANCE);
1051+
extensionWriter = writer.extension(new UuidType());
10521052
extensionWriter.writeExtension(u3);
10531053
extensionWriter.writeExtension(u4);
10541054
extensionWriter.writeNull();
@@ -1072,12 +1072,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
10721072
FieldReader uuidReader = reader.reader();
10731073
UuidHolder holder = new UuidHolder();
10741074
uuidReader.read(holder);
1075-
UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1075+
ByteBuffer bb = ByteBuffer.wrap(holder.value);
1076+
UUID actualUuid = new UUID(bb.getLong(), bb.getLong());
10761077
assertEquals(u1, actualUuid);
10771078
reader.next();
10781079
uuidReader = reader.reader();
10791080
uuidReader.read(holder);
1080-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1081+
bb = ByteBuffer.wrap(holder.value);
1082+
actualUuid = new UUID(bb.getLong(), bb.getLong());
10811083
assertEquals(u2, actualUuid);
10821084

10831085
// Verify second list
@@ -1086,12 +1088,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
10861088
reader.next();
10871089
uuidReader = reader.reader();
10881090
uuidReader.read(holder);
1089-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1091+
bb = ByteBuffer.wrap(holder.value);
1092+
actualUuid = new UUID(bb.getLong(), bb.getLong());
10901093
assertEquals(u3, actualUuid);
10911094
reader.next();
10921095
uuidReader = reader.reader();
10931096
uuidReader.read(holder);
1094-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1097+
bb = ByteBuffer.wrap(holder.value);
1098+
actualUuid = new UUID(bb.getLong(), bb.getLong());
10951099
assertEquals(u4, actualUuid);
10961100
reader.next();
10971101
uuidReader = reader.reader();

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

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static org.junit.jupiter.api.Assertions.assertThrows;
2424
import static org.junit.jupiter.api.Assertions.assertTrue;
2525

26+
import java.nio.ByteBuffer;
2627
import java.util.ArrayList;
2728
import java.util.Arrays;
2829
import java.util.List;
@@ -36,18 +37,17 @@
3637
import org.apache.arrow.vector.complex.impl.UnionListWriter;
3738
import org.apache.arrow.vector.complex.reader.FieldReader;
3839
import org.apache.arrow.vector.complex.writer.BaseWriter.ExtensionWriter;
39-
import org.apache.arrow.vector.extension.UuidType;
40+
import org.apache.arrow.vector.holder.UuidHolder;
4041
import org.apache.arrow.vector.holders.DurationHolder;
4142
import org.apache.arrow.vector.holders.FixedSizeBinaryHolder;
4243
import org.apache.arrow.vector.holders.TimeStampMilliTZHolder;
43-
import org.apache.arrow.vector.holders.UuidHolder;
4444
import org.apache.arrow.vector.types.TimeUnit;
4545
import org.apache.arrow.vector.types.Types.MinorType;
4646
import org.apache.arrow.vector.types.pojo.ArrowType;
4747
import org.apache.arrow.vector.types.pojo.Field;
4848
import org.apache.arrow.vector.types.pojo.FieldType;
49+
import org.apache.arrow.vector.types.pojo.UuidType;
4950
import org.apache.arrow.vector.util.TransferPair;
50-
import org.apache.arrow.vector.util.UuidUtility;
5151
import org.junit.jupiter.api.AfterEach;
5252
import org.junit.jupiter.api.BeforeEach;
5353
import org.junit.jupiter.api.Test;
@@ -1214,7 +1214,7 @@ public void testListVectorWithExtensionType() throws Exception {
12141214
UUID u1 = UUID.randomUUID();
12151215
UUID u2 = UUID.randomUUID();
12161216
writer.startList();
1217-
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
1217+
ExtensionWriter extensionWriter = writer.extension(new UuidType());
12181218
extensionWriter.writeExtension(u1);
12191219
extensionWriter.writeExtension(u2);
12201220
writer.endList();
@@ -1241,9 +1241,9 @@ public void testListVectorReaderForExtensionType() throws Exception {
12411241
UUID u1 = UUID.randomUUID();
12421242
UUID u2 = UUID.randomUUID();
12431243
writer.startList();
1244-
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
1245-
extensionWriter.writeExtension(u1);
1246-
extensionWriter.writeExtension(u2);
1244+
ExtensionWriter extensionWriter = writer.extension(new UuidType());
1245+
extensionWriter.writeExtension(u1, new UuidType());
1246+
extensionWriter.writeExtension(u2, new UuidType());
12471247
writer.endList();
12481248

12491249
writer.setValueCount(1);
@@ -1255,12 +1255,14 @@ public void testListVectorReaderForExtensionType() throws Exception {
12551255
FieldReader uuidReader = reader.reader();
12561256
UuidHolder holder = new UuidHolder();
12571257
uuidReader.read(holder);
1258-
UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1258+
ByteBuffer bb = ByteBuffer.wrap(holder.value);
1259+
UUID actualUuid = new UUID(bb.getLong(), bb.getLong());
12591260
assertEquals(u1, actualUuid);
12601261
reader.next();
12611262
uuidReader = reader.reader();
12621263
uuidReader.read(holder);
1263-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1264+
bb = ByteBuffer.wrap(holder.value);
1265+
actualUuid = new UUID(bb.getLong(), bb.getLong());
12641266
assertEquals(u2, actualUuid);
12651267
}
12661268
}
@@ -1276,8 +1278,8 @@ public void testCopyFromForExtensionType() throws Exception {
12761278
UUID u2 = UUID.randomUUID();
12771279
writer.startList();
12781280

1279-
writer.extension(UuidType.INSTANCE).writeExtension(u1);
1280-
writer.writeExtension(u2);
1281+
writer.extension(new UuidType()).writeExtension(u1, new UuidType());
1282+
writer.writeExtension(u2, new UuidType());
12811283
writer.writeNull();
12821284
writer.endList();
12831285

@@ -1295,12 +1297,14 @@ public void testCopyFromForExtensionType() throws Exception {
12951297
FieldReader uuidReader = reader.reader();
12961298
UuidHolder holder = new UuidHolder();
12971299
uuidReader.read(holder);
1298-
UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1300+
ByteBuffer bb = ByteBuffer.wrap(holder.value);
1301+
UUID actualUuid = new UUID(bb.getLong(), bb.getLong());
12991302
assertEquals(u1, actualUuid);
13001303
reader.next();
13011304
uuidReader = reader.reader();
13021305
uuidReader.read(holder);
1303-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1306+
bb = ByteBuffer.wrap(holder.value);
1307+
actualUuid = new UUID(bb.getLong(), bb.getLong());
13041308
assertEquals(u2, actualUuid);
13051309
}
13061310
}
@@ -1317,7 +1321,7 @@ public void testCopyValueSafeForExtensionType() throws Exception {
13171321
UUID u1 = UUID.randomUUID();
13181322
UUID u2 = UUID.randomUUID();
13191323
writer.startList();
1320-
ExtensionWriter extensionWriter = writer.extension(UuidType.INSTANCE);
1324+
ExtensionWriter extensionWriter = writer.extension(new UuidType());
13211325
extensionWriter.writeExtension(u1);
13221326
extensionWriter.writeExtension(u2);
13231327
writer.endList();
@@ -1327,7 +1331,7 @@ public void testCopyValueSafeForExtensionType() throws Exception {
13271331
UUID u3 = UUID.randomUUID();
13281332
UUID u4 = UUID.randomUUID();
13291333
writer.startList();
1330-
extensionWriter = writer.extension(UuidType.INSTANCE);
1334+
extensionWriter = writer.extension(new UuidType());
13311335
extensionWriter.writeExtension(u3);
13321336
extensionWriter.writeExtension(u4);
13331337
extensionWriter.writeNull();
@@ -1351,12 +1355,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
13511355
FieldReader uuidReader = reader.reader();
13521356
UuidHolder holder = new UuidHolder();
13531357
uuidReader.read(holder);
1354-
UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1358+
ByteBuffer bb = ByteBuffer.wrap(holder.value);
1359+
UUID actualUuid = new UUID(bb.getLong(), bb.getLong());
13551360
assertEquals(u1, actualUuid);
13561361
reader.next();
13571362
uuidReader = reader.reader();
13581363
uuidReader.read(holder);
1359-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1364+
bb = ByteBuffer.wrap(holder.value);
1365+
actualUuid = new UUID(bb.getLong(), bb.getLong());
13601366
assertEquals(u2, actualUuid);
13611367

13621368
// Verify second list
@@ -1365,12 +1371,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
13651371
reader.next();
13661372
uuidReader = reader.reader();
13671373
uuidReader.read(holder);
1368-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1374+
bb = ByteBuffer.wrap(holder.value);
1375+
actualUuid = new UUID(bb.getLong(), bb.getLong());
13691376
assertEquals(u3, actualUuid);
13701377
reader.next();
13711378
uuidReader = reader.reader();
13721379
uuidReader.read(holder);
1373-
actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
1380+
bb = ByteBuffer.wrap(holder.value);
1381+
actualUuid = new UUID(bb.getLong(), bb.getLong());
13741382
assertEquals(u4, actualUuid);
13751383
reader.next();
13761384
uuidReader = reader.reader();

0 commit comments

Comments
 (0)