rdblue commented on a change in pull request #1587: URL: https://github.com/apache/iceberg/pull/1587#discussion_r511176255
########## File path: nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java ########## @@ -0,0 +1,333 @@ +/* + * 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.nessie; + +import com.dremio.nessie.api.TreeApi; +import com.dremio.nessie.client.NessieClient; +import com.dremio.nessie.error.NessieConflictException; +import com.dremio.nessie.error.NessieNotFoundException; +import com.dremio.nessie.model.Contents; +import com.dremio.nessie.model.ContentsKey; +import com.dremio.nessie.model.EntriesResponse; +import com.dremio.nessie.model.IcebergTable; +import com.dremio.nessie.model.ImmutableDelete; +import com.dremio.nessie.model.ImmutableMultiContents; +import com.dremio.nessie.model.ImmutablePut; +import com.dremio.nessie.model.MultiContents; +import com.dremio.nessie.model.Reference; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import org.apache.hadoop.conf.Configuration; +import org.apache.iceberg.BaseMetastoreCatalog; +import org.apache.iceberg.TableMetadata; +import org.apache.iceberg.TableOperations; +import org.apache.iceberg.catalog.Namespace; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.exceptions.AlreadyExistsException; +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.exceptions.NoSuchTableException; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; + +/** + * Nessie implementation of Iceberg Catalog. + */ +public class NessieCatalog extends BaseMetastoreCatalog implements AutoCloseable { + + private static final Joiner SLASH = Joiner.on("/"); + private static final String ICEBERG_HADOOP_WAREHOUSE_BASE = "iceberg/warehouse"; + private final NessieClient client; + private final String warehouseLocation; + private final Configuration config; + private final UpdateableReference reference; + private final String name; + + /** + * create a catalog from a hadoop configuration. + */ + public NessieCatalog(Configuration config) { + this("nessie", config); + } + + /** + * create a catalog from a hadoop configuration. + */ + public NessieCatalog(Configuration config, String ref) { + this("nessie", config, ref); + } + + /** + * Create a catalog with a known name from a hadoop configuration. + */ + public NessieCatalog(String name, Configuration config) { + this(name, config, null); + } + + /** + * Create a catalog with a known name from a hadoop configuration. + */ + public NessieCatalog(String name, Configuration config, String ref) { + this(name, config, ref, null); + } + + /** + * Create a catalog with a known name from a hadoop configuration. + */ + public NessieCatalog(String name, Configuration config, String ref, String url) { + this.config = config; + this.name = name; + + this.client = NessieClient.withConfig(s -> { + if (s.equals(NessieClient.CONF_NESSIE_URL)) { + return url == null ? config.get(s) : url; + } + return config.get(s); + }); + + warehouseLocation = getWarehouseLocation(); + + final String requestedRef = ref != null ? ref : config.get(NessieClient.CONF_NESSIE_REF); + this.reference = get(requestedRef); + } + + private String getWarehouseLocation() { + String nessieWarehouseDir = config.get("nessie.warehouse.dir"); + if (nessieWarehouseDir != null) { + return nessieWarehouseDir; + } + String hiveWarehouseDir = config.get("hive.metastore.warehouse.dir"); + if (hiveWarehouseDir != null) { + return hiveWarehouseDir; + } + String defaultFS = config.get("fs.defaultFS"); + if (defaultFS != null) { + return defaultFS + "/" + ICEBERG_HADOOP_WAREHOUSE_BASE; + } + throw new IllegalStateException("Don't know where to put the nessie iceberg data. " + + "Please set one of the following:\n" + + "nessie.warehouse.dir\n" + + "hive.metastore.warehouse.dir\n" + + "fs.defaultFS."); + } + + private UpdateableReference get(String requestedRef) { + try { + Reference ref = requestedRef == null ? client.getTreeApi().getDefaultBranch() + : client.getTreeApi().getReferenceByName(requestedRef); + return new UpdateableReference(ref, client.getTreeApi()); + } catch (NessieNotFoundException ex) { + if (requestedRef != null) { + throw new IllegalArgumentException(String.format("Nessie ref '%s' provided via %s does not exist. " + + "This ref must exist before creating a NessieCatalog.", requestedRef, NessieClient.CONF_NESSIE_REF), ex); + } + + throw new IllegalArgumentException(String.format("Nessie does not have an existing default branch." + + "Either configure an alternative ref via %s or create the default branch on the server.", + NessieClient.CONF_NESSIE_REF), ex); + } + } + + @Override + public void close() { + client.close(); + } + + @Override + public String name() { + return name; + } + + private static ContentsKey toKey(TableIdentifier tableIdentifier) { + List<String> identifiers = new ArrayList<>(); + if (tableIdentifier.hasNamespace()) { + identifiers.addAll(Arrays.asList(tableIdentifier.namespace().levels())); + } + identifiers.add(tableIdentifier.name()); + + ContentsKey key = new ContentsKey(identifiers); + return key; + } + + private IcebergTable table(TableIdentifier tableIdentifier) { + try { + Contents table = client.getContentsApi().getContents(toKey(tableIdentifier), reference.getHash()); + if (table instanceof IcebergTable) { + return (IcebergTable) table; + } + } catch (NessieNotFoundException e) { + // ignore + } + return null; + } + + + @Override + protected TableOperations newTableOps(TableIdentifier tableIdentifier) { + ParsedTableIdentifier pti = ParsedTableIdentifier.getParsedTableIdentifier(tableIdentifier, new HashMap<>()); + UpdateableReference newReference = this.reference; + if (pti.getReference() != null) { + newReference = get(pti.getReference()); + } + return new NessieTableOperations(config, + toKey(pti.getTableIdentifier()), + newReference, + client); + } + + @Override + protected String defaultWarehouseLocation(TableIdentifier table) { + if (table.hasNamespace()) { + return SLASH.join(warehouseLocation, table.namespace().toString(), table.name()); + } + return SLASH.join(warehouseLocation, table.name()); + } + + @Override + public List<TableIdentifier> listTables(Namespace namespace) { + try { + return client.getTreeApi() + .getEntries(reference.getHash()) + .getEntries() + .stream() + .filter(namespacePredicate(namespace)) + .map(NessieCatalog::toIdentifier) + .collect(Collectors.toList()); Review comment: Looks like this will return all tables underneath the given namespace, even if they are nested in other namespaces? I haven't tested this in spark, does it work as expected? ---------------------------------------------------------------- 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]
