gaborkaszab commented on code in PR #16285:
URL: https://github.com/apache/iceberg/pull/16285#discussion_r3440830174
##########
core/src/main/java/org/apache/iceberg/TrackedFileStruct.java:
##########
@@ -160,6 +164,10 @@ private TrackedFileStruct(TrackedFileStruct toCopy,
boolean withStats, Set<Integ
toCopy.equalityIds != null
? Arrays.copyOf(toCopy.equalityIds, toCopy.equalityIds.length)
: null;
+ this.columnFiles =
+ toCopy.columnFiles != null
+ ?
toCopy.columnFiles.stream().map(ColumnFile::copy).collect(Collectors.toList())
Review Comment:
You mean `columnFiles` might contain a null value? Currently, you can pass
whatever content for `columnFiles` through the constructor, you now technically
there can be null too. In the long run the expectation is to build this class
through its builder ([PR](https://github.com/apache/iceberg/pull/16769)) where
we can prevent adding null to the list.
I'm not concerned about this, WDYT?
##########
core/src/main/java/org/apache/iceberg/TrackedFileStruct.java:
##########
@@ -160,6 +164,10 @@ private TrackedFileStruct(TrackedFileStruct toCopy,
boolean withStats, Set<Integ
toCopy.equalityIds != null
? Arrays.copyOf(toCopy.equalityIds, toCopy.equalityIds.length)
: null;
+ this.columnFiles =
+ toCopy.columnFiles != null
+ ?
toCopy.columnFiles.stream().map(ColumnFile::copy).collect(Collectors.toList())
Review Comment:
I implemented a null-safe version of the copy and added test coverage, just
to be on the safe side. Let me know what you think.
##########
core/src/main/java/org/apache/iceberg/ColumnFileStruct.java:
##########
@@ -0,0 +1,171 @@
+/*
+ * 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.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);
+ }
+
+ private ColumnFileStruct(int[] fieldIds, String location, long
fileSizeInBytes) {
+ super(BASE_TYPE.fields().size());
+ this.fieldIds = 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)
Review Comment:
This does print the values in the list. Just checked the output:
`ColumnFileStruct{field_ids=[1, 2, 3],
location=s3://bucket/data/column.parquet, file_size_in_bytes=1024}`
I was hesitating to add test coverage for this, but I haven't seen anywhere
else testing the output of a toSting function.
##########
core/src/main/java/org/apache/iceberg/TrackingBuilder.java:
##########
@@ -111,10 +115,27 @@ TrackingBuilder dvUpdated() {
return this;
}
+ /** Indicates that the column files list has been updated for the new
Tracking. */
+ TrackingBuilder columnFilesUpdated() {
+ Preconditions.checkState(
+ deletedPositions == null && replacedPositions == null,
+ "Cannot mark column files updated on a manifest entry
(deleted/replaced positions are set)");
+ this.latestColumnFileSnapshotId = newSnapshotId;
+ if (status == EntryStatus.EXISTING) {
Review Comment:
This method is inline with the similar dvUpdated. Since DELETED and REPLACED
aren't constructed through the builder, guarding against those statuses would
be just noise here IMO
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
