Skip to content

Use identifier value schema name for ShowLogicalTablesExecutor #38649

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
yx9o merged 2 commits into from
Apr 24, 2026
+8 −5
Merged

Use identifier value schema name for ShowLogicalTablesExecutor #38649

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
9315a26
Use identifier value schema name for ShowLogicalTablesExecutor
menghaoranss Apr 24, 2026
0a3fbf9
Fix checkstyle
menghaoranss Apr 24, 2026
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
10 changes: 6 additions & 4 deletions ...pache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.util.regex.RegexUtils;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;

import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -56,21 +57,22 @@ public Collection<String> getColumnNames(final ShowLogicalTablesStatement sqlSta
@Override
public Collection<LocalDataQueryResultRow> getRows(final ShowLogicalTablesStatement sqlStatement, final ContextManager contextManager) {
DialectDatabaseMetaData dialectDatabaseMetaData = new DatabaseTypeRegistry(database.getProtocolType()).getDialectDatabaseMetaData();
String schemaName = dialectDatabaseMetaData.getSchemaOption().getDefaultSchema().orElse(database.getName());
IdentifierValue schemaName = new IdentifierValue(dialectDatabaseMetaData.getSchemaOption().getDefaultSchema().orElse(database.getName()));
if (null == database.getSchema(schemaName)) {
return Collections.emptyList();
}
return getTables(schemaName, sqlStatement).stream().map(each -> getRow(schemaName, each, sqlStatement)).collect(Collectors.toList());
}

private LocalDataQueryResultRow getRow(final String schemaName, final ShardingSphereTable table, final ShowLogicalTablesStatement sqlStatement) {
private LocalDataQueryResultRow getRow(final IdentifierValue schemaName, final ShardingSphereTable table, final ShowLogicalTablesStatement sqlStatement) {
if (new DatabaseTypeRegistry(database.getProtocolType()).getDialectDatabaseMetaData().getSchemaOption().isSchemaAvailable()) {
return sqlStatement.isContainsFull() ? new LocalDataQueryResultRow(table.getName(), table.getType(), schemaName) : new LocalDataQueryResultRow(table.getName(), schemaName);
return sqlStatement.isContainsFull() ? new LocalDataQueryResultRow(table.getName(), table.getType(), schemaName.getValue())
: new LocalDataQueryResultRow(table.getName(), schemaName.getValue());
}
return sqlStatement.isContainsFull() ? new LocalDataQueryResultRow(table.getName(), table.getType()) : new LocalDataQueryResultRow(table.getName());
}

private Collection<ShardingSphereTable> getTables(final String schemaName, final ShowLogicalTablesStatement sqlStatement) {
private Collection<ShardingSphereTable> getTables(final IdentifierValue schemaName, final ShowLogicalTablesStatement sqlStatement) {
Collection<ShardingSphereTable> tables = database.getSchema(schemaName).getAllTables();
Collection<ShardingSphereTable> filteredTables = filterByLike(tables, sqlStatement);
return filteredTables.stream().sorted(Comparator.comparing(ShardingSphereTable::getName)).collect(Collectors.toList());
Expand Down
3 changes: 2 additions & 1 deletion ...e/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -57,7 +58,7 @@ void setUp() {
when(database.getName()).thenReturn("foo_db");
when(database.getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "FIXTURE"));
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(database.getSchema("foo_db")).thenReturn(schema);
when(database.getSchema(new IdentifierValue("foo_db"))).thenReturn(schema);
Collection<ShardingSphereTable> tables = Arrays.asList(mockShardingSphereTable("t_order"), mockShardingSphereTable("t_order_item"));
when(schema.getAllTables()).thenReturn(tables);
executor.setDatabase(database);
Expand Down
Loading