Skip to content

Commit ca8c374

Browse files
tdcmeehantdcmeehan
committed
Add materialized views to information_schema
1 parent 42c6d5f commit ca8c374

File tree

14 files changed

+470
-15
lines changed

14 files changed

+470
-15
lines changed

‎presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,24 @@ public void createMaterializedView(
14941494
}
14951495
}
14961496

1497+
@Override
1498+
public List<SchemaTableName> listMaterializedViews(ConnectorSession session, String schemaName)
1499+
{
1500+
ImmutableList.Builder<SchemaTableName> materializedViews = ImmutableList.builder();
1501+
1502+
List<SchemaTableName> views = listViews(session, Optional.of(schemaName));
1503+
1504+
for (SchemaTableName viewName : views) {
1505+
View icebergView = getIcebergView(session, viewName);
1506+
Map<String, String> properties = icebergView.properties();
1507+
if (properties.containsKey(PRESTO_MATERIALIZED_VIEW_FORMAT_VERSION)) {
1508+
materializedViews.add(viewName);
1509+
}
1510+
}
1511+
1512+
return materializedViews.build();
1513+
}
1514+
14971515
@Override
14981516
public Optional<MaterializedViewDefinition> getMaterializedView(ConnectorSession session, SchemaTableName viewName)
14991517
{
@@ -1599,8 +1617,7 @@ public void dropMaterializedView(ConnectorSession session, SchemaTableName viewN
15991617
@Override
16001618
public MaterializedViewStatus getMaterializedViewStatus(
16011619
ConnectorSession session,
1602-
SchemaTableName materializedViewName,
1603-
TupleDomain<String> baseQueryDomain)
1620+
SchemaTableName materializedViewName)
16041621
{
16051622
Optional<MaterializedViewDefinition> definition = getMaterializedView(session, materializedViewName);
16061623
if (definition.isEmpty()) {

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergMaterializedViews.java‎

Lines changed: 115 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515

1616
import com.facebook.airlift.http.server.testing.TestingHttpServer;
1717
import com.facebook.presto.Session;
18+
import com.facebook.presto.testing.MaterializedResult;
1819
import com.facebook.presto.testing.QueryRunner;
1920
import com.facebook.presto.tests.AbstractTestQueryFramework;
2021
import com.google.common.collect.ImmutableMap;
2122
import org.assertj.core.util.Files;
23+
import org.intellij.lang.annotations.Language;
2224
import org.testng.annotations.AfterClass;
2325
import org.testng.annotations.BeforeClass;
2426
import org.testng.annotations.Test;
@@ -29,6 +31,7 @@
2931
import static com.facebook.presto.iceberg.CatalogType.REST;
3032
import static com.facebook.presto.iceberg.rest.IcebergRestTestUtil.getRestServer;
3133
import static com.facebook.presto.iceberg.rest.IcebergRestTestUtil.restConnectorProperties;
34+
import static com.facebook.presto.tests.QueryAssertions.assertEqualsIgnoreOrder;
3235
import static com.google.common.io.MoreFiles.deleteRecursively;
3336
import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
3437

@@ -188,8 +191,9 @@ public void testMaterializedViewMetadata()
188191

189192
assertUpdate("CREATE MATERIALIZED VIEW test_mv_metadata AS SELECT id, name FROM test_mv_metadata_base WHERE id > 0");
190193

191-
assertQueryReturnsEmptyResult("SELECT table_name FROM information_schema.tables " +
192-
"WHERE table_schema = 'test_schema' AND table_name = 'test_mv_metadata' AND table_type = 'MATERIALIZED VIEW'");
194+
assertQuery("SELECT table_name, table_type FROM information_schema.tables " +
195+
"WHERE table_schema = 'test_schema' AND table_name = 'test_mv_metadata'",
196+
"VALUES ('test_mv_metadata', 'MATERIALIZED VIEW')");
193197

194198
assertUpdate("DROP MATERIALIZED VIEW test_mv_metadata");
195199
assertUpdate("DROP TABLE test_mv_metadata_base");
@@ -1400,4 +1404,113 @@ public void testCreateMaterializedViewWithSameNameAsExistingTable()
14001404
assertUpdate("DROP TABLE existing_table_name");
14011405
assertUpdate("DROP TABLE test_mv_base");
14021406
}
1407+
1408+
@Test
1409+
public void testInformationSchemaMaterializedViews()
1410+
{
1411+
assertUpdate("CREATE TABLE test_is_mv_base1 (id BIGINT, name VARCHAR, value BIGINT)");
1412+
assertUpdate("CREATE TABLE test_is_mv_base2 (category VARCHAR, amount BIGINT)");
1413+
1414+
assertUpdate("INSERT INTO test_is_mv_base1 VALUES (1, 'Alice', 100), (2, 'Bob', 200)", 2);
1415+
assertUpdate("INSERT INTO test_is_mv_base2 VALUES ('A', 50), ('B', 75)", 2);
1416+
1417+
assertUpdate("CREATE MATERIALIZED VIEW test_is_mv1 AS SELECT id, name, value FROM test_is_mv_base1 WHERE id > 0");
1418+
assertUpdate("CREATE MATERIALIZED VIEW test_is_mv2 AS SELECT category, SUM(amount) as total FROM test_is_mv_base2 GROUP BY category");
1419+
1420+
assertQuery(
1421+
"SELECT table_name FROM information_schema.materialized_views " +
1422+
"WHERE table_schema = 'test_schema' AND table_name IN ('test_is_mv1', 'test_is_mv2') " +
1423+
"ORDER BY table_name",
1424+
"VALUES ('test_is_mv1'), ('test_is_mv2')");
1425+
1426+
assertQuery(
1427+
"SELECT table_catalog, table_schema, table_name, storage_schema, storage_table_name, base_tables " +
1428+
"FROM information_schema.materialized_views " +
1429+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv1'",
1430+
"SELECT 'iceberg', 'test_schema', 'test_is_mv1', 'test_schema', '__mv_storage__test_is_mv1', 'test_schema.test_is_mv_base1'");
1431+
1432+
assertQuery(
1433+
"SELECT COUNT(*) FROM information_schema.materialized_views " +
1434+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv1' " +
1435+
"AND view_definition IS NOT NULL AND length(view_definition) > 0",
1436+
"SELECT 1");
1437+
1438+
assertQuery(
1439+
"SELECT table_name FROM information_schema.materialized_views " +
1440+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv2'",
1441+
"VALUES ('test_is_mv2')");
1442+
1443+
assertQuery(
1444+
"SELECT COUNT(*) FROM information_schema.materialized_views " +
1445+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv1' " +
1446+
"AND view_owner IS NOT NULL",
1447+
"SELECT 1");
1448+
1449+
assertQuery(
1450+
"SELECT COUNT(*) FROM information_schema.materialized_views " +
1451+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv1' " +
1452+
"AND view_security IS NOT NULL",
1453+
"SELECT 1");
1454+
1455+
assertQuery(
1456+
"SELECT base_tables FROM information_schema.materialized_views " +
1457+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv2'",
1458+
"VALUES ('test_schema.test_is_mv_base2')");
1459+
1460+
assertUpdate("DROP MATERIALIZED VIEW test_is_mv1");
1461+
assertUpdate("DROP MATERIALIZED VIEW test_is_mv2");
1462+
assertUpdate("DROP TABLE test_is_mv_base1");
1463+
assertUpdate("DROP TABLE test_is_mv_base2");
1464+
}
1465+
1466+
@Test
1467+
public void testInformationSchemaMaterializedViewsAfterRefresh()
1468+
{
1469+
assertUpdate("CREATE TABLE test_is_mv_refresh_base (id BIGINT, value BIGINT)");
1470+
assertUpdate("INSERT INTO test_is_mv_refresh_base VALUES (1, 100), (2, 200)", 2);
1471+
assertUpdate("CREATE MATERIALIZED VIEW test_is_mv_refresh AS SELECT id, value FROM test_is_mv_refresh_base");
1472+
1473+
assertQuery(
1474+
"SELECT freshness_state FROM information_schema.materialized_views " +
1475+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1476+
"SELECT 'NOT_MATERIALIZED'");
1477+
1478+
assertUpdate("REFRESH MATERIALIZED VIEW test_is_mv_refresh", 2);
1479+
1480+
assertQuery(
1481+
"SELECT freshness_state FROM information_schema.materialized_views " +
1482+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1483+
"SELECT 'FULLY_MATERIALIZED'");
1484+
1485+
assertUpdate("INSERT INTO test_is_mv_refresh_base VALUES (3, 300)", 1);
1486+
1487+
assertQuery(
1488+
"SELECT freshness_state FROM information_schema.materialized_views " +
1489+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1490+
"SELECT 'PARTIALLY_MATERIALIZED'");
1491+
1492+
assertUpdate("UPDATE test_is_mv_refresh_base SET value = 250 WHERE id = 2", 1);
1493+
1494+
assertQuery(
1495+
"SELECT freshness_state FROM information_schema.materialized_views " +
1496+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1497+
"SELECT 'PARTIALLY_MATERIALIZED'");
1498+
1499+
assertUpdate("DELETE FROM test_is_mv_refresh_base WHERE id = 1", 1);
1500+
1501+
assertQuery(
1502+
"SELECT freshness_state FROM information_schema.materialized_views " +
1503+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1504+
"SELECT 'PARTIALLY_MATERIALIZED'");
1505+
1506+
assertUpdate("REFRESH MATERIALIZED VIEW test_is_mv_refresh", 2);
1507+
1508+
assertQuery(
1509+
"SELECT freshness_state FROM information_schema.materialized_views " +
1510+
"WHERE table_schema = 'test_schema' AND table_name = 'test_is_mv_refresh'",
1511+
"SELECT 'FULLY_MATERIALIZED'");
1512+
1513+
assertUpdate("DROP MATERIALIZED VIEW test_is_mv_refresh");
1514+
assertUpdate("DROP TABLE test_is_mv_refresh_base");
1515+
}
14031516
}

‎presto-main-base/src/main/java/com/facebook/presto/connector/informationSchema/InformationSchemaMetadata.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class InformationSchemaMetadata
7474
public static final SchemaTableName TABLE_COLUMNS = new SchemaTableName(INFORMATION_SCHEMA, "columns");
7575
public static final SchemaTableName TABLE_TABLES = new SchemaTableName(INFORMATION_SCHEMA, "tables");
7676
public static final SchemaTableName TABLE_VIEWS = new SchemaTableName(INFORMATION_SCHEMA, "views");
77+
public static final SchemaTableName TABLE_MATERIALIZED_VIEWS = new SchemaTableName(INFORMATION_SCHEMA, "materialized_views");
7778
public static final SchemaTableName TABLE_SCHEMATA = new SchemaTableName(INFORMATION_SCHEMA, "schemata");
7879
public static final SchemaTableName TABLE_TABLE_PRIVILEGES = new SchemaTableName(INFORMATION_SCHEMA, "table_privileges");
7980
public static final SchemaTableName TABLE_ROLES = new SchemaTableName(INFORMATION_SCHEMA, "roles");
@@ -109,6 +110,18 @@ public class InformationSchemaMetadata
109110
.column("view_owner", createUnboundedVarcharType())
110111
.column("view_definition", createUnboundedVarcharType())
111112
.build())
113+
.table(tableMetadataBuilder(TABLE_MATERIALIZED_VIEWS)
114+
.column("table_catalog", createUnboundedVarcharType())
115+
.column("table_schema", createUnboundedVarcharType())
116+
.column("table_name", createUnboundedVarcharType())
117+
.column("view_definition", createUnboundedVarcharType())
118+
.column("view_owner", createUnboundedVarcharType())
119+
.column("view_security", createUnboundedVarcharType())
120+
.column("storage_schema", createUnboundedVarcharType())
121+
.column("storage_table_name", createUnboundedVarcharType())
122+
.column("base_tables", createUnboundedVarcharType())
123+
.column("freshness_state", createUnboundedVarcharType())
124+
.build())
112125
.table(tableMetadataBuilder(TABLE_SCHEMATA)
113126
.column("catalog_name", createUnboundedVarcharType())
114127
.column("schema_name", createUnboundedVarcharType())
@@ -258,7 +271,7 @@ public ConnectorTableLayoutResult getTableLayoutForConstraint(ConnectorSession s
258271

259272
private boolean isTablesEnumeratingTable(SchemaTableName schemaTableName)
260273
{
261-
return ImmutableSet.of(TABLE_COLUMNS, TABLE_VIEWS, TABLE_TABLES, TABLE_TABLE_PRIVILEGES).contains(schemaTableName);
274+
return ImmutableSet.of(TABLE_COLUMNS, TABLE_VIEWS, TABLE_MATERIALIZED_VIEWS, TABLE_TABLES, TABLE_TABLE_PRIVILEGES).contains(schemaTableName);
262275
}
263276

264277
private Set<QualifiedTablePrefix> calculatePrefixesWithSchemaName(
@@ -303,9 +316,11 @@ public Set<QualifiedTablePrefix> calculatePrefixesWithTableName(
303316
}
304317

305318
return prefixes.stream()
306-
.flatMap(prefix -> Stream.concat(
319+
.flatMap(prefix -> Stream.of(
307320
metadata.listTables(session, prefix).stream(),
308-
metadata.listViews(session, prefix).stream()))
321+
metadata.listViews(session, prefix).stream(),
322+
metadata.listMaterializedViews(session, prefix).stream())
323+
.flatMap(stream -> stream))
309324
.filter(objectName -> !predicate.isPresent() || predicate.get().test(asFixedValues(objectName)))
310325
.map(value -> toQualifiedTablePrefix(new QualifiedObjectName(
311326
value.getCatalogName(),

‎presto-main-base/src/main/java/com/facebook/presto/connector/informationSchema/InformationSchemaPageSourceProvider.java‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import com.facebook.presto.spi.ConnectorSession;
3232
import com.facebook.presto.spi.ConnectorSplit;
3333
import com.facebook.presto.spi.FixedPageSource;
34+
import com.facebook.presto.spi.MaterializedViewDefinition;
35+
import com.facebook.presto.spi.MaterializedViewStatus;
3436
import com.facebook.presto.spi.SchemaTableName;
3537
import com.facebook.presto.spi.SplitContext;
3638
import com.facebook.presto.spi.analyzer.ViewDefinition;
@@ -57,13 +59,15 @@
5759
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_APPLICABLE_ROLES;
5860
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_COLUMNS;
5961
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_ENABLED_ROLES;
62+
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_MATERIALIZED_VIEWS;
6063
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_ROLES;
6164
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_SCHEMATA;
6265
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_TABLES;
6366
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_TABLE_PRIVILEGES;
6467
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.TABLE_VIEWS;
6568
import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.informationSchemaTableColumns;
6669
import static com.facebook.presto.connector.system.jdbc.ColumnJdbcTable.decimalDigits;
70+
import static com.facebook.presto.metadata.MetadataListing.listMaterializedViews;
6771
import static com.facebook.presto.metadata.MetadataListing.listSchemas;
6872
import static com.facebook.presto.metadata.MetadataListing.listTableColumns;
6973
import static com.facebook.presto.metadata.MetadataListing.listTablePrivileges;
@@ -138,6 +142,9 @@ public InternalTable getInformationSchemaTable(Session session, String catalog,
138142
if (table.equals(TABLE_VIEWS)) {
139143
return buildViews(session, prefixes);
140144
}
145+
if (table.equals(TABLE_MATERIALIZED_VIEWS)) {
146+
return buildMaterializedViews(session, prefixes);
147+
}
141148
if (table.equals(TABLE_SCHEMATA)) {
142149
return buildSchemata(session, catalog);
143150
}
@@ -195,10 +202,19 @@ private InternalTable buildTables(Session session, Set<QualifiedTablePrefix> pre
195202
for (QualifiedTablePrefix prefix : prefixes) {
196203
Set<SchemaTableName> tables = listTables(session, metadata, accessControl, prefix);
197204
Set<SchemaTableName> views = listViews(session, metadata, accessControl, prefix);
205+
Set<SchemaTableName> materializedViews = listMaterializedViews(session, metadata, accessControl, prefix);
198206

199-
for (SchemaTableName name : union(tables, views)) {
200-
// if table and view names overlap, the view wins
201-
String type = views.contains(name) ? "VIEW" : "BASE TABLE";
207+
for (SchemaTableName name : union(union(tables, views), materializedViews)) {
208+
String type;
209+
if (materializedViews.contains(name)) {
210+
type = "MATERIALIZED VIEW";
211+
}
212+
else if (views.contains(name)) {
213+
type = "VIEW";
214+
}
215+
else {
216+
type = "BASE TABLE";
217+
}
202218
table.add(
203219
prefix.getCatalogName(),
204220
name.getSchemaName(),
@@ -247,6 +263,39 @@ private InternalTable buildViews(Session session, Set<QualifiedTablePrefix> pref
247263
return table.build();
248264
}
249265

266+
private InternalTable buildMaterializedViews(Session session, Set<QualifiedTablePrefix> prefixes)
267+
{
268+
InternalTable.Builder table = InternalTable.builder(informationSchemaTableColumns(TABLE_MATERIALIZED_VIEWS));
269+
270+
for (QualifiedTablePrefix prefix : prefixes) {
271+
for (Entry<QualifiedObjectName, MaterializedViewDefinition> entry : metadata.getMaterializedViews(session, prefix).entrySet()) {
272+
QualifiedObjectName viewName = entry.getKey();
273+
MaterializedViewDefinition definition = entry.getValue();
274+
275+
String baseTablesStr = definition.getBaseTables().stream()
276+
.map(baseTable -> baseTable.getSchemaName() + "." + baseTable.getTableName())
277+
.collect(java.util.stream.Collectors.joining(", "));
278+
279+
MaterializedViewStatus status = metadata.getMaterializedViewStatus(session, viewName);
280+
String freshnessState = status.getMaterializedViewState().name();
281+
282+
table.add(
283+
viewName.getCatalogName(),
284+
viewName.getSchemaName(),
285+
viewName.getObjectName(),
286+
definition.getOriginalSql(),
287+
definition.getOwner().orElse(null),
288+
definition.getSecurityMode().map(Object::toString).orElse(null),
289+
definition.getSchema(),
290+
definition.getTable(),
291+
baseTablesStr,
292+
freshnessState);
293+
}
294+
}
295+
296+
return table.build();
297+
}
298+
250299
private InternalTable buildSchemata(Session session, String catalogName)
251300
{
252301
InternalTable.Builder table = InternalTable.builder(informationSchemaTableColumns(TABLE_SCHEMATA));

‎presto-main-base/src/main/java/com/facebook/presto/connector/system/jdbc/TableJdbcTable.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import static com.facebook.presto.connector.system.jdbc.FilterUtil.stringFilter;
3838
import static com.facebook.presto.connector.system.jdbc.FilterUtil.tablePrefix;
3939
import static com.facebook.presto.metadata.MetadataListing.listCatalogs;
40+
import static com.facebook.presto.metadata.MetadataListing.listMaterializedViews;
4041
import static com.facebook.presto.metadata.MetadataListing.listTables;
4142
import static com.facebook.presto.metadata.MetadataListing.listViews;
4243
import static com.facebook.presto.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
@@ -97,9 +98,17 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
9798
}
9899
}
99100

101+
Set<SchemaTableName> materializedViews = ImmutableSet.of();
102+
if (FilterUtil.emptyOrEquals(typeFilter, "MATERIALIZED VIEW")) {
103+
materializedViews = ImmutableSet.copyOf(listMaterializedViews(session, metadata, accessControl, prefix));
104+
for (SchemaTableName name : materializedViews) {
105+
table.addRow(tableRow(catalog, name, "MATERIALIZED VIEW"));
106+
}
107+
}
108+
100109
if (FilterUtil.emptyOrEquals(typeFilter, "TABLE")) {
101110
for (SchemaTableName name : listTables(session, metadata, accessControl, prefix)) {
102-
if (!views.contains(name)) {
111+
if (!views.contains(name) && !materializedViews.contains(name)) {
103112
table.addRow(tableRow(catalog, name, "TABLE"));
104113
}
105114
}

0 commit comments

Comments
 (0)