Skip to content
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

Jump to bottom

Fix hash for double and real types when new nan is disabled #23060

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Fix hash for double and real types when new nan is disabled #23060

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
8 changes: 6 additions & 2 deletions presto-common/src/main/java/com/facebook/presto/common/type/DoubleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,12 @@ public boolean equalTo(Block leftBlock, int leftPosition, Block rightBlock, int
@Override
public long hash(Block block, int position)
{
// convert to canonical NaN if necessary
return doubleHashCode(longBitsToDouble(block.getLong(position)));
Double doubleValue = longBitsToDouble(block.getLong(position));
if (!useNewNanDefintion) {
// convert to canonical NaN if necessary
return AbstractLongType.hash(doubleToLongBits(doubleValue));
}
return doubleHashCode(doubleValue);
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion presto-common/src/main/java/com/facebook/presto/common/type/RealType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static com.facebook.presto.common.type.TypeUtils.realCompare;
import static com.facebook.presto.common.type.TypeUtils.realEquals;
import static com.facebook.presto.common.type.TypeUtils.realHashCode;
import static java.lang.Float.floatToIntBits;
import static java.lang.Float.intBitsToFloat;
import static java.lang.Math.toIntExact;
import static java.lang.String.format;
Expand Down Expand Up @@ -64,7 +65,12 @@ public boolean equalTo(Block leftBlock, int leftPosition, Block rightBlock, int
@Override
public long hash(Block block, int position)
{
return realHashCode(intBitsToFloat(block.getInt(position)));
float value = intBitsToFloat(block.getInt(position));
if (!useNewNanDefinition) {
// convert to canonical NaN if necessary
return AbstractIntType.hash(floatToIntBits(value));
}
return realHashCode(value);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion presto-common/src/main/java/com/facebook/presto/common/type/TypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public static long realHashCode(float value)
// canonicalize +0 and -0 to a single value
value = value == -0 ? 0 : value;
// floatToIntBits converts all NaNs to the same representation
return AbstractLongType.hash(floatToIntBits(value));
return AbstractIntType.hash(floatToIntBits(value));
}

public static int realCompare(float a, float b)
Expand Down
21 changes: 21 additions & 0 deletions presto-main/src/test/java/com/facebook/presto/type/TestDoubleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
import org.testng.annotations.Test;

import static com.facebook.presto.common.type.DoubleType.DOUBLE;
import static com.facebook.presto.common.type.DoubleType.OLD_NAN_DOUBLE;
import static com.facebook.presto.common.type.RealType.OLD_NAN_REAL;
import static java.lang.Double.doubleToLongBits;
import static java.lang.Double.doubleToRawLongBits;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;

public class TestDoubleType
extends AbstractTestType
Expand Down Expand Up @@ -68,4 +71,22 @@ public void testNaNHash()
assertEquals(DOUBLE.hash(blockBuilder, 0), DOUBLE.hash(blockBuilder, 2));
assertEquals(DOUBLE.hash(blockBuilder, 0), DOUBLE.hash(blockBuilder, 3));
}

@Test
public void testLegacyDoubleHash()
{
BlockBuilder blockBuilder = new LongArrayBlockBuilder(null, 4);
blockBuilder.writeLong(doubleToLongBits(Double.parseDouble("-0")));
blockBuilder.writeLong(doubleToLongBits(Double.parseDouble("0")));
assertNotEquals(OLD_NAN_DOUBLE.hash(blockBuilder, 0), OLD_NAN_REAL.hash(blockBuilder, 1));
}

@Test
public void testDoubleHash()
{
BlockBuilder blockBuilder = new LongArrayBlockBuilder(null, 4);
blockBuilder.writeLong(doubleToLongBits(Double.parseDouble("-0")));
blockBuilder.writeLong(doubleToLongBits(Double.parseDouble("0")));
assertEquals(DOUBLE.hash(blockBuilder, 0), DOUBLE.hash(blockBuilder, 1));
}
}
20 changes: 20 additions & 0 deletions presto-main/src/test/java/com/facebook/presto/type/TestRealType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
import com.facebook.presto.common.block.IntArrayBlockBuilder;
import org.testng.annotations.Test;

import static com.facebook.presto.common.type.RealType.OLD_NAN_REAL;
import static com.facebook.presto.common.type.RealType.REAL;
import static java.lang.Float.floatToIntBits;
import static java.lang.Float.floatToRawIntBits;
import static java.lang.Float.intBitsToFloat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;

public class TestRealType
extends AbstractTestType
Expand Down Expand Up @@ -71,4 +73,22 @@ public void testNaNHash()
assertEquals(REAL.hash(blockBuilder, 0), REAL.hash(blockBuilder, 2));
assertEquals(REAL.hash(blockBuilder, 0), REAL.hash(blockBuilder, 3));
}

@Test
public void testLegacyRealHash()
{
BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, 4);
blockBuilder.writeInt(floatToIntBits(Float.parseFloat("-0")));
blockBuilder.writeInt(floatToIntBits(Float.parseFloat("0")));
assertNotEquals(OLD_NAN_REAL.hash(blockBuilder, 0), OLD_NAN_REAL.hash(blockBuilder, 1));
}

@Test
public void testRealHash()
{
BlockBuilder blockBuilder = new IntArrayBlockBuilder(null, 4);
blockBuilder.writeInt(floatToIntBits(Float.parseFloat("-0")));
blockBuilder.writeInt(floatToIntBits(Float.parseFloat("0")));
assertEquals(REAL.hash(blockBuilder, 0), REAL.hash(blockBuilder, 1));
}
}
Loading