Skip to content

[FLINK-35276][table] Fix incorrect sort order for floating-point negative zero in generated comparators #28383

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
Au-Miner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLINK-35276][table] Fix incorrect sort order for floating-point negative zero in generated comparators #28383

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
6 changes: 5 additions & 1 deletion ...k-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/GenerateUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,11 @@ object GenerateUtils {
val sortUtil =
classOf[org.apache.flink.table.runtime.operators.sort.SortUtil].getCanonicalName
s"$sortUtil.compareBinary($leftTerm, $rightTerm)"
case TINYINT | SMALLINT | INTEGER | BIGINT | FLOAT | DOUBLE | DATE | TIME_WITHOUT_TIME_ZONE |
case FLOAT =>
s"Float.compare($leftTerm, $rightTerm)"
case DOUBLE =>
s"Double.compare($leftTerm, $rightTerm)"
case TINYINT | SMALLINT | INTEGER | BIGINT | DATE | TIME_WITHOUT_TIME_ZONE |
INTERVAL_YEAR_MONTH | INTERVAL_DAY_TIME =>
s"($leftTerm > $rightTerm ? 1 : $leftTerm < $rightTerm ? -1 : 0)"
case TIMESTAMP_WITH_TIME_ZONE | MULTISET | MAP | VARIANT | BITMAP =>
Expand Down
40 changes: 39 additions & 1 deletion ...e-planner/src/test/java/org/apache/flink/table/planner/codegen/SortCodeGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class SortCodeGeneratorTest {

private RowType inputType;
private SortSpec sortSpec;
private BinaryRowData[] customTestData;

private static final DataType INT_ROW_TYPE =
DataTypes.ROW(DataTypes.FIELD("f0", DataTypes.INT())).bridgedTo(Row.class);
Expand All @@ -136,6 +137,26 @@ class SortCodeGeneratorTest {
.createComparator(
new int[] {0}, new boolean[] {true}, 0, new ExecutionConfig());

@Test
void testFloatNegativeZeroSortKey() throws Exception {
inputType =
RowType.of(
new TypeInformationRawType<>(Types.INT),
new FloatType(),
new BooleanType());
sortSpec =
SortSpec.builder()
.addField(0, true, SortUtil.getNullDefaultOrder(true))
.addField(1, true, SortUtil.getNullDefaultOrder(true))
.build();
customTestData = buildNegativeZeroFloatTestData();
try {
testInner();
} finally {
customTestData = null;
}
}

@Test
void testMultiKeys() throws Exception {
for (int i = 0; i < 100; i++) {
Expand Down Expand Up @@ -212,7 +233,22 @@ private BinaryRowData row(int i, Object[][] values) {
return row;
}

private BinaryRowData[] buildNegativeZeroFloatTestData() {
Object[][] values = new Object[3][];
values[0] = new Object[] {RawValueData.fromObject(0), RawValueData.fromObject(0)};
values[1] = new Object[] {0.0f, -0.0f};
values[2] = new Object[] {false, true};
BinaryRowData[] result = new BinaryRowData[2];
for (int i = 0; i < result.length; i++) {
result[i] = row(i, values);
}
return result;
}

private BinaryRowData[] getTestData() {
if (customTestData != null) {
return customTestData;
}
BinaryRowData[] result = new BinaryRowData[RECORD_NUM];
Object[][] values = new Object[inputType.getFieldCount()][];
for (int i = 0; i < inputType.getFieldCount(); i++) {
Expand Down Expand Up @@ -477,7 +513,9 @@ private void testInner() throws Exception {

List<BinaryRowData> data = Arrays.asList(dataArray.clone());
List<BinaryRowData> binaryRows = Arrays.asList(dataArray.clone());
Collections.shuffle(binaryRows);
if (customTestData == null) {
Collections.shuffle(binaryRows);
}

for (BinaryRowData row : binaryRows) {
if (!sortBuffer.write(row)) {
Expand Down