Skip to content

Commit

Permalink
fixing warnings v16: vector s4
Browse files Browse the repository at this point in the history
  • Loading branch information
@vibhatha
vibhatha committed Jan 12, 2024
1 parent 389237e commit 70e9efa
Show file tree
Hide file tree
Showing 16 changed files with 275 additions and 250 deletions.
6 changes: 3 additions & 3 deletions java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public void testGetNullCount() throws Exception {
validityBuffer.setByte(0, 0xFF);

count = BitVectorHelper.getNullCount(validityBuffer, 8);
assertEquals(count, 0);
assertEquals(0, count);
validityBuffer.close();

// test case 3, 1 null value for 0x7F
validityBuffer = root.buffer(8);
validityBuffer.setByte(0, 0x7F);

count = BitVectorHelper.getNullCount(validityBuffer, 8);
assertEquals(count, 1);
assertEquals(1, count);
validityBuffer.close();

// test case 4, validity buffer has multiple bytes, 11 items
Expand All @@ -64,7 +64,7 @@ public void testGetNullCount() throws Exception {
validityBuffer.setByte(1, 0b01010101);

count = BitVectorHelper.getNullCount(validityBuffer, 11);
assertEquals(count, 5);
assertEquals(5, count);
validityBuffer.close();
}
}
Expand Down
10 changes: 5 additions & 5 deletions java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import static org.junit.Assert.assertNull;

import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Period;

Expand Down Expand Up @@ -84,7 +84,7 @@ public void testCopyFromWithNulls() {
if (i % 3 == 0) {
continue;
}
byte[] b = Integer.toString(i).getBytes();
byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
vector.setSafe(i, b, 0, b.length);
}

Expand Down Expand Up @@ -156,7 +156,7 @@ public void testCopyFromWithNulls1() {
if (i % 3 == 0) {
continue;
}
byte[] b = Integer.toString(i).getBytes();
byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
vector.setSafe(i, b, 0, b.length);
}

