ARROW-5920: [Java] Support sort & compare for all variable width vectors#4860

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
liyafan82 wants to merge 2 commits into from
Closed

ARROW-5920: [Java] Support sort & compare for all variable width vectors #4860

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
46d2c11
[ARROW-5920][Java] Support sort & compare for all variable width vectors
liyafan82 Jul 12, 2019
cbd8c3f
[ARROW-5920] [Java] Provide a utility to create the default comparator
liyafan82 Jul 12, 2019
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
57 changes: 44 additions & 13 deletions java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
* Default comparator implementations for different types of vectors.
*/
public class DefaultVectorComparators {

/**
* Create the default comparator for the vector.
* @param vector the vector.
* @param <T> the vector type.
* @return the default comparator.
*/
public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
if (vector instanceof BaseFixedWidthVector) {
if (vector instanceof TinyIntVector) {
return (VectorValueComparator<T>) new ByteComparator();
} else if (vector instanceof SmallIntVector) {
return (VectorValueComparator<T>) new ShortComparator();

@emkornfieldemkornfieldJul 16, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?

@liyafan82liyafan82Jul 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.

} else if (vector instanceof IntVector) {
return (VectorValueComparator<T>) new IntComparator();
} else if (vector instanceof BigIntVector) {
return (VectorValueComparator<T>) new LongComparator();
} else if (vector instanceof Float4Vector) {
return (VectorValueComparator<T>) new Float4Comparator();
} else if (vector instanceof Float8Vector) {
return (VectorValueComparator<T>) new Float8Comparator();
}
} else if (vector instanceof BaseVariableWidthVector) {
return (VectorValueComparator<T>) new VariableWidthComparator();
}

throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
}

/**
* Default comparator for bytes.
* The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
}

/**
* Default comparator for varchars.
* Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
* The comparison is in lexicographic order, with null comes first.
*/
public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

private NullableVarCharHolder holder1 = new NullableVarCharHolder();
private NullableVarCharHolder holder2 = new NullableVarCharHolder();
public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

