ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
siddharthteotia wants to merge 2 commits into from
Closed

ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors. #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
035e886
Use buffer slice for splitAndTransfer in List and Union vectors
StevenMPhillips Jun 30, 2017
3d89c99
ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…
siddharthteotia Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions java/vector/src/main/codegen/templates/UnionVector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

@Override
public void splitAndTransfer(int startIndex, int length) {
to.allocateNew();
for (int i = 0; i < length; i++) {
to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
}
internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
typeVectorTransferPair.splitAndTransfer(startIndex, length);
to.getMutator().setValueCount(length);
}

Expand Down
30 changes: 23 additions & 7 deletions java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
private class TransferImpl implements TransferPair {

ListVector to;
TransferPair pairs[] = new TransferPair[3];
TransferPair bitsTransferPair;
TransferPair offsetsTransferPair;
TransferPair dataTransferPair;

TransferPair[] pairs;

public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
public TransferImpl(ListVector to) {
this.to = to;
to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
if (to.getDataVector() instanceof ZeroVector) {
to.addOrGetVector(vector.getField().getFieldType());
}
pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
}

@Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

@Override
public void splitAndTransfer(int startIndex, int length) {
to.allocateNew();
for (int i = 0; i < length; i++) {
copyValueSafe(startIndex + i, i);
UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
final int startPoint = offsetVectorAccessor.get(startIndex);
final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
to.clear();
to.offsets.allocateNew(length + 1);
offsetVectorAccessor = ListVector.this.offsets.getAccessor();
final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
for (int i = 0; i < length + 1; i++) {
targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
}
bitsTransferPair.splitAndTransfer(startIndex, length);
dataTransferPair.splitAndTransfer(startPoint, sliceLength);
to.lastSet = length;
to.mutator.setValueCount(length);
}

@Override
Expand Down
199 changes: 199 additions & 0 deletions java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
assertNull(actual);
}
}

@Test
public void testSplitAndTransfer() throws Exception {
try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

/* Explicitly add the dataVector */
MinorType type = MinorType.BIGINT;
listVector.addOrGetVector(FieldType.nullable(type.getType()));

UnionListWriter listWriter = listVector.getWriter();

/* allocate memory */
listWriter.allocate();

/* populate data */
listWriter.setPosition(0);
listWriter.startList();
listWriter.bigInt().writeBigInt(10);
listWriter.bigInt().writeBigInt(11);
listWriter.bigInt().writeBigInt(12);
listWriter.endList();

listWriter.setPosition(1);
listWriter.startList();
listWriter.bigInt().writeBigInt(13);
listWriter.bigInt().writeBigInt(14);
listWriter.endList();

listWriter.setPosition(2);
listWriter.startList();
listWriter.bigInt().writeBigInt(15);
listWriter.bigInt().writeBigInt(16);
listWriter.bigInt().writeBigInt(17);
listWriter.bigInt().writeBigInt(18);
listWriter.endList();

listWriter.setPosition(3);
listWriter.startList();
listWriter.bigInt().writeBigInt(19);
listWriter.endList();

listWriter.setPosition(4);
listWriter.startList();
listWriter.bigInt().writeBigInt(20);
listWriter.bigInt().writeBigInt(21);
listWriter.bigInt().writeBigInt(22);
listWriter.bigInt().writeBigInt(23);
listWriter.endList();

listVector.getMutator().setValueCount(5);

assertEquals(5, listVector.getMutator().getLastSet());

/* get offsetVector */
UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

/* get dataVector */
NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

/* check the vector output */
final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

int index = 0;
int offset = 0;
Object actual = null;

/* index 0 */
assertFalse(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(0), Integer.toString(offset));

actual = valueAccessor.getObject(offset);
assertEquals(new Long(10), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(11), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(12), (Long)actual);

/* index 1 */
index++;
assertFalse(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(3), Integer.toString(offset));

actual = valueAccessor.getObject(offset);
assertEquals(new Long(13), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(14), (Long)actual);

/* index 2 */
index++;
assertFalse(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(5), Integer.toString(offset));

actual = valueAccessor.getObject(offset);
assertEquals(new Long(15), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(16), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(17), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(18), (Long)actual);

/* index 3 */
index++;
assertFalse(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(9), Integer.toString(offset));

actual = valueAccessor.getObject(offset);
assertEquals(new Long(19), (Long)actual);

/* index 4 */
index++;
assertFalse(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(10), Integer.toString(offset));

actual = valueAccessor.getObject(offset);
assertEquals(new Long(20), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(21), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(22), (Long)actual);
offset++;
actual = valueAccessor.getObject(offset);
assertEquals(new Long(23), (Long)actual);

/* index 5 */
index++;
assertTrue(listVector.getAccessor().isNull(index));
offset = offsetAccessor.get(index);
assertEquals(Integer.toString(14), Integer.toString(offset));

/* do split and transfer */
try (ListVector toVector = ListVector.empty("toVector", allocator)) {

TransferPair transferPair = listVector.makeTransferPair(toVector);

int[][] transferLengths = { {0, 2},
{3, 1},
{4, 1}
};

for (final int[] transferLength : transferLengths) {
int start = transferLength[0];
int splitLength = transferLength[1];

int dataLength1 = 0;
int dataLength2 = 0;

int offset1 = 0;
int offset2 = 0;

transferPair.splitAndTransfer(start, splitLength);

/* get offsetVector of toVector */
UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

/* get dataVector of toVector */
NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

for(int i = 0; i < splitLength; i++) {
dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

assertEquals("Different data lengths at index: " + i + " and start: " + start,
dataLength1, dataLength2);

offset1 = offsetAccessor.get(start + i);
offset2 = offsetAccessor1.get(i);

for(int j = 0; j < dataLength1; j++) {
assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

offset1++;
offset2++;
}
}
}
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.#901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

siddharthteotia
wants to merge
2
commits into

from

 Closed


ARROW-1192: [JAVA] Use buffer slice for splitAndTransfer in List and Union Vectors.
#901
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
035e886

Use buffer slice for splitAndTransfer in List and Union vectors


StevenMPhillips Jun 30, 2017
3d89c99

ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and c…


siddharthteotia Jul 27, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 2 additions & 4 deletions
java/vector/src/main/codegen/templates/UnionVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,10 +321,8 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 to.copyFromSafe(startIndex + i, i, org.apache.arrow.vector.complex.UnionVector.this);
 }
 internalMapVectorTransferPair.splitAndTransfer(startIndex, length);
 typeVectorTransferPair.splitAndTransfer(startIndex, length);
 to.getMutator().setValueCount(length);
 }

