Skip to content

Commit b21b03f

Browse files
chrlsochrlso
committed
Introduce NameCanonicalizer to the metadata
1 parent 197a65b commit b21b03f

File tree

59 files changed

+264
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+264
-116
lines changed

‎core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public ListenableFuture<Void> execute(
9797
{
9898
Session session = stateMachine.getSession();
9999
Map<NodeRef<Parameter>, Expression> parameterLookup = bindParameters(statement, parameters);
100-
QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getName());
100+
QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getName(), plannerContext.getMetadata());
101101
RedirectionAwareTableHandle redirectionAwareTableHandle = plannerContext.getMetadata().getRedirectionAwareTableHandle(session, originalTableName);
102102
if (redirectionAwareTableHandle.tableHandle().isEmpty()) {
103103
if (!statement.isTableExists()) {

‎core/trino-main/src/main/java/io/trino/execution/CallTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public ListenableFuture<Void> execute(
102102
}
103103

104104
Session session = stateMachine.getSession();
105-
QualifiedObjectName procedureName = createQualifiedObjectName(session, call, call.getName());
105+
QualifiedObjectName procedureName = createQualifiedObjectName(session, call, call.getName(), plannerContext.getMetadata());
106106
CatalogHandle catalogHandle = getRequiredCatalogHandle(plannerContext.getMetadata(), stateMachine.getSession(), call, procedureName.catalogName());
107107
Procedure procedure = procedureRegistry.resolve(catalogHandle, procedureName.asSchemaTableName());
108108

‎core/trino-main/src/main/java/io/trino/execution/CommentTask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ else if (statement.getType() == Comment.Type.COLUMN) {
8989

9090
private void commentOnTable(Comment statement, Session session)
9191
{
92-
QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getName());
92+
QualifiedObjectName originalTableName = createQualifiedObjectName(session, statement, statement.getName(), metadata);
9393
if (metadata.isMaterializedView(session, originalTableName)) {
9494
throw semanticException(
9595
TABLE_NOT_FOUND,
@@ -116,7 +116,7 @@ private void commentOnTable(Comment statement, Session session)
116116

117117
private void commentOnView(Comment statement, Session session)
118118
{
119-
QualifiedObjectName viewName = createQualifiedObjectName(session, statement, statement.getName());
119+
QualifiedObjectName viewName = createQualifiedObjectName(session, statement, statement.getName(), metadata);
120120
if (!metadata.isView(session, viewName)) {
121121
String additionalInformation;
122122
if (metadata.getMaterializedView(session, viewName).isPresent()) {
@@ -140,7 +140,7 @@ private void commentOnColumn(Comment statement, Session session)
140140
QualifiedName prefix = statement.getName().getPrefix()
141141
.orElseThrow(() -> semanticException(MISSING_TABLE, statement, "Table must be specified"));
142142

143-
QualifiedObjectName originalObjectName = createQualifiedObjectName(session, statement, prefix);
143+
QualifiedObjectName originalObjectName = createQualifiedObjectName(session, statement, prefix, metadata);
144144
Optional<ViewDefinition> view = metadata.getView(session, originalObjectName);
145145
if (view.isPresent()) {
146146
ViewDefinition viewDefinition = view.get();

‎core/trino-main/src/main/java/io/trino/execution/CreateBranchTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public ListenableFuture<Void> execute(CreateBranch statement, QueryStateMachine
7676
{
7777
Session session = stateMachine.getSession();
7878

79-
QualifiedObjectName table = createQualifiedObjectName(session, statement, statement.getTableName());
79+
QualifiedObjectName table = createQualifiedObjectName(session, statement, statement.getTableName(), metadata);
8080
String branch = statement.getBranchName().getValue();
8181
Optional<String> fromBranch = statement.getFromBranch().map(Identifier::getValue);
8282

‎core/trino-main/src/main/java/io/trino/execution/CreateMaterializedViewTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Analysis executeInternal(
109109
WarningCollector warningCollector,
110110
PlanOptimizersStatsCollector planOptimizersStatsCollector)
111111
{
112-
QualifiedObjectName name = createQualifiedObjectName(session, statement, statement.getName());
112+
QualifiedObjectName name = createQualifiedObjectName(session, statement, statement.getName(), plannerContext.getMetadata());
113113
Map<NodeRef<Parameter>, Expression> parameterLookup = bindParameters(statement, parameters);
114114

115115
String sql = getFormattedSql(statement.getQuery(), sqlParser);

‎core/trino-main/src/main/java/io/trino/execution/CreateSchemaTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static ListenableFuture<Void> internalExecute(
9191
Session session,
9292
List<Expression> parameters)
9393
{
94-
CatalogSchemaName schema = createCatalogSchemaName(session, statement, Optional.of(statement.getSchemaName()));
94+
CatalogSchemaName schema = createCatalogSchemaName(session, statement, Optional.of(statement.getSchemaName()), plannerContext.getMetadata());
9595

9696
String catalogName = schema.getCatalogName();
9797
CatalogHandle catalogHandle = getRequiredCatalogHandle(plannerContext.getMetadata(), session, statement, catalogName);

‎core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ ListenableFuture<Void> internalExecute(CreateTable statement, Session session, L
134134
checkArgument(!statement.getElements().isEmpty(), "no columns for table");
135135

136136
Map<NodeRef<Parameter>, Expression> parameterLookup = bindParameters(statement, parameters);
137-
QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getName());
137+
QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getName(), plannerContext.getMetadata());
138138
Optional<TableHandle> tableHandle;
139139
try {
140140
tableHandle = plannerContext.getMetadata().getTableHandle(session, tableName);
@@ -216,7 +216,7 @@ ListenableFuture<Void> internalExecute(CreateTable statement, Session session, L
216216
.build());
217217
}
218218
else if (element instanceof LikeClause likeClause) {
219-
QualifiedObjectName originalLikeTableName = createQualifiedObjectName(session, statement, likeClause.getTableName());
219+
QualifiedObjectName originalLikeTableName = createQualifiedObjectName(session, statement, likeClause.getTableName(), plannerContext.getMetadata());
220220
if (plannerContext.getMetadata().getCatalogHandle(session, originalLikeTableName.catalogName()).isEmpty()) {
221221
throw semanticException(CATALOG_NOT_FOUND, statement, "LIKE table catalog '%s' not found", originalLikeTableName.catalogName());
222222
}

‎core/trino-main/src/main/java/io/trino/execution/CreateViewTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public ListenableFuture<Void> execute(
9191
Map<NodeRef<Parameter>, Expression> parameterLookup = bindParameters(statement, parameters);
9292

9393
Session session = stateMachine.getSession();
94-
QualifiedObjectName name = createQualifiedObjectName(session, statement, statement.getName());
94+
QualifiedObjectName name = createQualifiedObjectName(session, statement, statement.getName(), plannerContext.getMetadata());
9595

9696
accessControl.checkCanCreateView(session.toSecurityContext(), name);
9797

‎core/trino-main/src/main/java/io/trino/execution/DenyTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static void executeDenyOnSchema(Session session, Deny statement, Metadat
8787
throw semanticException(NOT_SUPPORTED, statement, "Denying on branch is not supported");
8888
}
8989

90-
CatalogSchemaName schemaName = createCatalogSchemaName(session, statement, Optional.of(statement.getGrantObject().getName()));
90+
CatalogSchemaName schemaName = createCatalogSchemaName(session, statement, Optional.of(statement.getGrantObject().getName()), metadata);
9191

9292
if (!metadata.schemaExists(session, schemaName)) {
9393
throw semanticException(SCHEMA_NOT_FOUND, statement, "Schema '%s' does not exist", schemaName);
@@ -103,7 +103,7 @@ private static void executeDenyOnSchema(Session session, Deny statement, Metadat
103103

104104
private static void executeDenyOnTable(Session session, Deny statement, Metadata metadata, AccessControl accessControl)
105105
{
106-
QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getGrantObject().getName());
106+
QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getGrantObject().getName(), metadata);
107107
Optional<Identifier> branch = statement.getGrantObject().getBranch();
108108

109109
if (!metadata.isMaterializedView(session, tableName) && !metadata.isView(session, tableName)) {

‎core/trino-main/src/main/java/io/trino/execution/DropBranchTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public ListenableFuture<Void> execute(DropBranch statement, QueryStateMachine st
5959
{
6060
Session session = stateMachine.getSession();
6161

62-
QualifiedObjectName table = createQualifiedObjectName(session, statement, statement.getTableName());
62+
QualifiedObjectName table = createQualifiedObjectName(session, statement, statement.getTableName(), metadata);
6363
String branch = statement.getBranchName().getValue();
6464

6565
if (metadata.isMaterializedView(session, table)) {

0 commit comments

Comments
 (0)