Skip to content

Commit

Permalink
Merge branch 'master' into hotfix/bump-dependency-0905
Browse files Browse the repository at this point in the history
  • Loading branch information
zhoujinsong committed Sep 9, 2024
2 parents 1fa8ea7 + a1a1219 commit ff0ef02
Show file tree
Hide file tree
Showing 11 changed files with 292 additions and 498 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,8 @@ private InternalCatalog getCatalog(String catalog) {
internalCatalog instanceof InternalCatalog, "The catalog is not an iceberg rest catalog");
Set<TableFormat> tableFormats = CatalogUtil.tableFormats(internalCatalog.getMetadata());
Preconditions.checkArgument(
tableFormats.size() == 1
&& (tableFormats.contains(TableFormat.ICEBERG)
|| tableFormats.contains(TableFormat.MIXED_ICEBERG)),
tableFormats.contains(TableFormat.ICEBERG)
|| tableFormats.contains(TableFormat.MIXED_ICEBERG),
"The catalog is not an iceberg rest catalog");
return (InternalCatalog) internalCatalog;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ public static ServerCatalog buildServerCatalog(
formatSupportedMatrix.containsKey(type), "unsupported catalog type: %s", type);

Set<TableFormat> supportedFormats = formatSupportedMatrix.get(type);
TableFormat tableFormat = tableFormats.iterator().next();
Preconditions.checkState(
supportedFormats.contains(tableFormat),
supportedFormats.containsAll(tableFormats),
"Table format %s is not supported for metastore type: %s",
tableFormat,
tableFormats,
type);

