Skip to content
Open
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
54 changes: 54 additions & 0 deletions api/src/main/java/org/apache/iceberg/ColumnFile.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* 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;

import java.util.List;
import org.apache.iceberg.types.Types;

/** Information about a column file. */
public interface ColumnFile {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

To return List from DataFile, we have to move this class to API and make it public.

Types.NestedField FIELD_IDS =
Types.NestedField.required(
161,
"field_ids",
Types.ListType.ofRequired(162, Types.IntegerType.get()),
"Field IDs this column file contains");
Types.NestedField LOCATION =
Types.NestedField.required(
163, "location", Types.StringType.get(), "Location of the column file");
Types.NestedField FILE_SIZE_IN_BYTES =
Types.NestedField.required(
164, "file_size_in_bytes", Types.LongType.get(), "Total column file size in bytes");

static Types.StructType schema() {
return Types.StructType.of(FIELD_IDS, LOCATION, FILE_SIZE_IN_BYTES);
}

/** Returns the field IDs contained in this column file. */
List<Integer> fieldIds();

/** Returns the location of the column file. */
String location();

/** Returns the total size of the column file in bytes. */
long fileSizeInBytes();

/** Copies this column file. */
ColumnFile copy();
}
4 changes: 4 additions & 0 deletions api/src/main/java/org/apache/iceberg/DataFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,8 @@ default FileContent content() {
default List<Integer> equalityFieldIds() {
return null;
}

default List<ColumnFile> columnFiles() {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

equalityFieldIds override the function from ContentFile. Following the same pattern, should columnFiles be also defined there?

return null;
}
}
176 changes: 176 additions & 0 deletions core/src/main/java/org/apache/iceberg/ColumnFileStruct.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
/*
* 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;

import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import org.apache.iceberg.avro.SupportsIndexProjection;
import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.ArrayUtil;

/** Mutable {@link StructLike} implementation of {@link ColumnFile}. */
class ColumnFileStruct extends SupportsIndexProjection implements ColumnFile, Serializable {
private static final Types.StructType BASE_TYPE =
Types.StructType.of(ColumnFile.FIELD_IDS, ColumnFile.LOCATION, ColumnFile.FILE_SIZE_IN_BYTES);

private int[] fieldIds = null;
private String location = null;
private long fileSizeInBytes = -1L;

/** Used by internal readers to instantiate this class with a projection schema. */
ColumnFileStruct(Types.StructType projection) {
super(BASE_TYPE, projection);
}

ColumnFileStruct(List<Integer> fieldIds, String location, long fileSizeInBytes) {
super(BASE_TYPE.fields().size());
this.fieldIds = ArrayUtil.toIntArray(fieldIds);
this.location = location;
this.fileSizeInBytes = fileSizeInBytes;
}

/** Copy constructor. */
private ColumnFileStruct(ColumnFileStruct toCopy) {
super(toCopy);
this.fieldIds =
toCopy.fieldIds != null ? Arrays.copyOf(toCopy.fieldIds, toCopy.fieldIds.length) : null;
this.location = toCopy.location;
this.fileSizeInBytes = toCopy.fileSizeInBytes;
}

/** Constructor for Java serialization. */
ColumnFileStruct() {
super(BASE_TYPE.fields().size());
}

@Override
public List<Integer> fieldIds() {
return fieldIds != null ? ArrayUtil.toUnmodifiableIntList(fieldIds) : null;
}

@Override
public String location() {
return location;
}

@Override
public long fileSizeInBytes() {
return fileSizeInBytes;
}

@Override
public ColumnFile copy() {
return new ColumnFileStruct(this);
}

@Override
protected <T> T internalGet(int pos, Class<T> javaClass) {
return javaClass.cast(getByPos(pos));
}

private Object getByPos(int pos) {
switch (pos) {
case 0:
return fieldIds();
case 1:
return location;
case 2:
return fileSizeInBytes;
default:
throw new UnsupportedOperationException("Unknown field ordinal: " + pos);
}
}

@Override
@SuppressWarnings("unchecked")
protected <T> void internalSet(int pos, T value) {
switch (pos) {
case 0:
this.fieldIds = ArrayUtil.toIntArray((List<Integer>) value);
break;
case 1:
// always coerce to String for Serializable
this.location = value.toString();
break;
case 2:
this.fileSizeInBytes = (long) value;
break;
default:
// ignore the object, it must be from a newer version of the format
}
}

static Builder builder() {
return new Builder();
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("field_ids", fieldIds)
.add("location", location)
.add("file_size_in_bytes", fileSizeInBytes)
.toString();
}

static class Builder {
private List<Integer> fieldIds = null;
private String location = null;
private Long fileSizeInBytes = null;

Builder fieldIds(List<Integer> newFieldIds) {
Preconditions.checkArgument(newFieldIds != null, "Invalid field IDs: null");
Preconditions.checkArgument(!newFieldIds.isEmpty(), "Invalid field IDs: empty");
Preconditions.checkArgument(
Sets.newHashSet(newFieldIds).size() == newFieldIds.size(),
"Invalid field IDs: duplicateD IDs found: %s",
newFieldIds);
this.fieldIds = newFieldIds;
return this;
}

Builder location(String newLocation) {
Preconditions.checkArgument(newLocation != null, "Invalid location: null");
Preconditions.checkArgument(!newLocation.isEmpty(), "Invalid location: empty");
this.location = newLocation;
return this;
}

Builder fileSizeInBytes(long newFileSizeInBytes) {
Preconditions.checkArgument(
newFileSizeInBytes >= 0,
"Invalid file size in bytes: %s (must be >= 0)",
newFileSizeInBytes);
this.fileSizeInBytes = newFileSizeInBytes;
return this;
}

ColumnFile build() {
Preconditions.checkArgument(fieldIds != null, "Missing required value: fieldIds");
Preconditions.checkArgument(location != null, "Missing required value: location");
Preconditions.checkArgument(
fileSizeInBytes != null, "Missing required value: fileSizeInBytes");
return new ColumnFileStruct(fieldIds, location, fileSizeInBytes);
}
}
}
9 changes: 8 additions & 1 deletion core/src/main/java/org/apache/iceberg/TrackedFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ interface TrackedFile {
"equality_ids",
Types.ListType.ofRequired(136, Types.IntegerType.get()),
"Field ids used to determine row equality in equality delete files");
Types.NestedField COLUMN_FILES =
Types.NestedField.optional(
158, "column_files", Types.ListType.ofRequired(159, ColumnFile.schema()), "Column files");