Expand Down

30 changes: 23 additions & 7 deletions
java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.UInt4Vector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ZeroVector;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.complex.impl.UnionListReader;
Expand DownExpand Up@@ -179,7 +180,11 @@ public TransferPair makeTransferPair(ValueVector target) {
 private class TransferImpl implements TransferPair {

 ListVector to;
 TransferPair pairs[] = new TransferPair[3];
 TransferPair bitsTransferPair;
 TransferPair offsetsTransferPair;
 TransferPair dataTransferPair;

 TransferPair[] pairs;

 public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 this(new ListVector(name, allocator, fieldType, callBack));
Expand All@@ -188,12 +193,13 @@ public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) {
 public TransferImpl(ListVector to) {
 this.to = to;
 to.addOrGetVector(vector.getField().getFieldType());
pairs[0] = offsets.makeTransferPair(to.offsets);
pairs[1] = bits.makeTransferPair(to.bits);
offsetsTransferPair = offsets.makeTransferPair(to.offsets);
bitsTransferPair = bits.makeTransferPair(to.bits);
 if (to.getDataVector() instanceof ZeroVector) {
 to.addOrGetVector(vector.getField().getFieldType());
 }
 pairs[2] = getDataVector().makeTransferPair(to.getDataVector());
 dataTransferPair = getDataVector().makeTransferPair(to.getDataVector());
 pairs = new TransferPair[] { bitsTransferPair, offsetsTransferPair, dataTransferPair };
 }

 @Override
Expand All@@ -206,10 +212,20 @@ public void transfer() {

 @Override
 public void splitAndTransfer(int startIndex, int length) {
 to.allocateNew();
 for (int i = 0; i < length; i++) {
 copyValueSafe(startIndex + i, i);
 UInt4Vector.Accessor offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final int startPoint = offsetVectorAccessor.get(startIndex);
 final int sliceLength = offsetVectorAccessor.get(startIndex + length) - startPoint;
 to.clear();
 to.offsets.allocateNew(length + 1);
 offsetVectorAccessor = ListVector.this.offsets.getAccessor();
 final UInt4Vector.Mutator targetOffsetVectorMutator = to.offsets.getMutator();
 for (int i = 0; i < length + 1; i++) {
 targetOffsetVectorMutator.set(i, offsetVectorAccessor.get(startIndex + i) - startPoint);
 }
 bitsTransferPair.splitAndTransfer(startIndex, length);
 dataTransferPair.splitAndTransfer(startPoint, sliceLength);
 to.lastSet = length;
 to.mutator.setValueCount(length);
 }

 @Override
Expand Down

199 changes: 199 additions & 0 deletions
java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.ListVector;
Expand All@@ -30,6 +32,7 @@
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.*;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand DownExpand Up@@ -234,4 +237,200 @@ public void testSetLastSetUsage() throws Exception {
 assertNull(actual);
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {
 try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {

 /* Explicitly add the dataVector */
 MinorType type = MinorType.BIGINT;
 listVector.addOrGetVector(FieldType.nullable(type.getType()));

 UnionListWriter listWriter = listVector.getWriter();

 /* allocate memory */
 listWriter.allocate();

 /* populate data */
 listWriter.setPosition(0);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(10);
 listWriter.bigInt().writeBigInt(11);
 listWriter.bigInt().writeBigInt(12);
 listWriter.endList();

 listWriter.setPosition(1);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(13);
 listWriter.bigInt().writeBigInt(14);
 listWriter.endList();

 listWriter.setPosition(2);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(15);
 listWriter.bigInt().writeBigInt(16);
 listWriter.bigInt().writeBigInt(17);
 listWriter.bigInt().writeBigInt(18);
 listWriter.endList();

 listWriter.setPosition(3);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(19);
 listWriter.endList();

 listWriter.setPosition(4);
 listWriter.startList();
 listWriter.bigInt().writeBigInt(20);
 listWriter.bigInt().writeBigInt(21);
 listWriter.bigInt().writeBigInt(22);
 listWriter.bigInt().writeBigInt(23);
 listWriter.endList();

 listVector.getMutator().setValueCount(5);

 assertEquals(5, listVector.getMutator().getLastSet());

 /* get offsetVector */
 UInt4Vector offsetVector = (UInt4Vector)listVector.getOffsetVector();

 /* get dataVector */
 NullableBigIntVector dataVector = (NullableBigIntVector)listVector.getDataVector();

 /* check the vector output */
 final UInt4Vector.Accessor offsetAccessor = offsetVector.getAccessor();
 final ValueVector.Accessor valueAccessor = dataVector.getAccessor();

 int index = 0;
 int offset = 0;
 Object actual = null;

 /* index 0 */
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(0), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(10), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(11), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(12), (Long)actual);

 /* index 1 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(3), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(13), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(14), (Long)actual);

 /* index 2 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(5), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(15), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(16), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(17), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(18), (Long)actual);

 /* index 3 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(9), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(19), (Long)actual);

 /* index 4 */
 index++;
 assertFalse(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(10), Integer.toString(offset));

 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(20), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(21), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(22), (Long)actual);
 offset++;
 actual = valueAccessor.getObject(offset);
 assertEquals(new Long(23), (Long)actual);

 /* index 5 */
 index++;
 assertTrue(listVector.getAccessor().isNull(index));
 offset = offsetAccessor.get(index);
 assertEquals(Integer.toString(14), Integer.toString(offset));

 /* do split and transfer */
 try (ListVector toVector = ListVector.empty("toVector", allocator)) {

 TransferPair transferPair = listVector.makeTransferPair(toVector);

 int[][] transferLengths = { {0, 2},
 {3, 1},
 {4, 1}
 };

 for (final int[] transferLength : transferLengths) {
 int start = transferLength[0];
 int splitLength = transferLength[1];

 int dataLength1 = 0;
 int dataLength2 = 0;

 int offset1 = 0;
 int offset2 = 0;

 transferPair.splitAndTransfer(start, splitLength);

 /* get offsetVector of toVector */
 UInt4Vector offsetVector1 = (UInt4Vector)toVector.getOffsetVector();
 UInt4Vector.Accessor offsetAccessor1 = offsetVector1.getAccessor();

 /* get dataVector of toVector */
 NullableBigIntVector dataVector1 = (NullableBigIntVector)toVector.getDataVector();
 NullableBigIntVector.Accessor valueAccessor1 = dataVector1.getAccessor();

 for(int i = 0; i < splitLength; i++) {
 dataLength1 = offsetAccessor.get(start + i + 1) - offsetAccessor.get(start + i);
 dataLength2 = offsetAccessor1.get(i + 1) - offsetAccessor1.get(i);

 assertEquals("Different data lengths at index: " + i + " and start: " + start,
 dataLength1, dataLength2);

 offset1 = offsetAccessor.get(start + i);
 offset2 = offsetAccessor1.get(i);

 for(int j = 0; j < dataLength1; j++) {
 assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
 valueAccessor.getObject(offset1), valueAccessor1.getObject(offset2));

 offset1++;
 offset2++;
 }
 }
 }
 }
 }
 }
}
Loading