Skip to content

Commit 248164b

Browse files
rtadepallirtadepalli
committed
GH-774: Consoliate BitVectorHelper.getValidityBufferSize and BaseValueVector.getValidityBufferSizeFromCount 
1 parent 17f85a1 commit 248164b

22 files changed

+50
-35
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector;
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021

2122
import java.nio.ByteBuffer;
2223
import java.util.ArrayList;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector;
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021

2122
import java.nio.ByteBuffer;
2223
import java.util.ArrayList;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ protected ArrowBuf releaseBuffer(ArrowBuf buffer) {
110110
return buffer;
111111
}
112112

113-
/* number of bytes for the validity buffer for the given valueCount */
114-
protected static int getValidityBufferSizeFromCount(final int valueCount) {
115-
return DataSizeRoundingUtil.divideBy8Ceil(valueCount);
116-
}
117-
118113
/* round up bytes for the validity buffer for the given valueCount */
119114
private static long roundUp8ForValidityBuffer(long valueCount) {
120115
return ((valueCount + 63) >> 6) << 3;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector;
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021

2122
import java.nio.ByteBuffer;
2223
import java.util.ArrayList;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector;
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021
import static org.apache.arrow.vector.util.DataSizeRoundingUtil.roundUpToMultipleOf16;
2122

2223
import java.nio.ByteBuffer;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector;
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021
import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
2122

2223
import org.apache.arrow.memory.ArrowBuf;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ public static void setValidityBit(ArrowBuf validityBuffer, int index, int value)
135135
public static ArrowBuf setValidityBit(
136136
ArrowBuf validityBuffer, BufferAllocator allocator, int valueCount, int index, int value) {
137137
if (validityBuffer == null) {
138-
validityBuffer = allocator.buffer(getValidityBufferSize(valueCount));
138+
validityBuffer = allocator.buffer(getValidityBufferSizeFromCount(valueCount));
139139
}
140140
setValidityBit(validityBuffer, index, value);
141141
if (index == (valueCount - 1)) {
142-
validityBuffer.writerIndex(getValidityBufferSize(valueCount));
142+
validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount));
143143
}
144144