static Types.StructType schemaWithContentStats(
Types.StructType partitionType, Types.StructType contentStatsType) {
Expand All @@ -114,7 +117,8 @@ static Types.StructType schemaWithContentStats(
MANIFEST_INFO,
KEY_METADATA,
SPLIT_OFFSETS,
EQUALITY_IDS);
EQUALITY_IDS,
COLUMN_FILES);
}

/** Returns the tracking information for this entry. */
Expand Down Expand Up @@ -165,6 +169,9 @@ static Types.StructType schemaWithContentStats(
/** Returns the set of field IDs used for equality comparison in equality delete files. */
List<Integer> equalityIds();

/** Returns the column files for this file. */
List<ColumnFile> columnFiles();

/** Copies this tracked file. */
TrackedFile copy();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@ public DataFile copyWithoutStats() {
public DataFile copyWithStats(Set<Integer> requestedColumnIds) {
return new TrackedDataFile(file().copyWithStats(requestedColumnIds), spec());
}

@Override
public List<ColumnFile> columnFiles() {
return file().columnFiles();
}
}

/** Adapts a TrackedFile EQUALITY_DELETES entry to the {@link DeleteFile} interface. */
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/java/org/apache/iceberg/TrackedFileBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ private static TrackedFile terminal(TrackedFile source, Tracking tracking) {
source.manifestInfo(),
source.keyMetadata(),
source.splitOffsets(),
source.equalityIds());
source.equalityIds(),
null);
}

private TrackedFileBuilder(FileContent contentType, long snapshotId) {
Expand Down Expand Up @@ -356,6 +357,7 @@ TrackedFile build() {
manifestInfo,
keyMetadata,
splitOffsets,
equalityIds);
equalityIds,
null);
}
}
Loading
Loading