Skip to content

Implement writeObject and getObject for RealType and DoubleType #16209

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
yuanzhanhku wants to merge 1 commit into from
Closed

Implement writeObject and getObject for RealType and DoubleType #16209

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
12 changes: 12 additions & 0 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 @@ -56,13 +56,25 @@ public boolean isOrderable()

@Override
public Object getObjectValue(SqlFunctionProperties properties, Block block, int position)
{
return getObject(block, position);
}

@Override
public Object getObject(Block block, int position)
{
if (block.isNull(position)) {
return null;
}
return longBitsToDouble(block.getLong(position));
}

@Override
public void writeObject(BlockBuilder blockBuilder, Object value)
{
writeDouble(blockBuilder, ((Number) value).doubleValue());
}

@Override
public boolean equalTo(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
{
Expand Down
12 changes: 12 additions & 0 deletions 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 @@ -36,13 +36,25 @@ private RealType()

@Override
public Object getObjectValue(SqlFunctionProperties properties, Block block, int position)
{
return getObject(block, position);
}

@Override
public Object getObject(Block block, int position)
{
if (block.isNull(position)) {
return null;
}
return intBitsToFloat(block.getInt(position));
}

@Override
public void writeObject(BlockBuilder blockBuilder, Object value)
{
writeLong(blockBuilder, Float.floatToIntBits(((Number) value).floatValue()));
}

@Override
public boolean equalTo(Block leftBlock, int leftPosition, Block rightBlock, int rightPosition)
{
Expand Down
52 changes: 5 additions & 47 deletions presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayNormalizeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
@Description("Normalizes an array by dividing each element by the p-norm of the array.")
public final class ArrayNormalizeFunction
{
private static final ValueAccessor DOUBLE_VALUE_ACCESSOR = new DoubleValueAccessor();
private static final ValueAccessor REAL_VALUE_ACCESSOR = new RealValueAccessor();

private ArrayNormalizeFunction() {}

@TypeParameter("T")
Expand All @@ -49,7 +46,7 @@ public static Block normalizeDoubleArray(
@SqlType("array(T)") Block block,
@SqlType("T") double p)
{
return normalizeArray(elementType, block, p, DOUBLE_VALUE_ACCESSOR);
return normalizeArray(elementType, block, p);
}

@TypeParameter("T")
Expand All @@ -61,10 +58,10 @@ public static Block normalizeRealArray(
@SqlType("array(T)") Block block,
@SqlType("T") long p)
{
return normalizeArray(elementType, block, Float.intBitsToFloat((int) p), REAL_VALUE_ACCESSOR);
return normalizeArray(elementType, block, Float.intBitsToFloat((int) p));
}

private static Block normalizeArray(Type elementType, Block block, double p, ValueAccessor valueAccessor)
private static Block normalizeArray(Type elementType, Block block, double p)
{
if (!(elementType instanceof RealType) && !(elementType instanceof DoubleType)) {
throw new PrestoException(
Expand All @@ -83,55 +80,16 @@ private static Block normalizeArray(Type elementType, Block block, double p, Val
if (block.isNull(i)) {
return null;
}
pNorm += Math.pow(Math.abs(valueAccessor.getValue(elementType, block, i)), p);
pNorm += Math.pow(Math.abs(((Number) elementType.getObject(block, i)).doubleValue()), p);
}
if (pNorm == 0) {
return block;
}
pNorm = Math.pow(pNorm, 1.0 / p);
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, elementCount);
for (int i = 0; i < elementCount; i++) {
valueAccessor.writeValue(elementType, blockBuilder, valueAccessor.getValue(elementType, block, i) / pNorm);
elementType.writeObject(blockBuilder, ((Number) elementType.getObject(block, i)).doubleValue() / pNorm);
}
return blockBuilder.build();
}

private interface ValueAccessor
{
double getValue(Type elementType, Block block, int position);

void writeValue(Type elementType, BlockBuilder blockBuilder, double value);
}

private static class DoubleValueAccessor
implements ValueAccessor
{
@Override
public double getValue(Type elementType, Block block, int position)
{
return elementType.getDouble(block, position);
}

@Override
public void writeValue(Type elementType, BlockBuilder blockBuilder, double value)
{
elementType.writeDouble(blockBuilder, value);
}
}

private static class RealValueAccessor
implements ValueAccessor
{
@Override
public double getValue(Type elementType, Block block, int position)
{
return Float.intBitsToFloat((int) elementType.getLong(block, position));
}

@Override
public void writeValue(Type elementType, BlockBuilder blockBuilder, double value)
{
elementType.writeLong(blockBuilder, Float.floatToIntBits((float) value));
}
}
}
23 changes: 23 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 @@ -68,4 +68,27 @@ public void testNaNHash()
assertEquals(DOUBLE.hash(blockBuilder, 0), DOUBLE.hash(blockBuilder, 2));
assertEquals(DOUBLE.hash(blockBuilder, 0), DOUBLE.hash(blockBuilder, 3));
}

@Test
public void testGetAndWrite()
{
BlockBuilder blockBuilder = DOUBLE.createFixedSizeBlockBuilder(5);
DOUBLE.writeDouble(blockBuilder, 1.1);
DOUBLE.writeObject(blockBuilder, 1.1);
DOUBLE.writeDouble(blockBuilder, Double.NaN);
DOUBLE.writeObject(blockBuilder, Double.NaN);
// Test passing an integer.
DOUBLE.writeObject(blockBuilder, 4);

Block block = blockBuilder.build();
assertEquals(DOUBLE.getDouble(block, 0), 1.1);
assertEquals(DOUBLE.getObject(block, 0), 1.1);
assertEquals(DOUBLE.getDouble(block, 1), 1.1);
assertEquals(DOUBLE.getObject(block, 1), 1.1);
assertEquals(DOUBLE.getDouble(block, 2), Double.NaN);
assertEquals(DOUBLE.getObject(block, 2), Double.NaN);
assertEquals(DOUBLE.getDouble(block, 3), Double.NaN);
assertEquals(DOUBLE.getObject(block, 3), Double.NaN);
assertEquals(DOUBLE.getObject(block, 4), 4.0);
}
}
23 changes: 23 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 @@ -71,4 +71,27 @@ public void testNaNHash()
assertEquals(REAL.hash(blockBuilder, 0), REAL.hash(blockBuilder, 2));
assertEquals(REAL.hash(blockBuilder, 0), REAL.hash(blockBuilder, 3));
}

@Test
public void testGetAndWrite()
{
BlockBuilder blockBuilder = REAL.createFixedSizeBlockBuilder(5);
REAL.writeLong(blockBuilder, floatToIntBits(1.1f));
REAL.writeObject(blockBuilder, 1.1f);
REAL.writeLong(blockBuilder, floatToIntBits(Float.NaN));
REAL.writeObject(blockBuilder, Float.NaN);
// Test passing an integer.
REAL.writeObject(blockBuilder, 4);
Block block = blockBuilder.build();

assertEquals(intBitsToFloat((int) REAL.getLong(block, 0)), 1.1f);
assertEquals(REAL.getObject(block, 0), 1.1f);
assertEquals(intBitsToFloat((int) REAL.getLong(block, 1)), 1.1f);
assertEquals(REAL.getObject(block, 1), 1.1f);
assertEquals(intBitsToFloat((int) REAL.getLong(block, 2)), Float.NaN);
assertEquals(REAL.getObject(block, 2), Float.NaN);
assertEquals(intBitsToFloat((int) REAL.getLong(block, 3)), Float.NaN);
assertEquals(REAL.getObject(block, 3), Float.NaN);
assertEquals(REAL.getObject(block, 4), 4.0f);
}
}