Skip to content

Add Iceberg properties in SHOW CREATE MATERIALIZED VIEW #12522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
findepi merged 2 commits into from
Jun 6, 2022
Merged

Add Iceberg properties in SHOW CREATE MATERIALIZED VIEW #12522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2cb348
Extract `getIcebergTableProperties` method in `IcebergUtil`
polaris6 May 28, 2022
8cca94b
Add Iceberg properties in `SHOW CREATE MATERIALIZED VIEW`
polaris6 May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,13 @@
import static io.trino.plugin.iceberg.IcebergSessionProperties.isStatisticsEnabled;
import static io.trino.plugin.iceberg.IcebergTableProperties.FILE_FORMAT_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.FORMAT_VERSION_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.LOCATION_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.ORC_BLOOM_FILTER_COLUMNS;
import static io.trino.plugin.iceberg.IcebergTableProperties.ORC_BLOOM_FILTER_FPP;
import static io.trino.plugin.iceberg.IcebergTableProperties.PARTITIONING_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.getPartitioning;
import static io.trino.plugin.iceberg.IcebergUtil.deserializePartitionValue;
import static io.trino.plugin.iceberg.IcebergUtil.getColumnHandle;
import static io.trino.plugin.iceberg.IcebergUtil.getColumns;
import static io.trino.plugin.iceberg.IcebergUtil.getFileFormat;
import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableProperties;
import static io.trino.plugin.iceberg.IcebergUtil.getPartitionKeys;
import static io.trino.plugin.iceberg.IcebergUtil.getTableComment;
import static io.trino.plugin.iceberg.IcebergUtil.newCreateTableTransaction;
Expand Down Expand Up @@ -1287,30 +1285,7 @@ private ConnectorTableMetadata getTableMetadata(ConnectorSession session, Schema
columns.addAll(getColumnMetadatas(icebergTable));
columns.add(pathColumnMetadata());

ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
properties.put(FILE_FORMAT_PROPERTY, getFileFormat(icebergTable));
if (!icebergTable.spec().fields().isEmpty()) {
properties.put(PARTITIONING_PROPERTY, toPartitionFields(icebergTable.spec()));
}

if (!icebergTable.location().isEmpty()) {
properties.put(LOCATION_PROPERTY, icebergTable.location());
}

int formatVersion = ((BaseTable) icebergTable).operations().current().formatVersion();
properties.put(FORMAT_VERSION_PROPERTY, formatVersion);

// iceberg ORC format bloom filter properties
String orcBloomFilterColumns = icebergTable.properties().get(ORC_BLOOM_FILTER_COLUMNS_KEY);
if (orcBloomFilterColumns != null) {
properties.put(ORC_BLOOM_FILTER_COLUMNS, Splitter.on(',').trimResults().omitEmptyStrings().splitToList(orcBloomFilterColumns));
}
String orcBloomFilterFpp = icebergTable.properties().get(ORC_BLOOM_FILTER_FPP_KEY);
if (orcBloomFilterFpp != null) {
properties.put(ORC_BLOOM_FILTER_FPP, Double.parseDouble(orcBloomFilterFpp));
}

return new ConnectorTableMetadata(table, columns.build(), properties.buildOrThrow(), getTableComment(icebergTable));
return new ConnectorTableMetadata(table, columns.build(), getIcebergTableProperties(icebergTable), getTableComment(icebergTable));
}

private List<ColumnMetadata> getColumnMetadatas(Table table)
Expand Down
35 changes: 35 additions & 0 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.trino.plugin.iceberg;

import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.airlift.slice.Slice;
Expand Down Expand Up @@ -77,12 +78,18 @@
import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_SNAPSHOT_ID;
import static io.trino.plugin.iceberg.IcebergMetadata.ORC_BLOOM_FILTER_COLUMNS_KEY;
import static io.trino.plugin.iceberg.IcebergMetadata.ORC_BLOOM_FILTER_FPP_KEY;
import static io.trino.plugin.iceberg.IcebergTableProperties.FILE_FORMAT_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.FORMAT_VERSION_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.LOCATION_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.ORC_BLOOM_FILTER_COLUMNS;
import static io.trino.plugin.iceberg.IcebergTableProperties.ORC_BLOOM_FILTER_FPP;
import static io.trino.plugin.iceberg.IcebergTableProperties.PARTITIONING_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.getOrcBloomFilterColumns;
import static io.trino.plugin.iceberg.IcebergTableProperties.getOrcBloomFilterFpp;
import static io.trino.plugin.iceberg.IcebergTableProperties.getPartitioning;
import static io.trino.plugin.iceberg.IcebergTableProperties.getTableLocation;
import static io.trino.plugin.iceberg.PartitionFields.parsePartitionFields;
import static io.trino.plugin.iceberg.PartitionFields.toPartitionFields;
import static io.trino.plugin.iceberg.TypeConverter.toIcebergType;
import static io.trino.plugin.iceberg.TypeConverter.toTrinoType;
import static io.trino.plugin.iceberg.util.Timestamps.timestampTzFromMicros;
Expand Down Expand Up @@ -162,6 +169,34 @@ public static Table getIcebergTableWithMetadata(
return new BaseTable(operations, quotedTableName(table));
}

