Fix param name in MockConnector listTables lambdas

`listTables` is never called with a null schema name.
trinodb · Nov 22, 2022 · b362da8 · b362da8
1 parent 99ba500
commit b362da8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java b/core/trino-main/src/test/java/io/trino/metadata/TestInformationSchemaMetadata.java
@@ -63,7 +63,7 @@ public TestInformationSchemaMetadata()
         LocalQueryRunner queryRunner = LocalQueryRunner.create(TEST_SESSION);
         MockConnectorFactory mockConnectorFactory = MockConnectorFactory.builder()
                 .withListSchemaNames(connectorSession -> ImmutableList.of("test_schema"))
-                .withListTables((connectorSession, schemaNameOrNull) ->
+                .withListTables((connectorSession, schemaName) ->
                         ImmutableList.of(
                                 new SchemaTableName("test_schema", "test_view"),
                                 new SchemaTableName("test_schema", "another_table")))

diff --git a/...-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java b/...-tests/src/test/java/io/trino/connector/informationschema/BenchmarkInformationSchema.java
@@ -98,20 +98,12 @@ public Iterable<ConnectorFactory> getConnectorFactories()
                             .map(i -> "stream_" + i)
                             .collect(toImmutableList());
 
-                    BiFunction<ConnectorSession, String, List<SchemaTableName>> listTables = (session, schemaNameOrNull) -> {
+                    BiFunction<ConnectorSession, String, List<SchemaTableName>> listTables = (session, schemaName) -> {
                         List<String> tables = IntStream.range(0, Integer.parseInt(tablesCount))
                                 .boxed()
                                 .map(i -> "table_" + i)
                                 .collect(toImmutableList());
-                        List<String> schemas;
-                        if (schemaNameOrNull == null) {
-                            schemas = listSchemaNames.apply(session);
-                        }
-                        else {
-                            schemas = ImmutableList.of(schemaNameOrNull);
-                        }
-                        return schemas.stream()
-                                .flatMap(schema -> tables.stream().map(table -> new SchemaTableName(schema, table)))
+                        return tables.stream().map(table -> new SchemaTableName(schemaName, table))
                                 .collect(toImmutableList());
                     };
 

diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java b/testing/trino-tests/src/test/java/io/trino/tests/TestMetadataManager.java
@@ -80,7 +80,7 @@ public Iterable<ConnectorFactory> getConnectorFactories()
 
                             return new MockConnectorTableHandle(schemaTableName);
                         })
-                        .withListTables((session, schemaNameOrNull) ->
+                        .withListTables((session, schemaName) ->
                                 ImmutableList.of(new SchemaTableName("UPPER_CASE_SCHEMA", "UPPER_CASE_TABLE")))
                         .withGetViews((session, prefix) -> ImmutableMap.of(viewTableName, getConnectorViewDefinition()))
                         .build();