anuragmantri commented on a change in pull request #2658:
URL: https://github.com/apache/iceberg/pull/2658#discussion_r655886250
##########
File path: core/src/main/java/org/apache/iceberg/DataTableScan.java
##########
@@ -71,7 +71,8 @@ protected TableScan newRefinedScan(TableOperations ops, Table
table, Schema sche
public CloseableIterable<FileScanTask> planFiles(TableOperations ops,
Snapshot snapshot,
Expression rowFilter,
boolean ignoreResiduals,
boolean caseSensitive,
boolean colStats) {
- ManifestGroup manifestGroup = new ManifestGroup(ops.io(),
snapshot.dataManifests(), snapshot.deleteManifests())
+ ManifestGroup manifestGroup = new ManifestGroup(ops.io(),
snapshot.dataManifests(), snapshot.deleteManifests(),
+ ops.current().location(), ops.current().properties())
Review comment:
Instead of pushing `properties` around, I introduced a flag
`shouldUseRelativePaths`.
##########
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
##########
File path:
spark2/src/test/java/org/apache/iceberg/examples/RelativePathHiveFunctionalityTest.java
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.examples;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.hive.HiveMetastoreTest;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.types.Types;
+import org.apache.spark.SparkConf;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+import org.apache.spark.sql.SparkSession;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.iceberg.types.Types.NestedField.optional;
+
+public class RelativePathHiveFunctionalityTest extends HiveMetastoreTest {
Review comment:
You are right. Renamed the class.
##########
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 {
+
+ private MetadataPaths() {
+ }
+
+ /**
+ * Convert a given relative path to absolute path for the table by appending
the base table location
+ * @param path relative path to be converted
+ * @param tableLocation base table location
+ * @param properties table properties
+ * @return the absolute path
+ */
+ public static String toAbsolutePath(String path, String tableLocation,
Map<String, String> properties) {
+ Preconditions.checkArgument(path != null && path.trim().length() > 0);
+ // TODO: Fix this after tests are changed to always pass the table
location. Table location cannot be null.
+ if (tableLocation == null) {
+ return path;
+ }
+ // convert to absolute path by appending the table location
+ return useRelativePath(properties) && !path.startsWith(tableLocation) ?
tableLocation + "/" + path : path;
Review comment:
IIUC, the `LocationProvider` class is for data files and is used to
provide locations to write the files. In this PR, we do not wish to change
where data files and/or manifest files are written. We just want to change the
references to any paths inside `metadata` files to relative paths. This way, if
a table is relocated/moved, we don't have to change a bunch of metadata files.
--
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]