public static Map<String, Object> getIcebergTableProperties(Table icebergTable)
{
ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
properties.put(FILE_FORMAT_PROPERTY, getFileFormat(icebergTable));
if (!icebergTable.spec().fields().isEmpty()) {
properties.put(PARTITIONING_PROPERTY, toPartitionFields(icebergTable.spec()));
}

if (!icebergTable.location().isEmpty()) {
properties.put(LOCATION_PROPERTY, icebergTable.location());
}

int formatVersion = ((BaseTable) icebergTable).operations().current().formatVersion();
properties.put(FORMAT_VERSION_PROPERTY, formatVersion);

// iceberg ORC format bloom filter properties
String orcBloomFilterColumns = icebergTable.properties().get(ORC_BLOOM_FILTER_COLUMNS_KEY);
if (orcBloomFilterColumns != null) {
properties.put(ORC_BLOOM_FILTER_COLUMNS, Splitter.on(',').trimResults().omitEmptyStrings().splitToList(orcBloomFilterColumns));
}
String orcBloomFilterFpp = icebergTable.properties().get(ORC_BLOOM_FILTER_FPP_KEY);
if (orcBloomFilterFpp != null) {
properties.put(ORC_BLOOM_FILTER_FPP, Double.parseDouble(orcBloomFilterFpp));
}

return properties.buildOrThrow();
}

public static long resolveSnapshotId(Table table, long snapshotId)
{
if (table.snapshot(snapshotId) != null) {
Expand Down
11 changes: 2 additions & 9 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR;
import static io.trino.plugin.iceberg.IcebergMaterializedViewDefinition.decodeMaterializedViewData;
import static io.trino.plugin.iceberg.IcebergTableProperties.FILE_FORMAT_PROPERTY;
import static io.trino.plugin.iceberg.IcebergTableProperties.PARTITIONING_PROPERTY;
import static io.trino.plugin.iceberg.PartitionFields.toPartitionFields;
import static io.trino.plugin.iceberg.IcebergUtil.getIcebergTableProperties;
import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -282,12 +281,6 @@ protected ConnectorMaterializedViewDefinition getMaterializedViewDefinition(
String viewOriginalText,
String storageTableName)
{
ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
properties.put(FILE_FORMAT_PROPERTY, IcebergUtil.getFileFormat(icebergTable));
if (!icebergTable.spec().fields().isEmpty()) {
properties.put(PARTITIONING_PROPERTY, toPartitionFields(icebergTable.spec()));
}

IcebergMaterializedViewDefinition definition = decodeMaterializedViewData(viewOriginalText);
return new ConnectorMaterializedViewDefinition(
definition.getOriginalSql(),
Expand All @@ -299,7 +292,7 @@ protected ConnectorMaterializedViewDefinition getMaterializedViewDefinition(
.collect(toImmutableList()),
definition.getComment(),
owner,
properties.buildOrThrow());
getIcebergTableProperties(icebergTable));
}

protected Map<String, String> createMaterializedViewProperties(ConnectorSession session, String storageTableName)
Expand Down
25 changes: 19 additions & 6 deletions .../trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.nio.file.Path;
import java.util.Optional;
import java.util.Set;

Expand Down Expand Up @@ -151,14 +152,23 @@ public void testCreateWithDuplicateSourceTableSucceeds()
public void testShowCreate()
{
assertUpdate("CREATE MATERIALIZED VIEW materialized_view_with_property " +
"WITH (partitioning = ARRAY['_date']) AS " +
"WITH (\n" +
" partitioning = ARRAY['_date'],\n" +
" orc_bloom_filter_columns = ARRAY['_date'],\n" +
" orc_bloom_filter_fpp = 0.1) AS " +
"SELECT _bigint, _date FROM base_table1");
assertQuery("SELECT COUNT(*) FROM materialized_view_with_property", "VALUES 6");
assertThat(computeActual("SHOW CREATE MATERIALIZED VIEW materialized_view_with_property").getOnlyValue())
.isEqualTo(
"CREATE MATERIALIZED VIEW iceberg." + getSchemaName() + ".materialized_view_with_property\n" +

Path schemaDirectory = getDistributedQueryRunner().getCoordinator().getBaseDataDir().resolve("iceberg_data/tpch");
assertThat((String) computeScalar("SHOW CREATE MATERIALIZED VIEW materialized_view_with_property"))
.matches(
"\\QCREATE MATERIALIZED VIEW iceberg." + getSchemaName() + ".materialized_view_with_property\n" +
"WITH (\n" +
" format = 'ORC',\n" +
" format_version = 2,\n" +
" location = '" + schemaDirectory + "/st_\\E[0-9a-f]+\\Q',\n" +
" orc_bloom_filter_columns = ARRAY['_date'],\n" +
" orc_bloom_filter_fpp = 1E-1,\n" +
" partitioning = ARRAY['_date']\n" +
") AS\n" +
"SELECT\n" +
Expand Down Expand Up @@ -425,10 +435,13 @@ public void testSqlFeatures()
assertQueryFails("show create view materialized_view_window",
"line 1:1: Relation '" + qualifiedMaterializedViewName + "' is a materialized view, not a view");

assertThat(computeScalar("show create materialized view materialized_view_window"))
.isEqualTo("CREATE MATERIALIZED VIEW " + qualifiedMaterializedViewName + "\n" +
Path schemaDirectory = getDistributedQueryRunner().getCoordinator().getBaseDataDir().resolve("iceberg_data/tpch");
assertThat((String) computeScalar("show create materialized view materialized_view_window"))
.matches("\\QCREATE MATERIALIZED VIEW " + qualifiedMaterializedViewName + "\n" +
"WITH (\n" +
" format = 'ORC',\n" +
" format_version = 2,\n" +
" location = '" + schemaDirectory + "/st_\\E[0-9a-f]+\\Q',\n" +
" partitioning = ARRAY['_date']\n" +
") AS\n" +
"SELECT\n" +
Expand Down