xtern commented on code in PR #6011:
URL: https://github.com/apache/ignite-3/pull/6011#discussion_r2140145745


##########
modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/jdbc/JdbcMetadataCatalog.java:
##########
@@ -133,21 +147,22 @@ public CompletableFuture<List<JdbcTableMeta>> 
getTablesMeta(String schemaNamePtr
         String schemaNameRegex = translateSqlWildcardsToRegex(schemaNamePtrn);
         String tlbNameRegex = translateSqlWildcardsToRegex(tblNamePtrn);
 
-        return tablesAtNow().thenApply(tables -> {
-            return tables.stream()
-                    .filter(t -> tableNameAndSchemaMatches(t, schemaNameRegex, 
tlbNameRegex))
-                    .sorted(byTblTypeThenSchemaThenTblName)
-                    .map(t -> new JdbcTableMeta(SqlCommon.DEFAULT_SCHEMA_NAME, 
t.name(), TBL_TYPE))
-                    .collect(toList());
-        });
-    }
-
-    private static boolean tableNameAndSchemaMatches(
-            CatalogTableDescriptor table,
-            @Nullable String schemaNameRegex,
-            @Nullable String tlbNameRegex
-    ) {
-        return matches(SqlCommon.DEFAULT_SCHEMA_NAME, schemaNameRegex) && 
matches(table.name(), tlbNameRegex);
+        return schemasAtNow().thenApply(schemas ->
+                schemas.stream()
+                        .filter(schema -> matches(schema.name(), 
schemaNameRegex))
+                        .flatMap(schema ->
+                                Stream.concat(
+                                        Arrays.stream(schema.systemViews())

Review Comment:
   Missed this.
   Thanks fixed.



-- 
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: notifications-unsubscr...@ignite.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to