anuragmantri commented on a change in pull request #2658:
URL: https://github.com/apache/iceberg/pull/2658#discussion_r655886500
##########
File path: core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java
##########
@@ -126,10 +126,10 @@ public long targetSplitSize() {
@Override
public CloseableIterable<StructLike> rows() {
if (manifest.content() == ManifestContent.DATA) {
- return CloseableIterable.transform(ManifestFiles.read(manifest,
io).project(fileSchema).entries(),
+ return CloseableIterable.transform(ManifestFiles.read(manifest, io,
null, null).project(fileSchema).entries(),
Review comment:
Done
##########
File path: core/src/main/java/org/apache/iceberg/InheritableMetadataFactory.java
##########
@@ -46,18 +49,28 @@ static InheritableMetadata forCopy(long snapshotId) {
private final int specId;
private final long snapshotId;
private final long sequenceNumber;
+ private final String tableLocation;
+ private final Map<String, String> tableProperties;
- private BaseInheritableMetadata(int specId, long snapshotId, long
sequenceNumber) {
+ private BaseInheritableMetadata(int specId, long snapshotId, long
sequenceNumber, String tableLocation,
+ Map<String, String> tableProperties) {
this.specId = specId;
this.snapshotId = snapshotId;
this.sequenceNumber = sequenceNumber;
+ this.tableLocation = tableLocation;
+ this.tableProperties = tableProperties;
}
@Override
public <F extends ContentFile<F>> ManifestEntry<F> apply(ManifestEntry<F>
manifestEntry) {
if (manifestEntry.file() instanceof BaseFile) {
BaseFile<?> file = (BaseFile<?>) manifestEntry.file();
file.setSpecId(specId);
+ if (MetadataPaths.useRelativePath(tableProperties)) {
+ if (!file.path().toString().startsWith(tableLocation)) {
Review comment:
You are right. Pushed the logic into `toAbsolutePath()`.
##########
File path: core/src/main/java/org/apache/iceberg/MetadataPaths.java
##########
@@ -0,0 +1,80 @@
+/*
+ * 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.Map;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+
+/**
+ * Utility class that contains path conversion methods.
+ */
+public final class MetadataPaths {
Review comment:
Done
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
