Skip to content

[common] Fix SliceComparator on BINARY and VARBINARY fields (#8873) #8874

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

Open
jordepic wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −2
Open

[common] Fix SliceComparator on BINARY and VARBINARY fields (#8873) #8874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions paimon-common/src/main/java/org/apache/paimon/data/serializer/RowCompactedSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.paimon.types.RowKind;
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.VectorType;
import org.apache.paimon.utils.SortUtil;
import org.apache.paimon.utils.TypeCheckUtils;
import org.apache.paimon.utils.VarLengthIntUtils;

Expand Down Expand Up @@ -760,8 +761,16 @@ public int compare(MemorySlice slice1, MemorySlice slice2) {
FieldReader fieldReader = fieldReaders[i];
Object o1 = fieldReader.readField(reader1, i);
Object o2 = fieldReader.readField(reader2, i);
@SuppressWarnings({"unchecked", "rawtypes"})
int comp = ((Comparable) o1).compareTo(o2);
int comp;
if (o1 instanceof byte[]) {
// BINARY / VARBINARY fields read back as byte[], which does not
// implement Comparable; order them like BinaryRow does.
comp = SortUtil.compareBinary((byte[]) o1, (byte[]) o2);
} else {
@SuppressWarnings({"unchecked", "rawtypes"})
int comparableComp = ((Comparable) o1).compareTo(o2);
comp = comparableComp;
}
if (comp != 0) {
return comp;
}
Expand Down
42 changes: 42 additions & 0 deletions ...on-common/src/test/java/org/apache/paimon/data/serializer/RowCompactedSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,21 @@
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.variant.GenericVariant;
import org.apache.paimon.memory.MemorySlice;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.RowType;

import org.junit.jupiter.api.Test;

import java.util.Comparator;

import static org.apache.paimon.data.BinaryString.fromString;
import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createArray;
import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createMap;
import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createRow;
import static org.apache.paimon.data.serializer.InternalRowSerializerTest.deepEqualsInternalRow;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/** Test for {@link RowCompactedSerializer}. */
Expand Down Expand Up @@ -202,6 +206,44 @@ private static RowCompactedSerializer getRowSerializer() {
}
}

static final class BinaryFieldTest extends RowCompactedSerializerTest {
public BinaryFieldTest() {
super(getRowSerializer(), getData());
}

private static InternalRow[] getData() {
return new GenericRow[] {
GenericRow.of(1, new byte[] {1, 2, 3}),
GenericRow.of(1, new byte[] {1, 2, 4}),
GenericRow.of(2, new byte[] {(byte) 0xFF})
};
}

private static RowCompactedSerializer getRowSerializer() {
return new RowCompactedSerializer(RowType.of(DataTypes.INT(), DataTypes.BYTES()));
}

@Test
public void testSliceComparatorOnBinaryFields() {
RowCompactedSerializer serializer = getRowSerializer();
Comparator<MemorySlice> comparator = serializer.createSliceComparator();
MemorySlice small =
MemorySlice.wrap(
serializer.serializeToBytes(GenericRow.of(1, new byte[] {1, 2, 3})));
MemorySlice large =
MemorySlice.wrap(
serializer.serializeToBytes(GenericRow.of(1, new byte[] {1, 2, 4})));
MemorySlice unsigned =
MemorySlice.wrap(
serializer.serializeToBytes(
GenericRow.of(1, new byte[] {(byte) 0xFF})));
assertThat(comparator.compare(small, large)).isLessThan(0);
assertThat(comparator.compare(large, small)).isGreaterThan(0);
assertThat(comparator.compare(small, small)).isEqualTo(0);
assertThat(comparator.compare(unsigned, small)).isGreaterThan(0);
}
}

static final class VectorTypesTest extends RowCompactedSerializerTest {
public VectorTypesTest() {
super(getRowSerializer(), getData());
Expand Down
Loading