145145
return validityBuffer;
@@ -165,7 +165,7 @@ public static int get(final ArrowBuf buffer, int index) {
165165
* @param valueCount number of elements in the vector
166166
* @return buffer size
167167
*/
168-
public static int getValidityBufferSize(int valueCount) {
168+
public static int getValidityBufferSizeFromCount(int valueCount) {
169169
return DataSizeRoundingUtil.divideBy8Ceil(valueCount);
170170
}
171171

@@ -182,7 +182,7 @@ public static int getNullCount(final ArrowBuf validityBuffer, final int valueCou
182182
return 0;
183183
}
184184
int count = 0;
185-
final int sizeInBytes = getValidityBufferSize(valueCount);
185+
final int sizeInBytes = getValidityBufferSizeFromCount(valueCount);
186186
// If value count is not a multiple of 8, then calculate number of used bits in the last byte
187187
final int remainder = valueCount % 8;
188188
final int fullBytesCount = remainder == 0 ? sizeInBytes : sizeInBytes - 1;
@@ -233,7 +233,7 @@ public static boolean checkAllBitsEqualTo(
233233
if (valueCount == 0) {
234234
return true;
235235
}
236-
final int sizeInBytes = getValidityBufferSize(valueCount);
236+
final int sizeInBytes = getValidityBufferSizeFromCount(valueCount);
237237

238238
// boundary check
239239
validityBuffer.checkBytes(0, sizeInBytes);
@@ -325,7 +325,7 @@ public static ArrowBuf loadValidityBuffer(
325325
sourceValidityBuffer == null || sourceValidityBuffer.capacity() == 0;
326326
if (isValidityBufferNull
327327
&& (fieldNode.getNullCount() == 0 || fieldNode.getNullCount() == valueCount)) {
328-
newBuffer = allocator.buffer(getValidityBufferSize(valueCount));
328+
newBuffer = allocator.buffer(getValidityBufferSizeFromCount(valueCount));
329329
newBuffer.setZero(0, newBuffer.capacity());
330330
if (fieldNode.getNullCount() != 0) {
331331
/* all NULLs */

‎vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
2121
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2222
import static org.apache.arrow.util.Preconditions.checkArgument;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324
import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.DATA_VECTOR_NAME;
2425

2526
import java.util.ArrayList;

‎vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
2121
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2222
import static org.apache.arrow.util.Preconditions.checkArgument;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324

2425
import java.util.ArrayList;
2526
import java.util.Arrays;

‎vector/src/main/java/org/apache/arrow/vector/complex/LargeListViewVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
2121
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2222
import static org.apache.arrow.util.Preconditions.checkArgument;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324

2425
import java.util.ArrayList;
2526
import java.util.Arrays;

‎vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
2121
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2222
import static org.apache.arrow.util.Preconditions.checkArgument;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324

2425
import java.util.ArrayList;
2526
import java.util.Arrays;

‎vector/src/main/java/org/apache/arrow/vector/complex/ListViewVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
2121
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2222
import static org.apache.arrow.util.Preconditions.checkArgument;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324

2425
import java.util.ArrayList;
2526
import java.util.Arrays;

‎vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.arrow.vector.complex;
1818

1919
import static org.apache.arrow.util.Preconditions.checkArgument;
20+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2021

2122
import java.util.List;
2223
import org.apache.arrow.memory.BufferAllocator;

‎vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
2020
import static org.apache.arrow.util.Preconditions.checkNotNull;
21+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2122

2223
import java.util.ArrayList;
2324
import java.util.Arrays;
@@ -89,7 +90,7 @@ public StructVector(
8990
super(name, checkNotNull(allocator), fieldType, callBack);
9091
this.validityBuffer = allocator.getEmpty();
9192
this.validityAllocationSizeInBytes =
92-
BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
93+
getValidityBufferSizeFromCount(BaseValueVector.INITIAL_VALUE_ALLOCATION);
9394
}
9495

9596
/**
@@ -118,7 +119,7 @@ public StructVector(
118119
allowConflictPolicyChanges);
119120
this.validityBuffer = allocator.getEmpty();
120121
this.validityAllocationSizeInBytes =
121-
BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
122+
getValidityBufferSizeFromCount(BaseValueVector.INITIAL_VALUE_ALLOCATION);
122123
}
123124

124125
/**
@@ -132,7 +133,7 @@ public StructVector(Field field, BufferAllocator allocator, CallBack callBack) {
132133
super(field, checkNotNull(allocator), callBack);
133134
this.validityBuffer = allocator.getEmpty();
134135
this.validityAllocationSizeInBytes =
135-
BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
136+
getValidityBufferSizeFromCount(BaseValueVector.INITIAL_VALUE_ALLOCATION);
136137
}
137138

138139
/**
@@ -153,7 +154,7 @@ public StructVector(
153154
super(field, checkNotNull(allocator), callBack, conflictPolicy, allowConflictPolicyChanges);
154155
this.validityBuffer = allocator.getEmpty();
155156
this.validityAllocationSizeInBytes =
156-
BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
157+
getValidityBufferSizeFromCount(BaseValueVector.INITIAL_VALUE_ALLOCATION);
157158
}
158159

159160
@Override
@@ -182,7 +183,7 @@ public List<ArrowBuf> getFieldBuffers() {
182183

183184
private void setReaderAndWriterIndex() {
184185
validityBuffer.readerIndex(0);
185-
validityBuffer.writerIndex(BitVectorHelper.getValidityBufferSize(valueCount));
186+
validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount));
186187
}
187188

188189
/**
@@ -318,7 +319,7 @@ public void splitAndTransfer(int startIndex, int length) {
318319
private void splitAndTransferValidityBuffer(int startIndex, int length, StructVector target) {
319320
int firstByteSource = BitVectorHelper.byteIndex(startIndex);
320321
int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
321-
int byteSizeTarget = BitVectorHelper.getValidityBufferSize(length);
322+
int byteSizeTarget = getValidityBufferSizeFromCount(length);
322323
int offset = startIndex % 8;
323324

324325
if (length > 0) {
@@ -464,7 +465,7 @@ public int getBufferSize() {
464465
if (valueCount == 0) {
465466
return 0;
466467
}
467-
return super.getBufferSize() + BitVectorHelper.getValidityBufferSize(valueCount);
468+
return super.getBufferSize() + getValidityBufferSizeFromCount(valueCount);
468469
}
469470

470471
/**
@@ -478,18 +479,18 @@ public int getBufferSizeFor(final int valueCount) {
478479
if (valueCount == 0) {
479480
return 0;
480481
}
481-
return super.getBufferSizeFor(valueCount) + BitVectorHelper.getValidityBufferSize(valueCount);
482+
return super.getBufferSizeFor(valueCount) + getValidityBufferSizeFromCount(valueCount);
482483
}
483484

484485
@Override
485486
public void setInitialCapacity(int numRecords) {
486-
validityAllocationSizeInBytes = BitVectorHelper.getValidityBufferSize(numRecords);
487+
validityAllocationSizeInBytes = getValidityBufferSizeFromCount(numRecords);
487488
super.setInitialCapacity(numRecords);
488489
}
489490

490491
@Override
491492
public void setInitialCapacity(int numRecords, double density) {
492-
validityAllocationSizeInBytes = BitVectorHelper.getValidityBufferSize(numRecords);
493+
validityAllocationSizeInBytes = getValidityBufferSizeFromCount(numRecords);
493494
super.setInitialCapacity(numRecords, density);
494495
}
495496

@@ -547,7 +548,7 @@ private long getNewAllocationSize(int currentBufferCapacity) {
547548
newAllocationSize = validityAllocationSizeInBytes;
548549
} else {
549550
newAllocationSize =
550-
BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION) * 2L;
551+
getValidityBufferSizeFromCount(BaseValueVector.INITIAL_VALUE_ALLOCATION) * 2L;
551552
}
552553
}
553554
newAllocationSize = CommonUtil.nextPowerOfTwo(newAllocationSize);

‎vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.fasterxml.jackson.core.JsonToken.END_OBJECT;
2121
import static com.fasterxml.jackson.core.JsonToken.START_ARRAY;
2222
import static com.fasterxml.jackson.core.JsonToken.START_OBJECT;
23+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
2324
import static org.apache.arrow.vector.BufferLayout.BufferType.DATA;
2425
import static org.apache.arrow.vector.BufferLayout.BufferType.OFFSET;
2526
import static org.apache.arrow.vector.BufferLayout.BufferType.SIZE;
@@ -381,7 +382,7 @@ private class BufferHelper {
381382
new BufferReader() {
382383
@Override
383384
protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
384-
final int bufferSize = BitVectorHelper.getValidityBufferSize(count);
385+
final int bufferSize = getValidityBufferSizeFromCount(count);
385386
ArrowBuf buf = allocator.buffer(bufferSize);
386387

387388
// C++ integration test fails without this.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.arrow.vector;
1818

19+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -943,7 +944,7 @@ public void testGetBufferSizeFor() {
943944
int[] indices = new int[] {0, 2, 4, 6, 10, 14};
944945

945946
for (int valueCount = 1; valueCount <= 5; valueCount++) {
946-
int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
947+
int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
947948
int offsetBufferSize = (valueCount + 1) * LargeListVector.OFFSET_WIDTH;
948949

949950
int expectedSize =

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.arrow.vector;
1818

19+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertSame;
@@ -1062,7 +1063,7 @@ public void testGetBufferSizeFor() {
10621063
int[] indices = new int[] {0, 2, 4, 6, 10, 14};
10631064

10641065
for (int valueCount = 1; valueCount <= 5; valueCount++) {
1065-
int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
1066+
int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
10661067
int offsetBufferSize = valueCount * BaseLargeRepeatedValueViewVector.OFFSET_WIDTH;
10671068
int sizeBufferSize = valueCount * BaseLargeRepeatedValueViewVector.SIZE_WIDTH;
10681069

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.arrow.vector;
1818

19+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -1123,7 +1124,7 @@ public void testGetBufferSizeFor() {
11231124
int[] indices = new int[] {0, 2, 4, 6, 10, 14};
11241125

11251126
for (int valueCount = 1; valueCount <= 5; valueCount++) {
1126-
int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
1127+
int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
11271128
int offsetBufferSize = (valueCount + 1) * BaseRepeatedValueVector.OFFSET_WIDTH;
11281129

11291130
int expectedSize =

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.arrow.vector;
1818

19+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -1075,7 +1076,7 @@ public void testGetBufferSizeFor() {
10751076
int[] indices = new int[] {0, 2, 4, 6, 10, 14};
10761077

10771078
for (int valueCount = 1; valueCount <= 5; valueCount++) {
1078-
int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
1079+
int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
10791080
int offsetBufferSize = valueCount * BaseRepeatedValueViewVector.OFFSET_WIDTH;
10801081
int sizeBufferSize = valueCount * BaseRepeatedValueViewVector.SIZE_WIDTH;
10811082

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.arrow.vector;
1818

19+
import static org.apache.arrow.vector.BitVectorHelper.getValidityBufferSizeFromCount;
1920
import static org.apache.arrow.vector.TestUtils.newVarBinaryVector;
2021
import static org.apache.arrow.vector.TestUtils.newVarCharVector;
2122
import static org.apache.arrow.vector.TestUtils.newVector;
@@ -1233,7 +1234,7 @@ public void testSplitAndTransfer3() {
12331234
// the size needed for the validity buffer
12341235
final long validitySize =
12351236
DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY.getRoundedSize(
1236-
BaseValueVector.getValidityBufferSizeFromCount(2));
1237+
getValidityBufferSizeFromCount(2));
12371238
assertEquals(allocatedMem + validitySize, allocator.getAllocatedMemory());
12381239
// The validity and offset buffers are sliced from a same buffer.See
12391240
// BaseFixedWidthVector#allocateBytes.
@@ -2464,7 +2465,7 @@ public void testDefaultAllocNewAll() {
24642465
assertTrue(intVector.getValueCapacity() >= defaultCapacity);
24652466
expectedSize =
24662467
(defaultCapacity * IntVector.TYPE_WIDTH)
2467-
+ BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
2468+
+ getValidityBufferSizeFromCount(defaultCapacity);
24682469
assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
24692470

24702471
// verify that the wastage is within bounds for BigIntVector.
@@ -2473,7 +2474,7 @@ public void testDefaultAllocNewAll() {
24732474
assertTrue(bigIntVector.getValueCapacity() >= defaultCapacity);
24742475
expectedSize =
24752476
(defaultCapacity * bigIntVector.TYPE_WIDTH)
2476-
+ BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
2477+
+ getValidityBufferSizeFromCount(defaultCapacity);
24772478
assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
24782479

24792480
// verify that the wastage is within bounds for DecimalVector.
@@ -2482,7 +2483,7 @@ public void testDefaultAllocNewAll() {
24822483
assertTrue(decimalVector.getValueCapacity() >= defaultCapacity);
24832484
expectedSize =
24842485
(defaultCapacity * decimalVector.TYPE_WIDTH)
2485-
+ BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
2486+
+ getValidityBufferSizeFromCount(defaultCapacity);
24862487
assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
24872488

24882489
// verify that the wastage is within bounds for VarCharVector.
@@ -2492,7 +2493,7 @@ public void testDefaultAllocNewAll() {
24922493
assertTrue(varCharVector.getValueCapacity() >= defaultCapacity - 1);
24932494
expectedSize =
24942495
(defaultCapacity * VarCharVector.OFFSET_WIDTH)
2495-
+ BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity)
2496+
+ getValidityBufferSizeFromCount(defaultCapacity)
24962497
+ defaultCapacity * 8;
24972498
// wastage should be less than 5%.
24982499
assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
@@ -2501,7 +2502,7 @@ public void testDefaultAllocNewAll() {
25012502
beforeSize = childAllocator.getAllocatedMemory();
25022503
bitVector.allocateNew();
25032504
assertTrue(bitVector.getValueCapacity() >= defaultCapacity);
2504-
expectedSize = BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity) * 2;
2505+
expectedSize = getValidityBufferSizeFromCount(defaultCapacity) * 2;
25052506
assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
25062507
}
25072508
}

0 commit comments

Comments
 (0)