ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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 3 commits into from
Closed

ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55c146
Handle zero length case in BitVector.splitAndTransfer()
StevenMPhillips Jun 30, 2017
84946b7
Handle zero length case in BitVector.splitAndTransfer()
StevenMPhillips Jun 30, 2017
89a08d9
Handle zero length in BitVector.splitAndTransfer
siddharthteotia Jul 25, 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
52 changes: 27 additions & 25 deletions java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
int firstByte = getByteIndex(startIndex);
int byteSize = getSizeFromCount(length);
int offset = startIndex % 8;
if (offset == 0) {
target.clear();
// slice
if (target.data != null) {
target.data.release();
}
target.data = data.slice(firstByte, byteSize);
target.data.retain(1);
} else {
// Copy data
// When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
// Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
// The last byte copied to target is a bit tricky :
// 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
// 2) otherwise, copy the last byte in the same way as to the prior bytes.
target.clear();
target.allocateNew(length);
// TODO maybe do this one word at a time, rather than byte?
for(int i = 0; i < byteSize - 1; i++) {
target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
}
if (length % 8 != 0) {
target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
if (length > 0) {
if (offset == 0) {
target.clear();
// slice
if (target.data != null) {
target.data.release();
}
target.data = data.slice(firstByte, byteSize);
target.data.retain(1);
} else {
target.data.setByte(byteSize - 1,
(((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
// Copy data
// When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
// Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
// The last byte copied to target is a bit tricky :
// 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
// 2) otherwise, copy the last byte in the same way as to the prior bytes.
target.clear();
target.allocateNew(length);
// TODO maybe do this one word at a time, rather than byte?
for (int i = 0; i < byteSize - 1; i++) {
target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
}
if (length % 8 != 0) {
target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
} else {
target.data.setByte(byteSize - 1,
(((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
}
}
}
target.getMutator().setValueCount(length);
Expand Down
80 changes: 79 additions & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

@Before
public void init() {
allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
allocator = new RootAllocator(Long.MAX_VALUE);
}

@After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
}
}

@Test
public void testSplitAndTransfer() throws Exception {

try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
final BitVector.Mutator sourceMutator = sourceVector.getMutator();
final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

sourceVector.allocateNew(40);

/* populate the bitvector -- 010101010101010101010101..... */
for(int i = 0; i < 40; i++) {
if((i & 1) == 1) {
sourceMutator.set(i, 1);
}
else {
sourceMutator.set(i, 0);
}
}

sourceMutator.setValueCount(40);

/* check the vector output */
for(int i = 0; i < 40; i++) {
int result = sourceAccessor.get(i);
if((i & 1) == 1) {
assertEquals(Integer.toString(1), Integer.toString(result));
}
else {
assertEquals(Integer.toString(0), Integer.toString(result));
}
}

final TransferPair transferPair = sourceVector.getTransferPair(allocator);
final BitVector toVector = (BitVector)transferPair.getTo();
final BitVector.Accessor toAccessor = toVector.getAccessor();
final BitVector.Mutator toMutator = toVector.getMutator();

/*
* form test cases such that we cover:
*
* (1) the start index is exactly where a particular byte starts in the source bit vector
* (2) the start index is randomly positioned within a byte in the source bit vector
* (2.1) the length is a multiple of 8
* (2.2) the length is not a multiple of 8
*/
final int[][] transferLengths = { {0, 8}, /* (1) */
{8, 10}, /* (1) */
{18, 0}, /* zero length scenario */
{18, 8}, /* (2.1) */
{26, 0}, /* zero length scenario */
{26, 14} /* (2.2) */
};

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

transferPair.splitAndTransfer(start, length);

/* check the toVector output after doing splitAndTransfer */
for (int i = 0; i < length; i++) {
int result = toAccessor.get(i);
if((i & 1) == 1) {
assertEquals(Integer.toString(1), Integer.toString(result));
}
else {
assertEquals(Integer.toString(0), Integer.toString(result));
}
}

toVector.clear();
}

sourceVector.close();
}
}
}
, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}

, '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-1267: [Java] Handle zero length case in BitVector.splitAndTransfer#890

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
3
commits into

from

 Closed


ARROW-1267: [Java] Handle zero length case in BitVector.splitAndTransfer
#890
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b55c146

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
84946b7

Handle zero length case in BitVector.splitAndTransfer()


StevenMPhillips Jun 30, 2017
89a08d9

Handle zero length in BitVector.splitAndTransfer


siddharthteotia Jul 25, 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


52 changes: 27 additions & 25 deletions
java/vector/src/main/java/org/apache/arrow/vector/BitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,34 @@ public void splitAndTransferTo(int startIndex, int length, BitVector target) {
 int firstByte = getByteIndex(startIndex);
 int byteSize = getSizeFromCount(length);
 int offset = startIndex % 8;
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for(int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 if (length > 0) {
 if (offset == 0) {
 target.clear();
 // slice
 if (target.data != null) {
 target.data.release();
 }
 target.data = data.slice(firstByte, byteSize);
 target.data.retain(1);
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 // Copy data
 // When the first bit starts from the middle of a byte (offset != 0), copy data from src BitVector.
 // Each byte in the target is composed by a part in i-th byte, another part in (i+1)-th byte.
 // The last byte copied to target is a bit tricky :
 // 1) if length requires partly byte (length % 8 !=0), copy the remaining bits only.
 // 2) otherwise, copy the last byte in the same way as to the prior bytes.
 target.clear();
 target.allocateNew(length);
 // TODO maybe do this one word at a time, rather than byte?
 for (int i = 0; i < byteSize - 1; i++) {
 target.data.setByte(i, (((this.data.getByte(firstByte + i) & 0xFF) >>> offset) + (this.data.getByte(firstByte + i + 1) << (8 - offset))));
 }
 if (length % 8 != 0) {
 target.data.setByte(byteSize - 1, ((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset));
 } else {
 target.data.setByte(byteSize - 1,
 (((this.data.getByte(firstByte + byteSize - 1) & 0xFF) >>> offset) + (this.data.getByte(firstByte + byteSize) << (8 - offset))));
 }
 }
 }
 target.getMutator().setValueCount(length);
Expand Down

80 changes: 79 additions & 1 deletion
java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.util.TransferPair;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All@@ -31,7 +33,7 @@ public class TestBitVector {

 @Before
 public void init() {
 allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
 allocator = new RootAllocator(Long.MAX_VALUE);
 }

 @After
Expand DownExpand Up@@ -63,4 +65,80 @@ public void testBitVectorCopyFromSafe() {
 }
 }

 @Test
 public void testSplitAndTransfer() throws Exception {

 try (final BitVector sourceVector = new BitVector("bitvector", allocator)) {
 final BitVector.Mutator sourceMutator = sourceVector.getMutator();
 final BitVector.Accessor sourceAccessor = sourceVector.getAccessor();

 sourceVector.allocateNew(40);

 /* populate the bitvector -- 010101010101010101010101..... */
 for(int i = 0; i < 40; i++) {
 if((i & 1) == 1) {
 sourceMutator.set(i, 1);
 }
 else {
 sourceMutator.set(i, 0);
 }
 }

 sourceMutator.setValueCount(40);

 /* check the vector output */
 for(int i = 0; i < 40; i++) {
 int result = sourceAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 final TransferPair transferPair = sourceVector.getTransferPair(allocator);
 final BitVector toVector = (BitVector)transferPair.getTo();
 final BitVector.Accessor toAccessor = toVector.getAccessor();
 final BitVector.Mutator toMutator = toVector.getMutator();

 /*
 * form test cases such that we cover:
 *
 * (1) the start index is exactly where a particular byte starts in the source bit vector
 * (2) the start index is randomly positioned within a byte in the source bit vector
 * (2.1) the length is a multiple of 8
 * (2.2) the length is not a multiple of 8
 */
 final int[][] transferLengths = { {0, 8}, /* (1) */
 {8, 10}, /* (1) */
 {18, 0}, /* zero length scenario */
 {18, 8}, /* (2.1) */
 {26, 0}, /* zero length scenario */
 {26, 14} /* (2.2) */
 };

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

 transferPair.splitAndTransfer(start, length);

 /* check the toVector output after doing splitAndTransfer */
 for (int i = 0; i < length; i++) {
 int result = toAccessor.get(i);
 if((i & 1) == 1) {
 assertEquals(Integer.toString(1), Integer.toString(result));
 }
 else {
 assertEquals(Integer.toString(0), Integer.toString(result));
 }
 }

 toVector.clear();
 }

 sourceVector.close();
 }
 }
}