metadata.catalogs should only list loaded catalogs #26493
Merged
+114
−17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
homar
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
ed011c2 to
309b680
Compare
Member
Author
|
test failure is not related |
kokosing
approved these changes
Aug 27, 2025
| public static Catalog failedCatalog(CatalogName catalogName, CatalogHandle catalogHandle, ConnectorName connectorName) | ||
| { | ||
| return new Catalog(catalogName, catalogHandle, connectorName); | ||
| return new Catalog(catalogName, catalogHandle, connectorName, NOT_LOADED); |
Member
There was a problem hiding this comment.
LOAD_FAILED. NOT_LOADED sounds like NOT_YET_LOADED
| String sql = "SELECT DISTINCT connector_name FROM system.metadata.catalogs"; | ||
| List<String> loadedCatalogs = onTrino().executeQuery(sql).column(1).stream().map(Object::toString).collect(toImmutableList()); | ||
| assertThat(configuredConnectors).containsExactlyInAnyOrder(loadedCatalogs.toArray(new String[0])); | ||
| // for now loki connector is not properly loaded, when this is fixed this test will fail |
Member
There was a problem hiding this comment.
Please create a ticket or maybe let's remove loki from loading then. Is it used at all?
Nice, that you uncovered an issue.
homar
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
309b680 to
18ebd4e
Compare
wendigo
reviewed
Aug 28, 2025
| .map(QueryAssert.Row::row) | ||
| .collect(Collectors.toList())); | ||
| List<String> loadedCatalogs = onTrino().executeQuery(sql).column(1).stream().map(Object::toString).collect(toImmutableList()); | ||
| assertThat(configuredConnectors).containsExactlyInAnyOrder(loadedCatalogs.toArray(new String[0])); |
Contributor
There was a problem hiding this comment.
wrap containsExactlyInAnyOrder on the next line
testing/trino-product-tests/src/main/java/io/trino/tests/product/TestConfiguredFeatures.java
Outdated
Show resolved
Hide resolved
core/trino-main/src/main/java/io/trino/metadata/CatalogStatus.java
Outdated
Show resolved
Hide resolved
core/trino-main/src/main/java/io/trino/metadata/CatalogInfo.java
Outdated
Show resolved
Hide resolved
homar
force-pushed
the
homar/dont_show_failed_catalogs
branch
2 times, most recently
from
36730e2 to
84e9468
Compare
wendigo
approved these changes
Aug 28, 2025
core/trino-main/src/main/java/io/trino/metadata/CatalogStatus.java
Outdated
Show resolved
Hide resolved
homar
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
84e9468 to
95fb89a
Compare
| Session session = ((FullConnectorSession) connectorSession).getSession(); | ||
| Builder table = InMemoryRecordSet.builder(CATALOG_TABLE); | ||
| for (CatalogInfo catalogInfo : listCatalogs(session, metadata, accessControl)) { | ||
| List<CatalogInfo> catalogInfos = listCatalogs(session, metadata, accessControl).stream() |
Contributor
There was a problem hiding this comment.
Why not fix listCatalogs instead, what if other place use listCatalogs ?
Contributor
There was a problem hiding this comment.
I think that changing a listCatalogs semantics is pretty fragile. Filtering out on the call site is more explicit about intent
Member
Author
There was a problem hiding this comment.
I think that changing a listCatalogs semantics is pretty fragile. Filtering out on the call site is more explicit about intent
Exactly my way of thinking
Contributor
There was a problem hiding this comment.
Can you fix a javadoc for listCatalogs method?
Currently it is:
/**
* Gets all the loaded catalogs
*/
95fb89a to
1044da3
Compare
Member
Author
|
@wendigo can we merge this ? |
Contributor
|
@homar i'll do a final pass and merge it soon |
chenjian2664
approved these changes
Aug 30, 2025
wendigo
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
1044da3 to
5333a26
Compare
wendigo
approved these changes
Sep 1, 2025
wendigo
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
5333a26 to
c3131ce
Compare
homar
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
c3131ce to
1903eb5
Compare
wendigo
force-pushed
the
homar/dont_show_failed_catalogs
branch
from
1903eb5 to
bb19b90
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
metadata.catalogs should only list loaded catalogs
Additional context and related issues
Release notes
( ) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
(x) Release notes are required, with the following suggested text: