difin commented on code in PR #6449:
URL: https://github.com/apache/hive/pull/6449#discussion_r3350565231
##########
iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/client/HiveRESTCatalogClient.java:
##########
@@ -178,38 +205,86 @@ public Database getDatabase(String catName, String
dbName) throws NoSuchObjectEx
@Override
public Table getTable(GetTableRequest tableRequest) throws TException {
validateCurrentCatalog(tableRequest.getCatName());
- org.apache.iceberg.Table icebergTable;
+ TableIdentifier id =
+ TableIdentifier.of(tableRequest.getDbName(),
tableRequest.getTblName());
try {
- icebergTable =
restCatalog.loadTable(TableIdentifier.of(tableRequest.getDbName(),
- tableRequest.getTblName()));
- } catch (NoSuchTableException exception) {
+ org.apache.iceberg.Table icebergTable = restCatalog.loadTable(id);
+ return MetastoreUtil.toHiveTable(icebergTable, conf);
+ } catch (NoSuchTableException tableMissing) {
+ if (restCatalog instanceof ViewCatalog viewCatalog) {
+ try {
+ View icebergView = viewCatalog.loadView(id);
+ return MetastoreUtil.toHiveView(icebergView, conf);
+ } catch (NoSuchViewException viewMissing) {
+ throw new NoSuchObjectException();
+ }
+ }
throw new NoSuchObjectException();
}
- return MetastoreUtil.toHiveTable(icebergTable, conf);
+ }
+
+ private static boolean hasIcebergNativeViewTableType(Table table) {
+ if (!TableType.VIRTUAL_VIEW.toString().equals(table.getTableType())) {
+ return false;
+ }
+ Map<String, String> params = table.getParameters();
+ if (params == null) {
+ return false;
+ }
+ return
IcebergNativeLogicalViewSupport.ICEBERG_VIEW_HMS_TABLE_TYPE_VALUE.equals(
+ params.get(BaseMetastoreTableOperations.TABLE_TYPE_PROP));
+ }
+
+ @Override
+ public void alter_table(String catName, String dbName, String tblName, Table
newTable,
+ EnvironmentContext envContext, String validWriteIdList) throws
TException {
+ validateCurrentCatalog(catName);
+ if (hasIcebergNativeViewTableType(newTable) && restCatalog instanceof
ViewCatalog) {
+ createOrReplaceLogicalView(newTable, dbName, tblName);
+ }
}
@Override
public void createTable(CreateTableRequest request) throws TException {
Table table = request.getTable();
+ if (hasIcebergNativeViewTableType(table) && restCatalog instanceof
ViewCatalog) {
+ createOrReplaceLogicalView(table, table.getDbName(),
table.getTableName());
+ } else {
+ List<FieldSchema> cols = Lists.newArrayList(table.getSd().getCols());
+ if (table.isSetPartitionKeys() && !table.getPartitionKeys().isEmpty()) {
+ cols.addAll(table.getPartitionKeys());
+ }
+ Properties tableProperties =
IcebergTableProperties.getTableProperties(table, conf);
+ Schema schema = HiveSchemaUtil.convert(cols, Collections.emptyMap(),
true);
+ Map<String, String> envCtxProps =
Optional.ofNullable(request.getEnvContext())
+ .map(EnvironmentContext::getProperties)
+ .orElse(Collections.emptyMap());
+ org.apache.iceberg.PartitionSpec partitionSpec =
+ HMSTablePropertyHelper.getPartitionSpec(envCtxProps, schema);
+ SortOrder sortOrder =
HMSTablePropertyHelper.getSortOrder(tableProperties, schema);
+
+ restCatalog.buildTable(TableIdentifier.of(table.getDbName(),
table.getTableName()), schema)
+ .withPartitionSpec(partitionSpec)
+
.withLocation(tableProperties.getProperty(IcebergTableProperties.LOCATION))
+ .withSortOrder(sortOrder)
+ .withProperties(Maps.fromProperties(tableProperties))
+ .create();
+ }
+ }
+
+ private void createOrReplaceLogicalView(Table table, String dbName, String
tableName) {
+
List<FieldSchema> cols = Lists.newArrayList(table.getSd().getCols());
if (table.isSetPartitionKeys() && !table.getPartitionKeys().isEmpty()) {
cols.addAll(table.getPartitionKeys());
}
- Properties tableProperties =
IcebergTableProperties.getTableProperties(table, conf);
- Schema schema = HiveSchemaUtil.convert(cols, Collections.emptyMap(), true);
- Map<String, String> envCtxProps =
Optional.ofNullable(request.getEnvContext())
- .map(EnvironmentContext::getProperties)
- .orElse(Collections.emptyMap());
- org.apache.iceberg.PartitionSpec partitionSpec =
- HMSTablePropertyHelper.getPartitionSpec(envCtxProps, schema);
- SortOrder sortOrder = HMSTablePropertyHelper.getSortOrder(tableProperties,
schema);
-
- restCatalog.buildTable(TableIdentifier.of(table.getDbName(),
table.getTableName()), schema)
- .withPartitionSpec(partitionSpec)
-
.withLocation(tableProperties.getProperty(IcebergTableProperties.LOCATION))
- .withSortOrder(sortOrder)
- .withProperties(Maps.fromProperties(tableProperties))
- .create();
+
+ Map<String, String> tblProps =
+ table.getParameters() == null ? Maps.newHashMap() :
Maps.newHashMap(table.getParameters());
+
+ String comment = tblProps.get("comment");
+ IcebergNativeLogicalViewSupport.createOrReplaceNativeView(
+ conf, dbName, tableName, cols, table.getViewExpandedText(), tblProps,
comment);
Review Comment:
I believe passing `table.getViewExpandedText()` is more correct because
SemanticAnalyzer uses expanded text when resolving views.
On the write view path, view text is stored in HMS mainly for passing it to
the `IcebergNativeLogicalViewSupport.createOrReplaceNativeView`, but on the
read path view text is alway retrieved from Iceberg API both both HMS and REST
paths in `BaseHiveIcebergMetaHook`:
```
@Override
public void postGetTable(org.apache.hadoop.hive.metastore.api.Table
hmsTable) {
if (hmsTable != null) {
try {
if (isNativeIcebergLogicalView(hmsTable)) {
IcebergNativeLogicalViewSupport.enrichHmsTableFromIcebergView(hmsTable, conf);
return;
}
```
--
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]
