Skip to content

[fix](info_db) do not fetch external catalog's info in information_schema #25844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 2 commits into from
Oct 25, 2023
Merged

[fix](info_db) do not fetch external catalog's info in information_schema #25844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f72c45
1
morningman Oct 24, 2023
45b03a1
1
morningman Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,12 +378,23 @@ public TGetDbsResult getDbNames(TGetDbsParams params) throws TException {

Env env = Env.getCurrentEnv();
List<CatalogIf> catalogIfs = Lists.newArrayList();
if (Strings.isNullOrEmpty(params.catalog)) {
catalogIfs = env.getCatalogMgr().listCatalogs();
// If infodb_support_ext_catalog is true, we will list all catalogs or the specified catalog.
// Otherwise, we will only list internal catalog, or if the specified catalog is internal catalog.
if (Config.infodb_support_ext_catalog) {
if (Strings.isNullOrEmpty(params.catalog)) {
catalogIfs = env.getCatalogMgr().listCatalogs();
} else {
catalogIfs.add(env.getCatalogMgr()
.getCatalogOrException(params.catalog,
catalog -> new TException("Unknown catalog " + catalog)));
}
} else {
catalogIfs.add(env.getCatalogMgr()
.getCatalogOrException(params.catalog, catalog -> new TException("Unknown catalog " + catalog)));
if (Strings.isNullOrEmpty(params.catalog)
|| params.catalog.equalsIgnoreCase(InternalCatalog.INTERNAL_CATALOG_NAME)) {
catalogIfs.add(env.getInternalCatalog());
}
}

for (CatalogIf catalog : catalogIfs) {
Collection<DatabaseIf> dbs = new HashSet<DatabaseIf>();
try {
Expand Down Expand Up @@ -621,6 +632,11 @@ public TGetTablesResult getTableNames(TGetTablesParams params) throws TException
}
String catalogName = Strings.isNullOrEmpty(params.catalog) ? InternalCatalog.INTERNAL_CATALOG_NAME
: params.catalog;
if (!Config.infodb_support_ext_catalog
&& !catalogName.equalsIgnoreCase(InternalCatalog.INTERNAL_CATALOG_NAME)) {
throw new TException("Not support getting external catalog info when "
+ "infodb_support_ext_catalog is false");
}

DatabaseIf<TableIf> db = Env.getCurrentEnv().getCatalogMgr()
.getCatalogOrException(catalogName, catalog -> new TException("Unknown catalog " + catalog))
Expand Down Expand Up @@ -676,6 +692,12 @@ public TListTableStatusResult listTableStatus(TGetTablesParams params) throws TE
if (params.isSetCatalog()) {
catalogName = params.catalog;
}
if (!Config.infodb_support_ext_catalog
&& !catalogName.equalsIgnoreCase(InternalCatalog.INTERNAL_CATALOG_NAME)) {
throw new TException("Not support getting external catalog info when "
+ "infodb_support_ext_catalog is false");
}

CatalogIf catalog = Env.getCurrentEnv().getCatalogMgr().getCatalog(catalogName);
if (catalog != null) {
DatabaseIf db = catalog.getDbNullable(params.db);
Expand Down Expand Up @@ -731,7 +753,6 @@ public TListTableStatusResult listTableStatus(TGetTablesParams params) throws TE
}

public TListTableMetadataNameIdsResult listTableMetadataNameIds(TGetTablesParams params) throws TException {

LOG.debug("get list simple table request: {}", params);

TListTableMetadataNameIdsResult result = new TListTableMetadataNameIdsResult();
Expand Down Expand Up @@ -890,6 +911,11 @@ public TDescribeTableResult describeTable(TDescribeTableParams params) throws TE

String catalogName = Strings.isNullOrEmpty(params.catalog) ? InternalCatalog.INTERNAL_CATALOG_NAME
: params.catalog;
if (!Config.infodb_support_ext_catalog
&& !catalogName.equalsIgnoreCase(InternalCatalog.INTERNAL_CATALOG_NAME)) {
throw new TException("Not support getting external catalog info when "
+ "infodb_support_ext_catalog is false");
}
DatabaseIf<TableIf> db = Env.getCurrentEnv().getCatalogMgr()
.getCatalogOrException(catalogName, catalog -> new TException("Unknown catalog " + catalog))
.getDbNullable(params.db);
Expand Down Expand Up @@ -960,6 +986,11 @@ public TDescribeTablesResult describeTables(TDescribeTablesParams params) throws

String catalogName = Strings.isNullOrEmpty(params.catalog) ? InternalCatalog.INTERNAL_CATALOG_NAME
: params.catalog;
if (!Config.infodb_support_ext_catalog
&& !catalogName.equalsIgnoreCase(InternalCatalog.INTERNAL_CATALOG_NAME)) {
throw new TException("Not support getting external catalog info when "
+ "infodb_support_ext_catalog is false");
}
DatabaseIf<TableIf> db = Env.getCurrentEnv().getCatalogMgr()
.getCatalogOrException(catalogName, catalog -> new TException("Unknown catalog " + catalog))
.getDbNullable(params.db);
Expand Down
1 change: 1 addition & 0 deletions regression-test/pipeline/external/conf/fe.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,4 @@ dynamic_partition_check_interval_seconds=3
enable_feature_binlog=true

auth_token = 5ff161c3-2c08-4079-b108-26c8850b6598
infodb_support_ext_catalog=true