Skip to content

Commit

Permalink
fix: adding copyFrom and copyFromSafe
Browse files Browse the repository at this point in the history
  • Loading branch information
@vibhatha
vibhatha committed May 21, 2024
1 parent 1f07404 commit 671674e
Show file tree
Hide file tree
Showing 2 changed files with 204 additions and 2 deletions.
47 changes: 45 additions & 2 deletions java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.arrow.memory.util.ByteFunctionHelpers;
import org.apache.arrow.memory.util.CommonUtil;
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.compare.VectorVisitor;
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
import org.apache.arrow.vector.types.pojo.Field;
Expand Down Expand Up @@ -1331,7 +1332,27 @@ protected final void handleSafe(int index, int dataLength) {
*/
@Override
public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
throw new UnsupportedOperationException("copyFrom is not supported for VariableWidthVector");
Preconditions.checkArgument(this.getMinorType() == from.getMinorType());
if (from.isNull(fromIndex)) {
BitVectorHelper.unsetBit(this.validityBuffer, thisIndex);
} else {
final int viewLength = from.getDataBuffer().getInt((long) fromIndex * ELEMENT_SIZE);
BitVectorHelper.setBit(this.validityBuffer, thisIndex);
final int start = thisIndex * ELEMENT_SIZE;
final int copyStart = fromIndex * ELEMENT_SIZE;
from.getDataBuffer().getBytes(start, this.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);
}
}
lastSet = thisIndex;
}

/**
Expand All @@ -1345,7 +1366,29 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
*/
@Override
public void copyFromSafe(int fromIndex, int thisIndex, ValueVector from) {
throw new UnsupportedOperationException("copyFromSafe is not supported for VariableWidthVector");
Preconditions.checkArgument(this.getMinorType() == from.getMinorType());
if (from.isNull(fromIndex)) {
handleSafe(thisIndex, 0);
BitVectorHelper.unsetBit(this.validityBuffer, thisIndex);
} else {
final int viewLength = from.getDataBuffer().getInt((long) fromIndex * ELEMENT_SIZE);
handleSafe(thisIndex, viewLength);
BitVectorHelper.setBit(this.validityBuffer, thisIndex);
final int start = thisIndex * ELEMENT_SIZE;
final int copyStart = fromIndex * ELEMENT_SIZE;
from.getDataBuffer().getBytes(start, this.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);
}
}
lastSet = thisIndex;
}

@Override
Expand Down
159 changes: 159 additions & 0 deletions java/vector/src/test/java/org/apache/arrow/vector/TestVarCharViewVector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.arrow.memory.util.CommonUtil;
import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.util.ReusableByteArray;
import org.apache.arrow.vector.util.Text;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -1451,6 +1452,164 @@ public void testSafeOverwriteLongFromALongerLongString() {
}
}

@Test
public void testCopyFromWithNulls() {
try (final ViewVarCharVector vector = newVector(ViewVarCharVector.class, EMPTY_SCHEMA_PATH,
MinorType.VIEWVARCHAR, allocator);
final ViewVarCharVector vector2 =
newVector(ViewVarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VIEWVARCHAR, allocator)) {

final int initialCapacity = 1024;
vector.setInitialCapacity(initialCapacity);
vector.allocateNew();
int capacity = vector.getValueCapacity();
assertTrue(capacity >= initialCapacity);

final int numberOfValues = initialCapacity / 2 / ViewVarCharVector.ELEMENT_SIZE;

final String prefixString = generateRandomString(12);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
// null values
vector.setNull(i);
} else if (i % 3 == 1) {
// short strings
byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
vector.set(i, b, 0, b.length);
} else {
// long strings
byte[] b = (i + prefixString).getBytes(StandardCharsets.UTF_8);
vector.set(i, b, 0, b.length);
}
}

assertEquals(capacity, vector.getValueCapacity());

vector.setValueCount(numberOfValues);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
assertNull(vector.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector.getObject(i).toString(), "unexpected value at index: " + i);
}
}

vector2.setInitialCapacity(initialCapacity);
vector2.allocateNew();
int capacity2 = vector2.getValueCapacity();
assertEquals(capacity2, capacity);

for (int i = 0; i < numberOfValues; i++) {
vector2.copyFrom(i, i, vector);
if (i % 3 == 0) {
assertNull(vector2.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector2.getObject(i).toString(), "unexpected value at index: " + i);
}
}

assertEquals(capacity, vector2.getValueCapacity());

vector2.setValueCount(numberOfValues);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
assertNull(vector2.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector2.getObject(i).toString(), "unexpected value at index: " + i);
}
}
}
}

@Test
public void testCopyFromSafeWithNulls() {
try (final ViewVarCharVector vector = newVector(ViewVarCharVector.class, EMPTY_SCHEMA_PATH,
MinorType.VIEWVARCHAR, allocator);
final ViewVarCharVector vector2 =
newVector(ViewVarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VIEWVARCHAR, allocator)) {

final int initialCapacity = 4096;
vector.setInitialCapacity(initialCapacity);
vector.allocateNew();
int capacity = vector.getValueCapacity();
assertTrue(capacity >= initialCapacity);

final int numberOfValues = initialCapacity / ViewVarCharVector.ELEMENT_SIZE;

final String prefixString = generateRandomString(12);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
// null values
vector.setNull(i);
} else if (i % 3 == 1) {
// short strings
byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
vector.setSafe(i, b, 0, b.length);
} else {
// long strings
byte[] b = (i + prefixString).getBytes(StandardCharsets.UTF_8);
vector.setSafe(i, b, 0, b.length);
}
}

/* NO reAlloc() should have happened in setSafe() */
assertEquals(capacity, vector.getValueCapacity());

vector.setValueCount(numberOfValues);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
assertNull(vector.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector.getObject(i).toString(), "unexpected value at index: " + i);
}
}

vector2.setInitialCapacity(initialCapacity);
vector2.allocateNew();
int capacity2 = vector2.getValueCapacity();
assertEquals(capacity2, capacity);

for (int i = 0; i < numberOfValues; i++) {
vector2.copyFromSafe(i, i, vector);
if (i % 3 == 0) {
assertNull(vector2.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector2.getObject(i).toString(), "unexpected value at index: " + i);
}
}

/* NO reAlloc() should have happened in copyFrom */
assertEquals(capacity, vector2.getValueCapacity());

vector2.setValueCount(numberOfValues);

for (int i = 0; i < numberOfValues; i++) {
if (i % 3 == 0) {
assertNull(vector2.getObject(i));
} else if (i % 3 == 1) {
assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i);
} else {
assertEquals(i + prefixString, vector2.getObject(i).toString(), "unexpected value at index: " + i);
}
}
}
}

private String generateRandomString(int length) {
Random random = new Random();
StringBuilder sb = new StringBuilder(length);
Expand Down

0 comments on commit 671674e

Please sign in to comment.