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

Improve ORC double and float performance with batch reads #465

Merged
merged 1 commit into from
Mar 13, 2019
Merged

Improve ORC double and float performance with batch reads #465

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
32 changes: 17 additions & 15 deletions presto-orc/src/main/java/io/prestosql/orc/reader/DoubleStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.prestosql.orc.stream.InputStreamSource;
import io.prestosql.orc.stream.InputStreamSources;
import io.prestosql.spi.block.Block;
import io.prestosql.spi.block.BlockBuilder;
import io.prestosql.spi.block.RunLengthEncodedBlock;
import io.prestosql.spi.type.Type;
import org.openjdk.jol.info.ClassLayout;
Expand Down Expand Up @@ -98,36 +97,39 @@ public Block readBlock(Type type)
}
}

if (dataStream == null && presentStream != null) {
if (dataStream == null) {
if (presentStream == null) {
throw new OrcCorruptionException(streamDescriptor.getOrcDataSourceId(), "Value is not null but data stream is not present");
}
presentStream.skip(nextBatchSize);
Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
readOffset = 0;
nextBatchSize = 0;
return nullValueBlock;
}

BlockBuilder builder = type.createBlockBuilder(null, nextBatchSize);
Block block;
if (presentStream == null) {
if (dataStream == null) {
throw new OrcCorruptionException(streamDescriptor.getOrcDataSourceId(), "Value is not null but data stream is not present");
}
dataStream.nextVector(type, nextBatchSize, builder);
block = dataStream.nextBlock(type, nextBatchSize);
}
else {
for (int i = 0; i < nextBatchSize; i++) {
if (presentStream.nextBit()) {
type.writeDouble(builder, dataStream.next());
}
else {
builder.appendNull();
}
boolean[] isNull = new boolean[nextBatchSize];
int nullCount = presentStream.getUnsetBits(nextBatchSize, isNull);
if (nullCount == 0) {
block = dataStream.nextBlock(type, nextBatchSize);
}
else if (nullCount != nextBatchSize) {
block = dataStream.nextBlock(type, isNull);
}
else {
block = RunLengthEncodedBlock.create(type, null, nextBatchSize);
}
}

readOffset = 0;
nextBatchSize = 0;

return builder.build();
return block;
}

private void openRowGroup()
Expand Down
33 changes: 17 additions & 16 deletions presto-orc/src/main/java/io/prestosql/orc/reader/FloatStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.prestosql.orc.stream.InputStreamSource;
import io.prestosql.orc.stream.InputStreamSources;
import io.prestosql.spi.block.Block;
import io.prestosql.spi.block.BlockBuilder;
import io.prestosql.spi.block.RunLengthEncodedBlock;
import io.prestosql.spi.type.Type;
import org.openjdk.jol.info.ClassLayout;
Expand All @@ -38,7 +37,6 @@
import static io.prestosql.orc.metadata.Stream.StreamKind.DATA;
import static io.prestosql.orc.metadata.Stream.StreamKind.PRESENT;
import static io.prestosql.orc.stream.MissingInputStreamSource.missingStreamSource;
import static java.lang.Float.floatToRawIntBits;
import static java.util.Objects.requireNonNull;

public class FloatStreamReader
Expand Down Expand Up @@ -99,36 +97,39 @@ public Block readBlock(Type type)
}
}

