Skip to content

Commit 3af72e7

Browse files
committed
Clean up
1 parent a80b90c commit 3af72e7

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

vector/src/main/codegen/templates/DenseUnionVector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@ public ValueVector getTo() {
707707
public void copyValueSafe(int from, int to) {
708708
this.to.copyFrom(from, to, DenseUnionVector.this);
709709
}
710-
711710
}
712711
713712
@Override

vector/src/main/codegen/templates/UnionVector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ public ValueVector getTo() {
620620
public void copyValueSafe(int from, int to) {
621621
this.to.copyFrom(from, to, UnionVector.this);
622622
}
623-
624623
}
625624
626625
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,10 +652,10 @@ public ValueVector getTo() {
652652

653653
@Override
654654
public void copyValueSafe(int fromIndex, int toIndex) {
655-
while (toIndex >= this.to.getValueCapacity()) {
656-
this.to.reAlloc();
655+
while (toIndex >= to.getValueCapacity()) {
656+
to.reAlloc();
657657
}
658-
BitVectorHelper.setValidityBit(this.to.validityBuffer, toIndex, isSet(fromIndex));
658+
BitVectorHelper.setValidityBit(to.validityBuffer, toIndex, isSet(fromIndex));
659659
int fromOffset = fromIndex * listSize;
660660
int toOffset = toIndex * listSize;
661661
for (int i = 0; i < listSize; i++) {

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,10 @@ public void transfer() {
292292

293293
@Override
294294
public void copyValueSafe(int fromIndex, int toIndex) {
295-
reallocateTargetValidityBuffer(fromIndex, toIndex);
295+
while (toIndex >= this.target.getValidityBufferValueCapacity()) {
296+
target.reallocValidityBuffer();
297+
}
298+
BitVectorHelper.setValidityBit(target.validityBuffer, toIndex, isSet(fromIndex));
296299
super.copyValueSafe(fromIndex, toIndex);
297300
}
298301

@@ -308,13 +311,6 @@ public void splitAndTransfer(int startIndex, int length) {
308311
splitAndTransferValidityBuffer(startIndex, length, target);
309312
super.splitAndTransfer(startIndex, length);
310313
}
311-
312-
private void reallocateTargetValidityBuffer(int fromIndex, int toIndex) {
313-
while (toIndex >= this.target.getValidityBufferValueCapacity()) {
314-
target.reallocValidityBuffer();
315-
}
316-
BitVectorHelper.setValidityBit(target.validityBuffer, toIndex, isSet(fromIndex));
317-
}
318314
}
319315

320316
/*

vector/src/main/java/org/apache/arrow/vector/complex/reader/FieldReader.java

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

19-
// import org.apache.arrow.vector.complex.reader.BaseReader.ExtensionReader;
2019
import org.apache.arrow.vector.complex.reader.BaseReader.ListReader;
2120
import org.apache.arrow.vector.complex.reader.BaseReader.MapReader;
2221
import org.apache.arrow.vector.complex.reader.BaseReader.RepeatedListReader;

0 commit comments

Comments
 (0)