Skip to content

Keep sum stat for string when min/max stat is too long in ORC writer #13879

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
wenleix merged 1 commit into from
Dec 26, 2019
Merged

Keep sum stat for string when min/max stat is too long in ORC writer #13879

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
5 changes: 0 additions & 5 deletions ...rc/src/main/java/com/facebook/presto/orc/metadata/statistics/StringStatisticsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ private Optional<StringStatistics> buildStringStatistics()
}
minimum = dropStringMinMaxIfNecessary(minimum);
maximum = dropStringMinMaxIfNecessary(maximum);
if (minimum == null && maximum == null) {
// Create string stats only when min or max is not null.
// This corresponds to the behavior of metadata reader.
return Optional.empty();
}
return Optional.of(new StringStatistics(minimum, maximum, sum));
}

Expand Down
24 changes: 21 additions & 3 deletions ...rc/test/java/com/facebook/presto/orc/metadata/statistics/TestStringStatisticsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void testMinMaxValuesWithLimit()
{
assertMinMaxValuesWithLimit(MEDIUM_TOP_VALUE, null, ImmutableList.of(MEDIUM_TOP_VALUE, HIGH_BOTTOM_VALUE), 7);
assertMinMaxValuesWithLimit(null, MEDIUM_TOP_VALUE, ImmutableList.of(LONG_BOTTOM_VALUE, MEDIUM_TOP_VALUE), 7);
assertMinMaxValuesWithLimit(null, null, ImmutableList.of(LONG_BOTTOM_VALUE), 6);
assertMinMaxValuesWithLimit(null, null, ImmutableList.of(LONG_BOTTOM_VALUE), 6, 20);
}

@Test
Expand All @@ -141,9 +141,9 @@ public void testMergeWithLimit()
statisticsList.add(stringColumnStatistics(null, MEDIUM_TOP_VALUE));
assertMinMax(mergeColumnStatistics(statisticsList).getStringStatistics(), null, MEDIUM_TOP_VALUE);
statisticsList.add(stringColumnStatistics(MEDIUM_TOP_VALUE, null));
assertMinMax(mergeColumnStatistics(statisticsList).getStringStatistics(), null, null);
assertMinMax(mergeColumnStatistics(statisticsList).getStringStatistics(), null, null, 400);
statisticsList.add(stringColumnStatistics(MEDIUM_BOTTOM_VALUE, MEDIUM_BOTTOM_VALUE));
assertMinMax(mergeColumnStatistics(statisticsList).getStringStatistics(), null, null);
assertMinMax(mergeColumnStatistics(statisticsList).getStringStatistics(), null, null, 500);
}

@Test
Expand Down Expand Up @@ -275,6 +275,16 @@ private static void assertMinMaxValuesWithLimit(Slice expectedMin, Slice expecte
assertMinMax(builder.buildColumnStatistics().getStringStatistics(), expectedMin, expectedMax);
}

private static void assertMinMaxValuesWithLimit(Slice expectedMin, Slice expectedMax, List<Slice> values, int limit, long expectedSum)
{
checkArgument(values != null && values.size() > 0);
StringStatisticsBuilder builder = new StringStatisticsBuilder(limit);
for (Slice value : values) {
builder.addValue(value);
}
assertMinMax(builder.buildColumnStatistics().getStringStatistics(), expectedMin, expectedMax, expectedSum);
}

private static void assertMinMax(StringStatistics actualStringStatistics, Slice expectedMin, Slice expectedMax)
{
if (expectedMax == null && expectedMin == null) {
Expand All @@ -287,6 +297,14 @@ private static void assertMinMax(StringStatistics actualStringStatistics, Slice
assertEquals(actualStringStatistics.getMax(), expectedMax);
}

private static void assertMinMax(StringStatistics actualStringStatistics, Slice expectedMin, Slice expectedMax, long expectedSum)
{
assertNotNull(actualStringStatistics);
assertEquals(actualStringStatistics.getMin(), expectedMin);
assertEquals(actualStringStatistics.getMax(), expectedMax);
assertEquals(actualStringStatistics.getSum(), expectedSum);
}

private static ColumnStatistics stringColumnStatistics(Slice minimum, Slice maximum)
{
return new ColumnStatistics(
Expand Down