if (dataStream == null && presentStream != null) {
if (dataStream == null) {
if (presentStream == null) {
throw new OrcCorruptionException(streamDescriptor.getOrcDataSourceId(), "Value is not null but data stream is not present");
}
presentStream.skip(nextBatchSize);
Block nullValueBlock = RunLengthEncodedBlock.create(type, null, nextBatchSize);
readOffset = 0;
nextBatchSize = 0;
return nullValueBlock;
}

BlockBuilder builder = type.createBlockBuilder(null, nextBatchSize);
Block block;
if (presentStream == null) {
if (dataStream == null) {
throw new OrcCorruptionException(streamDescriptor.getOrcDataSourceId(), "Value is not null but data stream is not present");
}
dataStream.nextVector(type, nextBatchSize, builder);
block = dataStream.nextBlock(type, nextBatchSize);
}
else {
for (int i = 0; i < nextBatchSize; i++) {
if (presentStream.nextBit()) {
type.writeLong(builder, floatToRawIntBits(dataStream.next()));
}
else {
builder.appendNull();
}
boolean[] isNull = new boolean[nextBatchSize];
int nullCount = presentStream.getUnsetBits(nextBatchSize, isNull);
if (nullCount == 0) {
block = dataStream.nextBlock(type, nextBatchSize);
}
else if (nullCount != nextBatchSize) {
block = dataStream.nextBlock(type, isNull);
}
else {
block = RunLengthEncodedBlock.create(type, null, nextBatchSize);
}
}

readOffset = 0;
nextBatchSize = 0;

return builder.build();
return block;
}

private void openRowGroup()
Expand Down
51 changes: 47 additions & 4 deletions presto-orc/src/main/java/io/prestosql/orc/stream/DoubleInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@
import io.airlift.slice.Slice;
import io.airlift.slice.Slices;
import io.prestosql.orc.checkpoint.DoubleStreamCheckpoint;
import io.prestosql.spi.block.Block;
import io.prestosql.spi.block.BlockBuilder;
import io.prestosql.spi.type.Type;

import java.io.IOException;

import static io.airlift.slice.SizeOf.SIZE_OF_DOUBLE;
import static java.lang.Integer.min;

public class DoubleInputStream
implements ValueInputStream<DoubleStreamCheckpoint>
{
private static final int BUFFER_SIZE = 128;
private final OrcInputStream input;
private final byte[] buffer = new byte[SIZE_OF_DOUBLE];
private final byte[] buffer = new byte[SIZE_OF_DOUBLE * BUFFER_SIZE];
private final Slice slice = Slices.wrappedBuffer(buffer);

public DoubleInputStream(OrcInputStream input)
Expand Down Expand Up @@ -63,11 +66,51 @@ public double next()
return slice.getDouble(0);
}

public void nextVector(Type type, int items, BlockBuilder builder)
public Block nextBlock(Type type, boolean[] isNull)
throws IOException
{
for (int i = 0; i < items; i++) {
type.writeDouble(builder, next());
int items = isNull.length;
BlockBuilder blockBuilder = type.createBlockBuilder(null, items);

for (int batchBase = 0; batchBase < items; batchBase += BUFFER_SIZE) {
int batchSize = min(items - batchBase, BUFFER_SIZE);

// stream is null suppressed, so count the present values
int nonNullCount = 0;
for (int i = batchBase; i < batchBase + batchSize; i++) {
if (!isNull[i]) {
nonNullCount++;
}
}
input.readFully(buffer, 0, SIZE_OF_DOUBLE * nonNullCount);

int bufferIndex = 0;
for (int i = batchBase; i < batchBase + batchSize; i++) {
if (!isNull[i]) {
type.writeDouble(blockBuilder, slice.getDouble(bufferIndex * SIZE_OF_DOUBLE));
bufferIndex++;
}
else {
blockBuilder.appendNull();
}
}
}
return blockBuilder.build();
}

public Block nextBlock(Type type, int items)
throws IOException
{
BlockBuilder blockBuilder = type.createBlockBuilder(null, items);
for (int batchBase = 0; batchBase < items; batchBase += BUFFER_SIZE) {
int batchSize = min(items - batchBase, BUFFER_SIZE);

input.readFully(buffer, 0, SIZE_OF_DOUBLE * batchSize);

for (int i = 0; i < batchSize; i++) {
type.writeDouble(blockBuilder, slice.getDouble(i * SIZE_OF_DOUBLE));
}
}
return blockBuilder.build();
}
}
53 changes: 48 additions & 5 deletions presto-orc/src/main/java/io/prestosql/orc/stream/FloatInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,22 @@
import io.airlift.slice.Slice;
import io.airlift.slice.Slices;
import io.prestosql.orc.checkpoint.FloatStreamCheckpoint;
import io.prestosql.spi.block.Block;
import io.prestosql.spi.block.BlockBuilder;
import io.prestosql.spi.type.Type;

import java.io.IOException;

import static io.airlift.slice.SizeOf.SIZE_OF_FLOAT;
import static java.lang.Float.floatToRawIntBits;
import static java.lang.Float.floatToIntBits;
import static java.lang.Integer.min;

public class FloatInputStream
implements ValueInputStream<FloatStreamCheckpoint>
{
private static final int BUFFER_SIZE = 128;
private final OrcInputStream input;
private final byte[] buffer = new byte[SIZE_OF_FLOAT];
private final byte[] buffer = new byte[SIZE_OF_FLOAT * BUFFER_SIZE];
private final Slice slice = Slices.wrappedBuffer(buffer);

public FloatInputStream(OrcInputStream input)
Expand Down Expand Up @@ -64,11 +67,51 @@ public float next()
return slice.getFloat(0);
}

public void nextVector(Type type, int items, BlockBuilder builder)
public Block nextBlock(Type type, boolean[] isNull)
throws IOException
{
for (int i = 0; i < items; i++) {
type.writeLong(builder, floatToRawIntBits(next()));
int items = isNull.length;
BlockBuilder blockBuilder = type.createBlockBuilder(null, items);

for (int batchBase = 0; batchBase < items; batchBase += BUFFER_SIZE) {
int batchSize = min(items - batchBase, BUFFER_SIZE);

// stream is null suppressed, so count the present values
int nonNullCount = 0;
for (int i = batchBase; i < batchBase + batchSize; i++) {
if (!isNull[i]) {
nonNullCount++;
}
}
input.readFully(buffer, 0, SIZE_OF_FLOAT * nonNullCount);

int bufferIndex = 0;
for (int i = batchBase; i < batchBase + batchSize; i++) {
if (!isNull[i]) {
type.writeLong(blockBuilder, floatToIntBits(slice.getFloat(bufferIndex * SIZE_OF_FLOAT)));
bufferIndex++;
}
else {
blockBuilder.appendNull();
}
}
}
return blockBuilder.build();
}

public Block nextBlock(Type type, int items)
throws IOException
{
BlockBuilder blockBuilder = type.createBlockBuilder(null, items);
for (int batchBase = 0; batchBase < items; batchBase += BUFFER_SIZE) {
int batchSize = min(items - batchBase, BUFFER_SIZE);

input.readFully(buffer, 0, SIZE_OF_FLOAT * batchSize);

for (int i = 0; i < batchSize; i++) {
type.writeLong(blockBuilder, floatToIntBits(slice.getFloat(i * SIZE_OF_FLOAT)));
}
}
return blockBuilder.build();
}
}