@Override
public int compareNotNull(int index1, int index2) {
vector1.get(index1, holder1);
vector2.get(index2, holder2);
int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

int length1 = holder1.end - holder1.start;
int length2 = holder2.end - holder2.start;
int length1 = end1 - start1;
int length2 = end2 - start2;

int minLength = length1 < length2 ? length1 : length2;
for (int i = 0; i < minLength; i++) {
byte b1 = holder1.buffer.getByte(holder1.start + i);
byte b2 = holder2.buffer.getByte(holder2.start + i);
byte b1 = vector1.getDataBuffer().getByte(start1 + i);
byte b2 = vector2.getDataBuffer().getByte(start2 + i);

if (b1 != b2) {
return b1 - b2;
Expand Down
13 changes: 9 additions & 4 deletions java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
negVector.set(0, -333);

// do search
VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator =
DefaultVectorComparators.createDefaultComparator(rawVector);
for (int i = 0; i < VECTOR_LENGTH; i++) {
int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
negVector.set(0, -333);

// do search
VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator =
DefaultVectorComparators.createDefaultComparator(rawVector);
for (int i = 0; i < VECTOR_LENGTH; i++) {
int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
negVector.set(0, "abcd".getBytes());

// do search
VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
VectorValueComparator<BaseVariableWidthVector> comparator =
DefaultVectorComparators.createDefaultComparator(rawVector);
for (int i = 0; i < VECTOR_LENGTH; i++) {
int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
negVector.set(0, "abcd".getBytes());

// do search
VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
VectorValueComparator<BaseVariableWidthVector> comparator =
DefaultVectorComparators.createDefaultComparator(rawVector);
for (int i = 0; i < VECTOR_LENGTH; i++) {
int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
assertEquals(i, result);
Expand Down
2 changes: 1 addition & 1 deletion ...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

// sort the vector
FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

sorter.sortInPlace(vec, comparator);

Expand Down
12 changes: 6 additions & 6 deletions ...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

TinyIntVector sortedVec =
(TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

SmallIntVector sortedVec =
(SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

// sort the vector
FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
sortedVec.allocateNew(vec.getValueCount());
Expand Down
4 changes: 3 additions & 1 deletion ...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

// sort the vector
VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
VectorValueComparator<BaseVariableWidthVector> comparator =
DefaultVectorComparators.createDefaultComparator(vec);

VarCharVector sortedVec =
(VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down
, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down

, '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-5920: [Java] Support sort & compare for all variable width vectors#4860

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

liyafan82
wants to merge
2
commits into

from

 Closed


ARROW-5920: [Java] Support sort & compare for all variable width vectors
#4860
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
46d2c11

[ARROW-5920][Java] Support sort & compare for all variable width vectors


liyafan82 Jul 12, 2019
cbd8c3f

[ARROW-5920] [Java] Provide a utility to create the default comparator


liyafan82 Jul 12, 2019

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


57 changes: 44 additions & 13 deletions
java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,51 @@

package org.apache.arrow.algorithm.sort;

import static org.apache.arrow.vector.BaseVariableWidthVector.OFFSET_WIDTH;

import org.apache.arrow.vector.BaseFixedWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.Float4Vector;
import org.apache.arrow.vector.Float8Vector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.SmallIntVector;
import org.apache.arrow.vector.TinyIntVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.holders.NullableVarCharHolder;
import org.apache.arrow.vector.ValueVector;

/**
 * Default comparator implementations for different types of vectors.
 */
public class DefaultVectorComparators {

 /**
 * Create the default comparator for the vector.
 * @param vector the vector.
 * @param <T> the vector type.
 * @return the default comparator.
 */
 public static <T extends ValueVector> VectorValueComparator<T> createDefaultComparator(T vector) {
 if (vector instanceof BaseFixedWidthVector) {
 if (vector instanceof TinyIntVector) {
 return (VectorValueComparator<T>) new ByteComparator();
 } else if (vector instanceof SmallIntVector) {
 return (VectorValueComparator<T>) new ShortComparator();
@emkornfieldemkornfieldJul 16, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the casts needed?
@liyafan82liyafan82Jul 16, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It seems the Java compiler cannot infer the generic type based on the instance of operator.
 } else if (vector instanceof IntVector) {
 return (VectorValueComparator<T>) new IntComparator();
 } else if (vector instanceof BigIntVector) {
 return (VectorValueComparator<T>) new LongComparator();
 } else if (vector instanceof Float4Vector) {
 return (VectorValueComparator<T>) new Float4Comparator();
 } else if (vector instanceof Float8Vector) {
 return (VectorValueComparator<T>) new Float8Comparator();
 }
 } else if (vector instanceof BaseVariableWidthVector) {
 return (VectorValueComparator<T>) new VariableWidthComparator();
 }

 throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
 }

 /**
 * Default comparator for bytes.
 * The comparison is based on values, with null comes first.
Expand DownExpand Up@@ -169,26 +200,26 @@ public int compareNotNull(int index1, int index2) {
 }

 /**
 * Default comparator for varchars.
 * Default comparator for {@link org.apache.arrow.vector.BaseVariableWidthVector}.
 * The comparison is in lexicographic order, with null comes first.
 */
 public static class VarCharComparator extends VectorValueComparator<VarCharVector> {

 private NullableVarCharHolder holder1 = new NullableVarCharHolder();
 private NullableVarCharHolder holder2 = new NullableVarCharHolder();
 public static class VariableWidthComparator extends VectorValueComparator<BaseVariableWidthVector> {

 @Override
 public int compareNotNull(int index1, int index2) {
 vector1.get(index1, holder1);
 vector2.get(index2, holder2);
 int start1 = vector1.getOffsetBuffer().getInt(index1 * OFFSET_WIDTH);
 int start2 = vector2.getOffsetBuffer().getInt(index2 * OFFSET_WIDTH);

 int end1 = vector1.getOffsetBuffer().getInt((index1 + 1) * OFFSET_WIDTH);
 int end2 = vector2.getOffsetBuffer().getInt((index2 + 1) * OFFSET_WIDTH);

 int length1 = holder1.end - holder1.start;
 int length2 = holder2.end - holder2.start;
 int length1 = end1 - start1;
 int length2 = end2 - start2;

 int minLength = length1 < length2 ? length1 : length2;
 for (int i = 0; i < minLength; i++) {
 byte b1 = holder1.buffer.getByte(holder1.start + i);
 byte b2 = holder2.buffer.getByte(holder2.start + i);
 byte b1 = vector1.getDataBuffer().getByte(start1 + i);
 byte b2 = vector2.getDataBuffer().getByte(start2 + i);

 if (b1 != b2) {
 return b1 - b2;
Expand Down

13 changes: 9 additions & 4 deletions
java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import org.apache.arrow.algorithm.sort.VectorValueComparator;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
Expand DownExpand Up@@ -68,7 +69,8 @@ public void testBinarySearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -99,7 +101,8 @@ public void testLinearSearchInt() {
 negVector.set(0, -333);

 // do search
 VectorValueComparator<IntVector> comparator = new DefaultVectorComparators.IntComparator();
 VectorValueComparator<IntVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -137,7 +140,8 @@ public void testBinarySearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand DownExpand Up@@ -175,7 +179,8 @@ public void testLinearSearchVarChar() {
 negVector.set(0, "abcd".getBytes());

 // do search
 VectorValueComparator<VarCharVector> comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(rawVector);
 for (int i = 0; i < VECTOR_LENGTH; i++) {
 int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
 assertEquals(i, result);
Expand Down

2 changes: 1 addition & 1 deletion
...ithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 sorter.sortInPlace(vec, comparator);

Expand Down

12 changes: 6 additions & 6 deletions
...m/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ public void testSortByte() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ByteComparator comparator = new DefaultVectorComparators.ByteComparator();
VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 TinyIntVector sortedVec =
 (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -117,7 +117,7 @@ public void testSortShort() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.ShortComparator comparator = new DefaultVectorComparators.ShortComparator();
VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 SmallIntVector sortedVec =
 (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand DownExpand Up@@ -164,7 +164,7 @@ public void testSortInt() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.IntComparator comparator = new DefaultVectorComparators.IntComparator();
VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -210,7 +210,7 @@ public void testSortLong() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.LongComparator comparator = new DefaultVectorComparators.LongComparator();
VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -256,7 +256,7 @@ public void testSortFloat() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float4Comparator comparator = new DefaultVectorComparators.Float4Comparator();
VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand DownExpand Up@@ -302,7 +302,7 @@ public void testSortDobule() {

 // sort the vector
 FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
DefaultVectorComparators.Float8Comparator comparator = new DefaultVectorComparators.Float8Comparator();
VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);

 Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
 sortedVec.allocateNew(vec.getValueCount());
Expand Down

4 changes: 3 additions & 1 deletion
...rc/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.VarCharVector;
import org.junit.After;
import org.junit.Assert;
Expand DownExpand Up@@ -65,7 +66,8 @@ public void testSortString() {

 // sort the vector
 VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
 DefaultVectorComparators.VarCharComparator comparator = new DefaultVectorComparators.VarCharComparator();
 VectorValueComparator<BaseVariableWidthVector> comparator =
 DefaultVectorComparators.createDefaultComparator(vec);

 VarCharVector sortedVec =
 (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
Expand Down