Skip to content

Commit ed51388

Browse files
committed
Add proper checks to handle cases where SchemaTablePrefix schemaName is null
1 parent 429c6a8 commit ed51388

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

presto-druid/src/main/java/com/facebook/presto/druid/DruidMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
192192
private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix)
193193
{
194194
if (prefix.getTableName() == null) {
195-
return listTables(session, Optional.of(prefix.getSchemaName()));
195+
return listTables(session, Optional.ofNullable(prefix.getSchemaName()));
196196
}
197197
return ImmutableList.of(prefix.toSchemaTableName());
198198
}

presto-google-sheets/src/main/java/com/facebook/presto/google/sheets/SheetsMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
159159
{
160160
requireNonNull(prefix, "prefix is null");
161161
ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
162-
for (SchemaTableName tableName : listTables(session, Optional.of(prefix.getSchemaName()))) {
162+
for (SchemaTableName tableName : listTables(session, Optional.ofNullable(prefix.getSchemaName()))) {
163163
Optional<ConnectorTableMetadata> tableMetadata = getTableMetadata(session, tableName);
164164
// table can disappear during listing operation
165165
if (tableMetadata.isPresent()) {

presto-hudi/src/main/java/com/facebook/presto/hudi/HudiMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
170170
@Override
171171
public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
172172
{
173-
List<SchemaTableName> tables = prefix.getTableName() != null ? singletonList(prefix.toSchemaTableName()) : listTables(session, Optional.of(prefix.getSchemaName()));
173+
List<SchemaTableName> tables = prefix.getTableName() != null ? singletonList(prefix.toSchemaTableName()) : listTables(session, Optional.ofNullable(prefix.getSchemaName()));
174174

175175
ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
176176
for (SchemaTableName table : tables) {

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ public Map<SchemaTableName, ConnectorViewDefinition> getViews(ConnectorSession s
472472
{
473473
ImmutableMap.Builder<SchemaTableName, ConnectorViewDefinition> views = ImmutableMap.builder();
474474
List<SchemaTableName> tableNames;
475-
if (prefix.getTableName() != null) {
475+
if (prefix.getSchemaName() != null && prefix.getTableName() != null) {
476476
tableNames = ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));
477477
}
478478
else {

presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergNativeMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ public Map<SchemaTableName, ConnectorViewDefinition> getViews(ConnectorSession s
270270
Catalog catalog = catalogFactory.getCatalog(session);
271271
if (catalog instanceof ViewCatalog) {
272272
List<SchemaTableName> tableNames;
273-
if (prefix.getTableName() != null) {
273+
if (prefix.getSchemaName() != null && prefix.getTableName() != null) {
274274
tableNames = ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));
275275
}
276276
else {
277-
tableNames = listViews(session, Optional.of(prefix.getSchemaName()));
277+
tableNames = listViews(session, Optional.ofNullable(prefix.getSchemaName()));
278278
}
279279

280280
for (SchemaTableName schemaTableName : tableNames) {

0 commit comments

Comments
 (0)