Expand Down Expand Up @@ -950,7 +950,7 @@ public void testCopyFromWithNulls13() {
assertEquals(0, vector1.getValueCount());
int initialCapacity = vector1.getValueCapacity();

final double baseValue = 104567897654.876543654;
final double baseValue = 104567897654.87654;
final BigDecimal[] decimals = new BigDecimal[4096];
for (int i = 0; i < initialCapacity; i++) {
if ((i & 1) == 0) {
Expand Down Expand Up @@ -1082,7 +1082,7 @@ public void testCopySafeArrow7837() {
// to trigger a reallocation of the vector.
vc2.setInitialCapacity(/*valueCount*/20, /*density*/0.5);

vc1.setSafe(0, "1234567890".getBytes(Charset.forName("utf-8")));
vc1.setSafe(0, "1234567890".getBytes(StandardCharsets.UTF_8));
assertFalse(vc1.isNull(0));
assertEquals(vc1.getObject(0).toString(), "1234567890");

Expand Down
35 changes: 18 additions & 17 deletions java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,8 @@ public void testEncodeStructSubFieldWithCertainColumns() {
// initialize dictionaries
DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();

setVector(dictVector1, "aa".getBytes(), "bb".getBytes(), "cc".getBytes(), "dd".getBytes());
setVector(dictVector1, "aa".getBytes(StandardCharsets.UTF_8), "bb".getBytes(StandardCharsets.UTF_8),
"cc".getBytes(StandardCharsets.UTF_8), "dd".getBytes(StandardCharsets.UTF_8));

provider.put(new Dictionary(dictVector1, new DictionaryEncoding(1L, false, null)));
StructSubfieldEncoder encoder = new StructSubfieldEncoder(allocator, provider);
Expand Down Expand Up @@ -1049,20 +1050,20 @@ private void testDictionary(Dictionary dictionary, ToIntBiFunction<ValueVector,

// verify encoded result
assertEquals(vector.getValueCount(), encodedVector.getValueCount());
assertEquals(valGetter.applyAsInt(encodedVector, 0), 1);
assertEquals(valGetter.applyAsInt(encodedVector, 1), 3);
assertEquals(valGetter.applyAsInt(encodedVector, 2), 5);
assertEquals(valGetter.applyAsInt(encodedVector, 3), 7);
assertEquals(valGetter.applyAsInt(encodedVector, 4), 9);
assertEquals(1, valGetter.applyAsInt(encodedVector, 0));
assertEquals(3, valGetter.applyAsInt(encodedVector, 1));
assertEquals(5, valGetter.applyAsInt(encodedVector, 2));
assertEquals(7, valGetter.applyAsInt(encodedVector, 3));
assertEquals(9, valGetter.applyAsInt(encodedVector, 4));

try (ValueVector decodedVector = DictionaryEncoder.decode(encodedVector, dictionary)) {
assertTrue(decodedVector instanceof VarCharVector);
assertEquals(vector.getValueCount(), decodedVector.getValueCount());
assertArrayEquals("1".getBytes(), ((VarCharVector) decodedVector).get(0));
assertArrayEquals("3".getBytes(), ((VarCharVector) decodedVector).get(1));
assertArrayEquals("5".getBytes(), ((VarCharVector) decodedVector).get(2));
assertArrayEquals("7".getBytes(), ((VarCharVector) decodedVector).get(3));
assertArrayEquals("9".getBytes(), ((VarCharVector) decodedVector).get(4));
assertArrayEquals("1".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(0));
assertArrayEquals("3".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(1));
assertArrayEquals("5".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(2));
assertArrayEquals("7".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(3));
assertArrayEquals("9".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(4));
}
}
}
Expand All @@ -1085,7 +1086,7 @@ public void testDictionaryUInt2() {
setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
Dictionary dictionary2 = new Dictionary(dictionaryVector,
new DictionaryEncoding(/*id=*/20L, /*ordered=*/false,
/*indexType=*/new ArrowType.Int(/*indexType=*/16, /*isSigned*/false)));
/*indexType=*/new ArrowType.Int(/*bitWidth=*/16, /*isSigned*/false)));
testDictionary(dictionary2, (vector, index) -> ((UInt2Vector) vector).get(index));
}
}
Expand All @@ -1096,7 +1097,7 @@ public void testDictionaryUInt4() {
setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
Dictionary dictionary4 = new Dictionary(dictionaryVector,
new DictionaryEncoding(/*id=*/30L, /*ordered=*/false,
/*indexType=*/new ArrowType.Int(/*indexType=*/32, /*isSigned*/false)));
/*indexType=*/new ArrowType.Int(/*bitWidth=*/32, /*isSigned*/false)));
testDictionary(dictionary4, (vector, index) -> ((UInt4Vector) vector).get(index));
}
}
Expand All @@ -1107,7 +1108,7 @@ public void testDictionaryUInt8() {
setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
Dictionary dictionary8 = new Dictionary(dictionaryVector,
new DictionaryEncoding(/*id=*/40L, /*ordered=*/false,
/*indexType=*/new ArrowType.Int(/*indexType=*/64, /*isSigned*/false)));
/*indexType=*/new ArrowType.Int(/*bitWidth=*/64, /*isSigned*/false)));
testDictionary(dictionary8, (vector, index) -> (int) ((UInt8Vector) vector).get(index));
}
}
Expand All @@ -1119,13 +1120,13 @@ public void testDictionaryUIntOverflow() {
try (VarCharVector dictionaryVector = new VarCharVector("dict vector", allocator)) {
dictionaryVector.allocateNew(vecLength * 3, vecLength);
for (int i = 0; i < vecLength; i++) {
dictionaryVector.set(i, String.valueOf(i).getBytes());
dictionaryVector.set(i, String.valueOf(i).getBytes(StandardCharsets.UTF_8));
}
dictionaryVector.setValueCount(vecLength);

Dictionary dictionary = new Dictionary(dictionaryVector,
new DictionaryEncoding(/*id=*/10L, /*ordered=*/false,
/*indexType=*/new ArrowType.Int(/*indexType=*/8, /*isSigned*/false)));
/*indexType=*/new ArrowType.Int(/*bitWidth=*/8, /*isSigned*/false)));

