vibhatha commented on code in PR #44078:
URL: https://github.com/apache/arrow/pull/44078#discussion_r1764361250
##########
java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java:
##########
@@ -1539,30 +1521,44 @@ public void copyFromSafe(int fromIndex, int thisIndex,
ValueVector from) {
} else {
final int viewLength = from.getDataBuffer().getInt((long) fromIndex *
ELEMENT_SIZE);
handleSafe(thisIndex, viewLength);
- BitVectorHelper.setBit(validityBuffer, thisIndex);
- final int start = thisIndex * ELEMENT_SIZE;
- final int copyStart = fromIndex * ELEMENT_SIZE;
- from.getDataBuffer().getBytes(start, viewBuffer, copyStart,
ELEMENT_SIZE);
- if (viewLength > INLINE_SIZE) {
- final int bufIndex =
- from.getDataBuffer()
- .getInt(((long) fromIndex * ELEMENT_SIZE) + LENGTH_WIDTH +
PREFIX_WIDTH);
- final int dataOffset =
- from.getDataBuffer()
- .getInt(
- ((long) fromIndex * ELEMENT_SIZE)
- + LENGTH_WIDTH
- + PREFIX_WIDTH
- + BUF_INDEX_WIDTH);
- final ArrowBuf dataBuf = ((BaseVariableWidthViewVector)
from).dataBuffers.get(bufIndex);
- final ArrowBuf thisDataBuf = allocateOrGetLastDataBuffer(viewLength);
- thisDataBuf.setBytes(thisDataBuf.writerIndex(), dataBuf, dataOffset,
viewLength);
- thisDataBuf.writerIndex(thisDataBuf.writerIndex() + viewLength);
- }
+ copyFromNotNull(fromIndex, thisIndex, from, viewLength);
}
lastSet = thisIndex;
}
+ private void copyFromNotNull(int fromIndex, int thisIndex, ValueVector from,
int viewLength) {
+ BitVectorHelper.setBit(validityBuffer, thisIndex);
+ final int start = thisIndex * ELEMENT_SIZE;
+ final int copyStart = fromIndex * ELEMENT_SIZE;
+ if (viewLength > INLINE_SIZE) {
+ final int bufIndex =
+ from.getDataBuffer()
+ .getInt(((long) fromIndex * ELEMENT_SIZE) + LENGTH_WIDTH +
PREFIX_WIDTH);
+ final int dataOffset =
+ from.getDataBuffer()
+ .getInt(
+ ((long) fromIndex * ELEMENT_SIZE)
+ + LENGTH_WIDTH
+ + PREFIX_WIDTH
+ + BUF_INDEX_WIDTH);
+ final ArrowBuf dataBuf = ((BaseVariableWidthViewVector)
from).dataBuffers.get(bufIndex);
+ final ArrowBuf thisDataBuf = allocateOrGetLastDataBuffer(viewLength);
+
+ viewBuffer.setBytes(start, from.getDataBuffer(), copyStart, LENGTH_WIDTH
+ PREFIX_WIDTH);
+ int writePosition = start + LENGTH_WIDTH + PREFIX_WIDTH;
+ // set buf id
+ viewBuffer.setInt(writePosition, dataBuffers.size() - 1);
+ writePosition += BUF_INDEX_WIDTH;
+ // set offset
+ viewBuffer.setInt(writePosition, (int) thisDataBuf.writerIndex());
Review Comment:
Oh! I have missed that. Good catch. Can we add a test case for that as well.
I mean create vector 1 some content and then vector 2 with a different content.
Copy content from vector 1 to vector 2, and validate this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
