Skip to content

Delta source: add record count for DataFile #623

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
the-other-tim-brown merged 1 commit into from
Jan 31, 2025
Merged

Delta source: add record count for DataFile #623

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
36 changes: 36 additions & 0 deletions xtable-api/src/main/java/org/apache/xtable/model/stat/FileStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.xtable.model.stat;

import java.util.List;

import lombok.Builder;
import lombok.Value;

/**
* Captures a file level statistics.
*
* @since 0.2
*/
@Value
@Builder(toBuilder = true)
public class FileStats {
List<ColumnStat> columnStats;
long numRecords;
}
10 changes: 4 additions & 6 deletions xtable-core/src/main/java/org/apache/xtable/delta/DeltaActionsConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.xtable.model.schema.InternalField;
import org.apache.xtable.model.schema.InternalPartitionField;
import org.apache.xtable.model.stat.ColumnStat;
import org.apache.xtable.model.stat.FileStats;
import org.apache.xtable.model.storage.FileFormat;
import org.apache.xtable.model.storage.InternalDataFile;

Expand All @@ -56,13 +57,10 @@ public InternalDataFile convertAddActionToInternalDataFile(
boolean includeColumnStats,
DeltaPartitionExtractor partitionExtractor,
DeltaStatsExtractor fileStatsExtractor) {
FileStats fileStats = fileStatsExtractor.getColumnStatsForFile(addFile, fields);
List<ColumnStat> columnStats =
includeColumnStats
? fileStatsExtractor.getColumnStatsForFile(addFile, fields)
: Collections.emptyList();
long recordCount =
columnStats.stream().map(ColumnStat::getNumValues).max(Long::compareTo).orElse(0L);
// TODO(https://github.com/apache/incubator-xtable/issues/102): removed record count.
includeColumnStats ? fileStats.getColumnStats() : Collections.emptyList();
long recordCount = fileStats.getNumRecords();
return InternalDataFile.builder()
.physicalPath(getFullPathToFile(deltaSnapshot, addFile.path()))
.fileFormat(fileFormat)
Expand Down
52 changes: 29 additions & 23 deletions xtable-core/src/main/java/org/apache/xtable/delta/DeltaStatsExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.apache.xtable.model.schema.InternalSchema;
import org.apache.xtable.model.schema.InternalType;
import org.apache.xtable.model.stat.ColumnStat;
import org.apache.xtable.model.stat.FileStats;
import org.apache.xtable.model.stat.Range;

/**
Expand Down Expand Up @@ -185,9 +186,9 @@ private void insertValueAtPath(Map<String, Object> jsonObject, String[] pathPart
}
}

public List<ColumnStat> getColumnStatsForFile(AddFile addFile, List<InternalField> fields) {
public FileStats getColumnStatsForFile(AddFile addFile, List<InternalField> fields) {
if (StringUtils.isEmpty(addFile.stats())) {
return Collections.emptyList();
return FileStats.builder().columnStats(Collections.emptyList()).numRecords(0).build();
}
// TODO: Additional work needed to track maps & arrays.
try {
Expand All @@ -197,27 +198,32 @@ public List<ColumnStat> getColumnStatsForFile(AddFile addFile, List<InternalFiel
Map<String, Object> fieldPathToMaxValue = flattenStatMap(deltaStats.getMaxValues());
Map<String, Object> fieldPathToMinValue = flattenStatMap(deltaStats.getMinValues());
Map<String, Object> fieldPathToNullCount = flattenStatMap(deltaStats.getNullCount());
return fields.stream()
.filter(field -> fieldPathToMaxValue.containsKey(field.getPath()))
.map(
field -> {
String fieldPath = field.getPath();
Object minValue =
DeltaValueConverter.convertFromDeltaColumnStatValue(
fieldPathToMinValue.get(fieldPath), field.getSchema());
Object maxValue =
DeltaValueConverter.convertFromDeltaColumnStatValue(
fieldPathToMaxValue.get(fieldPath), field.getSchema());
Number nullCount = (Number) fieldPathToNullCount.get(fieldPath);
Range range = Range.vector(minValue, maxValue);
return ColumnStat.builder()
.field(field)
.numValues(deltaStats.getNumRecords())
.numNulls(nullCount.longValue())
.range(range)
.build();
})
.collect(CustomCollectors.toList(fields.size()));
List<ColumnStat> columnStats =
fields.stream()
.filter(field -> fieldPathToMaxValue.containsKey(field.getPath()))
.map(
field -> {
String fieldPath = field.getPath();
Object minValue =
DeltaValueConverter.convertFromDeltaColumnStatValue(
fieldPathToMinValue.get(fieldPath), field.getSchema());
Object maxValue =
DeltaValueConverter.convertFromDeltaColumnStatValue(
fieldPathToMaxValue.get(fieldPath), field.getSchema());
Number nullCount = (Number) fieldPathToNullCount.get(fieldPath);
Range range = Range.vector(minValue, maxValue);
return ColumnStat.builder()
.field(field)
.numValues(deltaStats.getNumRecords())
.numNulls(nullCount.longValue())
.range(range)
.build();
})
.collect(CustomCollectors.toList(fields.size()));
return FileStats.builder()
.columnStats(columnStats)
.numRecords(deltaStats.getNumRecords())
.build();
} catch (IOException ex) {
throw new ParseException("Unable to parse stats json", ex);
}
Expand Down
29 changes: 21 additions & 8 deletions xtable-core/src/test/java/org/apache/xtable/delta/TestDeltaStatsExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.xtable.model.schema.InternalSchema;
import org.apache.xtable.model.schema.InternalType;
import org.apache.xtable.model.stat.ColumnStat;
import org.apache.xtable.model.stat.FileStats;
import org.apache.xtable.model.stat.Range;
import org.apache.xtable.testutil.ColumnStatMapUtil;

Expand Down Expand Up @@ -120,11 +121,15 @@ void roundTripStatsConversion() throws IOException {
List<InternalField> fields = schema.getAllFields();
List<ColumnStat> columnStats = getColumnStats();

long numRecords = 50L;
String stats =
DeltaStatsExtractor.getInstance().convertStatsToDeltaFormat(schema, 50L, columnStats);
DeltaStatsExtractor.getInstance()
.convertStatsToDeltaFormat(schema, numRecords, columnStats);
AddFile addFile = new AddFile("file://path/to/file", null, 0, 0, true, stats, null, null);
DeltaStatsExtractor extractor = DeltaStatsExtractor.getInstance();
List<ColumnStat> actual = extractor.getColumnStatsForFile(addFile, fields);
FileStats actual = extractor.getColumnStatsForFile(addFile, fields);
List<ColumnStat> actualColumStats = actual.getColumnStats();
long actualNumRecords = actual.getNumRecords();

Set<ColumnStat> expected = new HashSet<>();
columnStats.forEach(
Expand All @@ -137,7 +142,8 @@ void roundTripStatsConversion() throws IOException {
expected.add(columnStatWithoutSize);
}
});
assertEquals(expected, new HashSet<>(actual));
assertEquals(expected, new HashSet<>(actualColumStats));
assertEquals(numRecords, actualNumRecords);
}

@Test
Expand All @@ -147,20 +153,24 @@ void convertStatsToInternalRepresentation() throws IOException {
Map<String, Object> maxValues = generateMap("b", 2, 2.0, 20);
Map<String, Object> nullValues = generateMap(1L, 2L, 3L, 4L);
Map<String, Object> deltaStats = new HashMap<>();
long numRecords = 100;
deltaStats.put("minValues", minValues);
deltaStats.put("maxValues", maxValues);
deltaStats.put("nullCount", nullValues);
deltaStats.put("numRecords", 100);
deltaStats.put("numRecords", numRecords);
deltaStats.put("tightBounds", Boolean.TRUE);
deltaStats.put("nonExisting", minValues);
String stats = MAPPER.writeValueAsString(deltaStats);
AddFile addFile = new AddFile("file://path/to/file", null, 0, 0, true, stats, null, null);
DeltaStatsExtractor extractor = DeltaStatsExtractor.getInstance();
List<ColumnStat> actual = extractor.getColumnStatsForFile(addFile, fields);
FileStats actual = extractor.getColumnStatsForFile(addFile, fields);
List<ColumnStat> actualColumStats = actual.getColumnStats();
long actualNumRecords = actual.getNumRecords();
Set<String> unsupportedStats = extractor.getUnsupportedStats();
assertEquals(2, unsupportedStats.size());
assertTrue(unsupportedStats.contains("tightBounds"));
assertTrue(unsupportedStats.contains("nonExisting"));
assertEquals(numRecords, actualNumRecords);

List<ColumnStat> expected =
Arrays.asList(
Expand Down Expand Up @@ -188,16 +198,19 @@ void convertStatsToInternalRepresentation() throws IOException {
.numNulls(4)
.range(Range.vector(10, 20))
.build());
assertEquals(expected, actual);
assertEquals(expected, actualColumStats);
}

@Test
void convertNullStatsToInternalRepresentation() {
List<InternalField> fields = getSchemaFields();
AddFile addFile = new AddFile("file://path/to/file", null, 0, 0, true, null, null, null);
DeltaStatsExtractor extractor = DeltaStatsExtractor.getInstance();
List<ColumnStat> actual = extractor.getColumnStatsForFile(addFile, fields);
assertEquals(Collections.emptyList(), actual);
FileStats actual = extractor.getColumnStatsForFile(addFile, fields);
List<ColumnStat> actualColumStats = actual.getColumnStats();
long actualNumRecords = actual.getNumRecords();
assertEquals(Collections.emptyList(), actualColumStats);
assertEquals(0, actualNumRecords);
}

private List<InternalField> getSchemaFields() {
Expand Down