try (VarCharVector vector = new VarCharVector("vector", allocator)) {
setVector(vector, "255");
Expand All @@ -1137,7 +1138,7 @@ public void testDictionaryUIntOverflow() {

try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dictionary)) {
assertEquals(1, decodedVector.getValueCount());
assertArrayEquals("255".getBytes(), decodedVector.get(0));
assertArrayEquals("255".getBytes(StandardCharsets.UTF_8), decodedVector.get(0));
}
}
}
Expand Down
71 changes: 38 additions & 33 deletions java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;

Expand Down Expand Up @@ -61,7 +62,7 @@ public void terminate() throws Exception {

@Test
public void testIntType() {
try (FixedSizeListVector vector = FixedSizeListVector.empty("list", 2, allocator)) {
try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/2, allocator)) {
IntVector nested = (IntVector) vector.addOrGetVector(FieldType.nullable(MinorType.INT.getType())).getVector();
vector.allocateNew();

Expand All @@ -88,7 +89,7 @@ public void testIntType() {

@Test
public void testFloatTypeNullable() {
try (FixedSizeListVector vector = FixedSizeListVector.empty("list", 2, allocator)) {
try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/2, allocator)) {
Float4Vector nested = (Float4Vector) vector.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType()))
.getVector();
vector.allocateNew();
Expand Down Expand Up @@ -235,7 +236,7 @@ public void testTransferPair() {

@Test
public void testConsistentChildName() throws Exception {
try (FixedSizeListVector listVector = FixedSizeListVector.empty("sourceVector", 2, allocator)) {
try (FixedSizeListVector listVector = FixedSizeListVector.empty("sourceVector", /*size=*/2, allocator)) {
String emptyListStr = listVector.getField().toString();
Assert.assertTrue(emptyListStr.contains(ListVector.DATA_VECTOR_NAME));

Expand All @@ -251,7 +252,7 @@ public void testUnionFixedSizeListWriterWithNulls() throws Exception {
* each list of size 3 and having its data values alternating between null and a non-null.
* Read and verify
*/
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/3, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();
Expand Down Expand Up @@ -279,7 +280,7 @@ public void testUnionFixedSizeListWriterWithNulls() throws Exception {

@Test
public void testUnionFixedSizeListWriter() throws Exception {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", 3, allocator)) {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer1 = vector1.getWriter();
writer1.allocate();
Expand Down Expand Up @@ -307,7 +308,7 @@ public void testUnionFixedSizeListWriter() throws Exception {

@Test
public void testWriteDecimal() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/3, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();
Expand Down Expand Up @@ -335,7 +336,7 @@ public void testWriteDecimal() throws Exception {

@Test
public void testDecimalIndexCheck() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/3, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();
Expand All @@ -355,7 +356,7 @@ public void testDecimalIndexCheck() throws Exception {

@Test(expected = IllegalStateException.class)
public void testWriteIllegalData() throws Exception {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", 3, allocator)) {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer1 = vector1.getWriter();
writer1.allocate();
Expand All @@ -378,7 +379,7 @@ public void testWriteIllegalData() throws Exception {

@Test
public void testSplitAndTransfer() throws Exception {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", 3, allocator)) {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {

UnionFixedSizeListWriter writer1 = vector1.getWriter();
writer1.allocate();
Expand All @@ -399,17 +400,17 @@ public void testSplitAndTransfer() throws Exception {

assertEquals(2, targetVector.getValueCount());
int[] realValue1 = convertListToIntArray(targetVector.getObject(0));
assertTrue(Arrays.equals(values1, realValue1));
assertArrayEquals(values1, realValue1);
int[] realValue2 = convertListToIntArray(targetVector.getObject(1));
assertTrue(Arrays.equals(values2, realValue2));
assertArrayEquals(values2, realValue2);

targetVector.clear();
}
}

@Test
public void testZeroWidthVector() {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", 0, allocator)) {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/0, allocator)) {

UnionFixedSizeListWriter writer1 = vector1.getWriter();
writer1.allocate();
Expand Down Expand Up @@ -440,7 +441,7 @@ public void testZeroWidthVector() {

@Test
public void testVectorWithNulls() {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", 4, allocator)) {
try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {

UnionFixedSizeListWriter writer1 = vector1.getWriter();
writer1.allocate();
Expand Down Expand Up @@ -472,7 +473,7 @@ public void testVectorWithNulls() {

@Test
public void testWriteVarCharHelpers() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/4, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();
Expand All @@ -491,7 +492,7 @@ public void testWriteVarCharHelpers() throws Exception {

@Test
public void testWriteLargeVarCharHelpers() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/4, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();
Expand All @@ -510,43 +511,47 @@ public void testWriteLargeVarCharHelpers() throws Exception {

@Test
public void testWriteVarBinaryHelpers() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/4, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();

writer.startList();
writer.writeVarBinary("row1,1".getBytes());
writer.writeVarBinary("row1,2".getBytes(), 0, "row1,2".getBytes().length);
writer.writeVarBinary(ByteBuffer.wrap("row1,3".getBytes()));
writer.writeVarBinary(ByteBuffer.wrap("row1,4".getBytes()), 0, "row1,4".getBytes().length);
writer.writeVarBinary("row1,1".getBytes(StandardCharsets.UTF_8));
writer.writeVarBinary("row1,2".getBytes(StandardCharsets.UTF_8), 0,
"row1,2".getBytes(StandardCharsets.UTF_8).length);
writer.writeVarBinary(ByteBuffer.wrap("row1,3".getBytes(StandardCharsets.UTF_8)));
writer.writeVarBinary(ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)), 0,
"row1,4".getBytes(StandardCharsets.UTF_8).length);
writer.endList();

assertEquals("row1,1", new String((byte[]) (vector.getObject(0).get(0))));
assertEquals("row1,2", new String((byte[]) (vector.getObject(0).get(1))));
assertEquals("row1,3", new String((byte[]) (vector.getObject(0).get(2))));
assertEquals("row1,4", new String((byte[]) (vector.getObject(0).get(3))));
assertEquals("row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
assertEquals("row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
assertEquals("row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
assertEquals("row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
}
}

@Test
public void testWriteLargeVarBinaryHelpers() throws Exception {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*listSize=*/4, allocator)) {
try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {

UnionFixedSizeListWriter writer = vector.getWriter();
writer.allocate();

writer.startList();
writer.writeLargeVarBinary("row1,1".getBytes());
writer.writeLargeVarBinary("row1,2".getBytes(), 0, "row1,2".getBytes().length);
writer.writeLargeVarBinary(ByteBuffer.wrap("row1,3".getBytes()));
writer.writeLargeVarBinary(ByteBuffer.wrap("row1,4".getBytes()), 0, "row1,4".getBytes().length);
writer.writeLargeVarBinary("row1,1".getBytes(StandardCharsets.UTF_8));
writer.writeLargeVarBinary("row1,2".getBytes(StandardCharsets.UTF_8), 0,
"row1,2".getBytes(StandardCharsets.UTF_8).length);
writer.writeLargeVarBinary(ByteBuffer.wrap("row1,3".getBytes(StandardCharsets.UTF_8)));
writer.writeLargeVarBinary(ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)), 0,
"row1,4".getBytes(StandardCharsets.UTF_8).length);
writer.endList();

assertEquals("row1,1", new String((byte[]) (vector.getObject(0).get(0))));
assertEquals("row1,2", new String((byte[]) (vector.getObject(0).get(1))));
assertEquals("row1,3", new String((byte[]) (vector.getObject(0).get(2))));
assertEquals("row1,4", new String((byte[]) (vector.getObject(0).get(3))));
assertEquals("row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
assertEquals("row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
assertEquals("row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
assertEquals("row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
}
}

Expand Down
Loading

0 comments on commit 70e9efa

Please sign in to comment.