Skip to content

Parameterize TestParquetDecimalScaling on writer version #10001

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

Merged
findepi merged 4 commits into from
Dec 1, 2021
Merged

Parameterize TestParquetDecimalScaling on writer version #10001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d795d4
Rename TestColumnReader#combine to concat
raunaqmorarka Nov 23, 2021
3d89dd1
Change arguments of cartesianProduct to work with data providers
raunaqmorarka Nov 29, 2021
9ce9e62
Move test parameterization methods to DataProviders
raunaqmorarka Nov 19, 2021
cd89622
Parameterize TestParquetDecimalScaling on writer version
raunaqmorarka Nov 19, 2021
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
30 changes: 30 additions & 0 deletions core/trino-main/src/main/java/io/trino/testing/DataProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
*/
package io.trino.testing;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.testng.annotations.DataProvider;

import java.util.Arrays;
import java.util.stream.Collector;
import java.util.stream.Stream;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.mapping;
import static java.util.stream.Collectors.toList;
Expand All @@ -39,4 +44,29 @@ public static Object[][] trueFalse()
{
return new Object[][] {{true}, {false}};
}

/**
* @return Full cartesian product of arguments, i.e. cartesianProduct({{A, B}}, {{1,2}}) will produce {{A,1}, {A,2}, {B,1}, {B,2}}
*/
public static Object[][] cartesianProduct(Object[][]... args)
{
return Lists.cartesianProduct(Arrays.stream(args)
.map(ImmutableList::copyOf)
.collect(toImmutableList()))
.stream()
.map(list -> list.stream()
.flatMap(Stream::of)
.toArray(Object[]::new))
.toArray(Object[][]::new);
}

/**
* @return args concatenated together into a single Object[][]
*/
public static Object[][] concat(Object[][]... args)
{
return Arrays.stream(args)
.flatMap(Arrays::stream)
.toArray(Object[][]::new);
}
}
72 changes: 27 additions & 45 deletions lib/trino-parquet/src/test/java/io/trino/parquet/reader/TestColumnReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.trino.parquet.reader;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import io.airlift.slice.Slices;
import io.trino.parquet.DataPage;
import io.trino.parquet.DataPageV2;
Expand All @@ -34,7 +33,6 @@
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
Expand All @@ -45,10 +43,13 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import java.util.stream.LongStream;
import java.util.stream.Stream;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.parquet.ParquetEncoding.PLAIN;
import static io.trino.spi.type.IntegerType.INTEGER;
import static io.trino.testing.DataProviders.cartesianProduct;
import static io.trino.testing.DataProviders.concat;
import static io.trino.testing.DataProviders.toDataProvider;
import static java.lang.Math.toIntExact;
import static java.util.Objects.requireNonNull;
import static org.apache.parquet.hadoop.metadata.CompressionCodecName.UNCOMPRESSED;
Expand Down Expand Up @@ -115,29 +116,33 @@ public void testReadFilteredPage(
@DataProvider
public Object[][] testRowRangesProvider()
{
Object[] columnReaders = ColumnReaderInput.values();
Object[] batchSkippers = BatchSkipper.values();
Object[] rowRanges = new Object[] {
Optional.empty(),
Optional.of(toRowRange(1024)),
Optional.of(toRowRange(956)),
Optional.of(toRowRanges(range(101, 900))),
Optional.of(toRowRanges(range(56, 89), range(120, 250), range(300, 455), range(600, 980)))
};
Object[] pageRowRanges = new Object[] {
ImmutableList.of(range(0, 1023)),
ImmutableList.of(range(0, 127), range(128, 1023)),
ImmutableList.of(range(0, 767), range(768, 1023)),
ImmutableList.of(range(0, 255), range(256, 511), range(512, 767), range(768, 1023)),
ImmutableList.of(range(0, 99), range(100, 199), range(200, 399), range(400, 599), range(600, 799), range(800, 999), range(1000, 1023))
};
Object[][] columnReaders = Stream.of(ColumnReaderInput.values())
.collect(toDataProvider());
Object[][] batchSkippers = Stream.of(BatchSkipper.values())
.collect(toDataProvider());
Object[][] rowRanges = Stream.of(
Optional.empty(),
Optional.of(toRowRange(1024)),
Optional.of(toRowRange(956)),
Optional.of(toRowRanges(range(101, 900))),
Optional.of(toRowRanges(range(56, 89), range(120, 250), range(300, 455), range(600, 980))))
.collect(toDataProvider());
Object[][] pageRowRanges = Stream.of(
ImmutableList.of(range(0, 1023)),
ImmutableList.of(range(0, 127), range(128, 1023)),
ImmutableList.of(range(0, 767), range(768, 1023)),
ImmutableList.of(range(0, 255), range(256, 511), range(512, 767), range(768, 1023)),
ImmutableList.of(range(0, 99), range(100, 199), range(200, 399), range(400, 599), range(600, 799), range(800, 999), range(1000, 1023)))
.collect(toDataProvider());
Object[][] rangesWithNoPageSkipped = cartesianProduct(columnReaders, batchSkippers, rowRanges, pageRowRanges);
Object[][] rangesWithPagesSkipped = cartesianProduct(
columnReaders,
batchSkippers,
new Object[] {Optional.of(toRowRanges(range(56, 80), range(120, 200), range(350, 455), range(600, 940)))},
new Object[] {ImmutableList.of(range(50, 100), range(120, 275), range(290, 455), range(590, 800), range(801, 1000))});
return combine(rangesWithNoPageSkipped, rangesWithPagesSkipped);
Stream.of(Optional.of(toRowRanges(range(56, 80), range(120, 200), range(350, 455), range(600, 940))))
.collect(toDataProvider()),
Stream.of(ImmutableList.of(range(50, 100), range(120, 275), range(290, 455), range(590, 800), range(801, 1000)))
.collect(toDataProvider()));
return concat(rangesWithNoPageSkipped, rangesWithPagesSkipped);
}

private enum ColumnReaderInput
Expand Down Expand Up @@ -282,27 +287,4 @@ private static int pagesRowCount(List<RowRange> pageRowRanges)
.mapToInt(range -> toIntExact(range.getEnd() - range.getStart() + 1))
.sum();
}

/**
* @return Full cartesian product of arguments, i.e cartesianProduct({A, B}, {1,2}) will produce {{A,1}, {A,2}, {B,1}, {B,2}}
*/
private static Object[][] cartesianProduct(Object[]... args)
{
return Lists.cartesianProduct(Arrays.stream(args)
.map(ImmutableList::copyOf)
.collect(toImmutableList()))
.stream()
.map(list -> list.toArray(Object[]::new))
.toArray(Object[][]::new);
}

/**
* @return args concatenated together into a single Object[][]
*/
private static Object[][] combine(Object[][]... args)
{
return Arrays.stream(args)
.flatMap(Arrays::stream)
.toArray(Object[][]::new);
}
}
Loading