switch (type) {
Expand All @@ -91,13 +90,7 @@ public static ServerCatalog buildServerCatalog(
catalogMeta.getCatalogProperties().put(CatalogMetaProperties.AMS_URI, amsUri);
return new ExternalCatalog(catalogMeta);
case CATALOG_TYPE_AMS:
if (tableFormat.equals(TableFormat.MIXED_ICEBERG)) {
return new InternalMixedCatalogImpl(catalogMeta, serverConfiguration);
} else if (tableFormat.equals(TableFormat.ICEBERG)) {
return new InternalIcebergCatalogImpl(catalogMeta, serverConfiguration);
} else {
throw new IllegalStateException("AMS catalog support iceberg/mixed-iceberg table only.");
}
return new InternalCatalogImpl(catalogMeta, serverConfiguration);
default:
throw new IllegalStateException("unsupported catalog type:" + type);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
/*
* 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.amoro.server.catalog;

import static org.apache.amoro.server.table.internal.InternalTableConstants.CHANGE_STORE_TABLE_NAME_SUFFIX;

import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalListener;
import org.apache.amoro.AmoroTable;
import org.apache.amoro.TableFormat;
import org.apache.amoro.api.CatalogMeta;
import org.apache.amoro.config.Configurations;
import org.apache.amoro.formats.iceberg.IcebergTable;
import org.apache.amoro.io.AuthenticatedFileIO;
import org.apache.amoro.mixed.InternalMixedIcebergCatalog;
import org.apache.amoro.server.AmoroManagementConf;
import org.apache.amoro.server.RestCatalogService;
import org.apache.amoro.server.exception.ObjectNotExistsException;
import org.apache.amoro.server.table.TableMetadata;
import org.apache.amoro.server.table.internal.InternalIcebergCreator;
import org.apache.amoro.server.table.internal.InternalIcebergHandler;
import org.apache.amoro.server.table.internal.InternalMixedIcebergCreator;
import org.apache.amoro.server.table.internal.InternalMixedIcebergHandler;
import org.apache.amoro.server.table.internal.InternalTableCreator;
import org.apache.amoro.server.table.internal.InternalTableHandler;
import org.apache.amoro.server.utils.InternalTableUtil;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
import org.apache.amoro.table.BasicKeyedTable;
import org.apache.amoro.table.BasicUnkeyedTable;
import org.apache.amoro.table.MixedTable;
import org.apache.amoro.table.PrimaryKeySpec;
import org.apache.amoro.utils.CatalogUtil;
import org.apache.iceberg.BaseTable;
import org.apache.iceberg.CatalogProperties;
import org.apache.iceberg.TableOperations;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.rest.RESTCatalog;
import org.apache.iceberg.rest.requests.CreateTableRequest;

public class InternalCatalogImpl extends InternalCatalog {

private static final String URI = "uri";

final int httpPort;
final String exposedHost;

final Cache<AmoroTable<?>, FileIO> fileIOCloser;

protected InternalCatalogImpl(CatalogMeta metadata, Configurations serverConfiguration) {
super(metadata);
this.httpPort = serverConfiguration.getInteger(AmoroManagementConf.HTTP_SERVER_PORT);
this.exposedHost = serverConfiguration.getString(AmoroManagementConf.SERVER_EXPOSE_HOST);
this.fileIOCloser = newFileIOCloser();
}

@Override
public CatalogMeta getMetadata() {
CatalogMeta meta = super.getMetadata();
if (!meta.getCatalogProperties().containsKey(URI)) {
meta.putToCatalogProperties(URI, defaultRestURI());
}
meta.putToCatalogProperties(CatalogProperties.CATALOG_IMPL, RESTCatalog.class.getName());
return meta.deepCopy();
}

@Override
public void updateMetadata(CatalogMeta metadata) {
String defaultUrl = defaultRestURI();
String uri = metadata.getCatalogProperties().getOrDefault(URI, defaultUrl);
if (defaultUrl.equals(uri)) {
metadata.getCatalogProperties().remove(URI);
}
super.updateMetadata(metadata);
}

@Override
public AmoroTable<?> loadTable(String database, String tableName) {
Preconditions.checkArgument(
!isChangeStoreName(tableName), "table name is invalid for load table");

InternalTableHandler<TableOperations> handler;
try {
handler = newTableHandler(database, tableName);
} catch (ObjectNotExistsException e) {
return null;
}
if (TableFormat.ICEBERG.equals(handler.tableMetadata().getFormat())) {
return loadIcebergTable(database, tableName, handler);
} else if (TableFormat.MIXED_ICEBERG.equals(handler.tableMetadata().getFormat())) {
return loadMixedIcebergTable(database, tableName, handler);
} else {
throw new IllegalArgumentException(
"Unsupported table format:" + handler.tableMetadata().getFormat());
}
}

private AmoroTable<?> loadIcebergTable(
String database, String tableName, InternalTableHandler<TableOperations> handler) {
TableMetadata tableMetadata = handler.tableMetadata();
TableOperations ops = handler.newTableOperator();

BaseTable table =
new BaseTable(
ops,
TableIdentifier.of(
tableMetadata.getTableIdentifier().getDatabase(),
tableMetadata.getTableIdentifier().getTableName())
.toString());
org.apache.amoro.table.TableIdentifier tableIdentifier =
org.apache.amoro.table.TableIdentifier.of(name(), database, tableName);
AmoroTable<?> amoroTable =
IcebergTable.newIcebergTable(
tableIdentifier,
table,
CatalogUtil.buildMetaStore(getMetadata()),
getMetadata().getCatalogProperties());
fileIOCloser.put(amoroTable, ops.io());
return amoroTable;
}

private AmoroTable<?> loadMixedIcebergTable(
String database, String tableName, InternalTableHandler<TableOperations> handler) {
TableMetadata tableMetadata = handler.tableMetadata();
org.apache.amoro.table.TableIdentifier tableIdentifier =
org.apache.amoro.table.TableIdentifier.of(name(), database, tableName);
AuthenticatedFileIO fileIO = InternalTableUtil.newIcebergFileIo(getMetadata());
MixedTable mixedIcebergTable;

BaseTable baseTable = loadTableStore(tableMetadata, false);
if (InternalTableUtil.isKeyedMixedTable(tableMetadata)) {
BaseTable changeTable = loadTableStore(tableMetadata, true);

PrimaryKeySpec.Builder keySpecBuilder = PrimaryKeySpec.builderFor(baseTable.schema());
tableMetadata.buildTableMeta().getKeySpec().getFields().forEach(keySpecBuilder::addColumn);
PrimaryKeySpec keySpec = keySpecBuilder.build();

mixedIcebergTable =
new BasicKeyedTable(
tableMetadata.getTableLocation(),
keySpec,
new BasicKeyedTable.BaseInternalTable(
tableIdentifier, baseTable, fileIO, getMetadata().getCatalogProperties()),
new BasicKeyedTable.ChangeInternalTable(
tableIdentifier, changeTable, fileIO, getMetadata().getCatalogProperties()));
} else {
mixedIcebergTable =
new BasicUnkeyedTable(
tableIdentifier, baseTable, fileIO, getMetadata().getCatalogProperties());
}
AmoroTable<?> amoroTable =
new org.apache.amoro.formats.mixed.MixedTable(mixedIcebergTable, TableFormat.MIXED_ICEBERG);
fileIOCloser.put(amoroTable, fileIO);
return amoroTable;
}

private BaseTable loadTableStore(TableMetadata tableMetadata, boolean isChangeStore) {
TableOperations ops = newTableStoreHandler(tableMetadata, isChangeStore).newTableOperator();
return new BaseTable(
ops,
TableIdentifier.of(
tableMetadata.getTableIdentifier().getDatabase(),
tableMetadata.getTableIdentifier().getTableName())
.toString());
}

private String defaultRestURI() {
return "http://" + exposedHost + ":" + httpPort + RestCatalogService.ICEBERG_REST_API_PREFIX;
}

@Override
public InternalTableCreator newTableCreator(
String database, String tableName, TableFormat format, CreateTableRequest creatorArguments) {
if (tableExists(database, tableName)) {
throw new AlreadyExistsException(
"Table " + name() + "." + database + "." + tableName + " already exists.");
}
if (TableFormat.ICEBERG.equals(format)) {
return new InternalIcebergCreator(getMetadata(), database, tableName, creatorArguments);
} else if (TableFormat.MIXED_ICEBERG.equals(format)) {
return new InternalMixedIcebergCreator(getMetadata(), database, tableName, creatorArguments);
} else {
throw new IllegalArgumentException("Unsupported table format:" + format);
}
}

@Override
@SuppressWarnings("unchecked")
public InternalTableHandler<TableOperations> newTableHandler(String database, String tableName) {
String realTableName = realTableName(tableName);
TableMetadata metadata = loadTableMetadata(database, realTableName);
if (TableFormat.ICEBERG.equals(metadata.getFormat())) {
return new InternalIcebergHandler(getMetadata(), metadata);
} else if (TableFormat.MIXED_ICEBERG.equals(metadata.getFormat())) {
boolean isChangeStore = isChangeStoreName(tableName);
return newTableStoreHandler(metadata, isChangeStore);
} else {
throw new IllegalArgumentException("Unsupported table format:" + metadata.getFormat());
}
}

private String realTableName(String tableStoreName) {
if (isChangeStoreName(tableStoreName)) {
return tableStoreName.substring(
0, tableStoreName.length() - CHANGE_STORE_TABLE_NAME_SUFFIX.length());
}
return tableStoreName;
}

private boolean isChangeStoreName(String tableName) {
String separator = InternalMixedIcebergCatalog.CHANGE_STORE_SEPARATOR;
if (!tableName.contains(separator)) {
return false;
}
Preconditions.checkArgument(
tableName.indexOf(separator) == tableName.lastIndexOf(separator)
&& tableName.endsWith(CHANGE_STORE_TABLE_NAME_SUFFIX),
"illegal table name: %s, %s is not allowed in table name.",
tableName,
separator);

return true;
}

private InternalTableHandler<TableOperations> newTableStoreHandler(
TableMetadata metadata, boolean isChangeStore) {
return new InternalMixedIcebergHandler(getMetadata(), metadata, isChangeStore);
}

private Cache<AmoroTable<?>, FileIO> newFileIOCloser() {
return Caffeine.newBuilder()
.weakKeys()
.removalListener(
(RemovalListener<AmoroTable<?>, FileIO>)
(tbl, fileIO, cause) -> {
if (null != fileIO) {
fileIO.close();
}
})
.build();
}
}
Loading

0 comments on commit ff0ef02

Please sign in to comment.