Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ project(':iceberg-data') {
}

testCompile project(path: ':iceberg-api', configuration: 'testArtifacts')
testCompile project(path: ':iceberg-core', configuration: 'testArtifacts')
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import org.apache.avro.io.Decoder;
import org.apache.iceberg.avro.ValueReader;
import org.apache.iceberg.avro.ValueReaders;
import org.apache.iceberg.data.DateTimeUtil;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.types.Types.StructType;
import org.apache.iceberg.util.DateTimeUtil;

class GenericReaders {
private GenericReaders() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iceberg.data;
package org.apache.iceberg.util;

import java.time.Instant;
import java.time.LocalDate;
Expand Down
307 changes: 145 additions & 162 deletions core/src/test/java/org/apache/iceberg/TestMetrics.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.iceberg.StructLike;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.DateTimeUtil;

class InternalRecordWrapper implements StructLike {
private final Function<Object, Object>[] transforms;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.DateTimeUtil;
import org.apache.iceberg.util.PartitionUtil;

class TableScanIterable extends CloseableGroup implements CloseableIterable<Record> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* 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.iceberg.parquet;

import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.UUID;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.Files;
import org.apache.iceberg.Metrics;
import org.apache.iceberg.Schema;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.TestMetrics;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.data.parquet.GenericParquetWriter;
import org.apache.iceberg.io.FileAppender;
import org.apache.iceberg.io.InputFile;
import org.apache.iceberg.io.OutputFile;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.parquet.hadoop.ParquetFileReader;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;

/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: seems like comment is not adding anything more

* Test Metrics for Parquet.
*/
public class TestParquetMetrics extends TestMetrics {
private static final Map<String, String> SMALL_ROW_GROUP_CONFIG = ImmutableMap.of(
TableProperties.PARQUET_ROW_GROUP_SIZE_BYTES, "1600");

@Rule
public TemporaryFolder temp = new TemporaryFolder();

@Override
public Metrics getMetrics(InputFile file) {
return ParquetUtil.fileMetrics(file);
}

@Override
public InputFile writeRecordsWithSmallRowGroups(Schema schema, Record... records) throws IOException {
return writeRecords(schema, SMALL_ROW_GROUP_CONFIG, records);
}

@Override
public InputFile writeRecords(Schema schema, Record... records) throws IOException {
return writeRecords(schema, ImmutableMap.of(), records);
}

private InputFile writeRecords(Schema schema, Map<String, String> properties, Record... records) throws IOException {
File tmpFolder = temp.newFolder("parquet");
String filename = UUID.randomUUID().toString();
OutputFile file = Files.localOutput(new File(tmpFolder, FileFormat.PARQUET.addExtension(filename)));
try (FileAppender<Record> writer = Parquet.write(file)
.schema(schema)
.setAll(properties)
.createWriterFunc(GenericParquetWriter::buildWriter)
.build()) {
writer.addAll(Lists.newArrayList(records));
}
return file.toInputFile();
}

@Override
public int splitCount(InputFile parquetFile) throws IOException {
try (ParquetFileReader reader = ParquetFileReader.open(ParquetIO.file(parquetFile))) {
return reader.getRowGroups().size();
}
}

@Override
public boolean supportsSmallRowGroups() {
return true;
}
}

This file was deleted.