morrySnow commented on code in PR #43271:
URL: https://github.com/apache/doris/pull/43271#discussion_r1830460601
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -3999,4 +4005,45 @@ public SetUserPropertiesCommand
visitSetUserProperties(SetUserPropertiesContext
public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStorageVaultContext ctx) {
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+
+ @Override
+ public LogicalPlan visitShowVariables(ShowVariablesContext ctx) {
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ return new ShowVariablesCommand(type,
stripQuotes(ctx.wildWhere().STRING_LITERAL().getText()));
+ } else {
+ StringBuilder sb = new StringBuilder();
+ sb.append("select VARIABLE_NAME as Variable_name,
VARIABLE_VALUE as Value from ");
+ sb.append(InternalCatalog.INTERNAL_CATALOG_NAME);
Review Comment:
```suggestion
sb.append("`").append(InternalCatalog.INTERNAL_CATALOG_NAME).append("`");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -3999,4 +4005,45 @@ public SetUserPropertiesCommand
visitSetUserProperties(SetUserPropertiesContext
public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStorageVaultContext ctx) {
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+
+ @Override
+ public LogicalPlan visitShowVariables(ShowVariablesContext ctx) {
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ return new ShowVariablesCommand(type,
stripQuotes(ctx.wildWhere().STRING_LITERAL().getText()));
+ } else {
+ StringBuilder sb = new StringBuilder();
+ sb.append("select VARIABLE_NAME as Variable_name,
VARIABLE_VALUE as Value from ");
+ sb.append(InternalCatalog.INTERNAL_CATALOG_NAME);
+ sb.append(".");
+ sb.append(InfoSchemaDb.DATABASE_NAME);
+ sb.append(".");
+ if (type == SetType.GLOBAL) {
+ sb.append("GLOBAL_VARIABLES ");
Review Comment:
```suggestion
sb.append("`global_variables` ");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -3999,4 +4005,45 @@ public SetUserPropertiesCommand
visitSetUserProperties(SetUserPropertiesContext
public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStorageVaultContext ctx) {
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+
+ @Override
+ public LogicalPlan visitShowVariables(ShowVariablesContext ctx) {
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ return new ShowVariablesCommand(type,
stripQuotes(ctx.wildWhere().STRING_LITERAL().getText()));
+ } else {
+ StringBuilder sb = new StringBuilder();
+ sb.append("select VARIABLE_NAME as Variable_name,
VARIABLE_VALUE as Value from ");
+ sb.append(InternalCatalog.INTERNAL_CATALOG_NAME);
+ sb.append(".");
+ sb.append(InfoSchemaDb.DATABASE_NAME);
+ sb.append(".");
+ if (type == SetType.GLOBAL) {
+ sb.append("GLOBAL_VARIABLES ");
+ } else {
+ sb.append("SESSION_VARIABLES ");
Review Comment:
```suggestion
sb.append("`session_variables` ");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowVariablesCommand.java:
##########
@@ -0,0 +1,73 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.analysis.SetType;
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.common.CaseSensibility;
+import org.apache.doris.common.PatternMatcher;
+import org.apache.doris.common.PatternMatcherWrapper;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.ShowResultSetMetaData;
+import org.apache.doris.qe.StmtExecutor;
+import org.apache.doris.qe.VariableMgr;
+
+import java.util.List;
+
+/**
+ * ShowVariablesCommand
+ */
+public class ShowVariablesCommand extends ShowCommand {
+ private static final String NAME_COL = "Variable_name";
+ private static final String VALUE_COL = "Value";
+ private static final String DEFAULT_VALUE_COL = "Default_Value";
+ private static final String CHANGED_COL = "Changed";
+ private static final ShowResultSetMetaData META_DATA =
ShowResultSetMetaData.builder()
+ .addColumn(new Column(NAME_COL, ScalarType.createVarchar(20)))
+ .addColumn(new Column(VALUE_COL, ScalarType.createVarchar(20)))
+ .addColumn(new Column(DEFAULT_VALUE_COL,
ScalarType.createVarchar(20)))
+ .addColumn(new Column(CHANGED_COL, ScalarType.createVarchar(20)))
+ .build();
+ private SetType type;
+ private String pattern;
Review Comment:
```suggestion
private final String pattern;
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowViewCommand.java:
##########
@@ -0,0 +1,148 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.Database;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.catalog.Table;
+import org.apache.doris.catalog.View;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.util.Util;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.nereids.NereidsPlanner;
+import org.apache.doris.nereids.StatementContext;
+import org.apache.doris.nereids.parser.NereidsParser;
+import org.apache.doris.nereids.properties.PhysicalProperties;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.commands.info.TableNameInfo;
+import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.nereids.util.PlanUtils;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.OriginStatement;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.ShowResultSetMetaData;
+import org.apache.doris.qe.StmtExecutor;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * ShowViewCommand
+ */
+public class ShowViewCommand extends ShowCommand {
+ private static final ShowResultSetMetaData META_DATA =
ShowResultSetMetaData.builder()
+ .addColumn(new Column("View", ScalarType.createVarchar(30)))
+ .addColumn(new Column("Create View",
ScalarType.createVarchar(65535)))
+ .build();
+ private String db;
+ private TableNameInfo tbl;
+ private List<View> matchViews = Lists.newArrayList();
+
+ public ShowViewCommand(String db, TableNameInfo tbl) {
+ super(PlanType.SHOW_VIEW_COMMAND);
+ this.db = db;
+ this.tbl = tbl;
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitShowViewCommand(this, context);
+ }
+
+ private void validate(ConnectContext ctx) throws Exception {
+ if (tbl == null) {
+ ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_TABLES_USED);
+ }
+ if (!Strings.isNullOrEmpty(db)) {
+ // if user specify the `from db`, overwrite the db in `tbl` with
this db.
+ // for example:
+ // show view from db1.tbl1 from db2;
+ // will be rewrote to:
+ // show view from db2.tbl1;
+ // this act same as in MySQL
+ tbl.setDb(db);
Review Comment:
in syntax, we use multi identifier as table name. if we should set db on
tbl, should we only allow identifier as table name? what does `from db` really
mean? it indicate table from this db or view from this db? how to show
db_a.views that use db_b.tbl?
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowVariablesCommand.java:
##########
@@ -0,0 +1,73 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.analysis.SetType;
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.common.CaseSensibility;
+import org.apache.doris.common.PatternMatcher;
+import org.apache.doris.common.PatternMatcherWrapper;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.ShowResultSetMetaData;
+import org.apache.doris.qe.StmtExecutor;
+import org.apache.doris.qe.VariableMgr;
+
+import java.util.List;
+
+/**
+ * ShowVariablesCommand
+ */
+public class ShowVariablesCommand extends ShowCommand {
+ private static final String NAME_COL = "Variable_name";
+ private static final String VALUE_COL = "Value";
+ private static final String DEFAULT_VALUE_COL = "Default_Value";
+ private static final String CHANGED_COL = "Changed";
+ private static final ShowResultSetMetaData META_DATA =
ShowResultSetMetaData.builder()
+ .addColumn(new Column(NAME_COL, ScalarType.createVarchar(20)))
+ .addColumn(new Column(VALUE_COL, ScalarType.createVarchar(20)))
+ .addColumn(new Column(DEFAULT_VALUE_COL,
ScalarType.createVarchar(20)))
+ .addColumn(new Column(CHANGED_COL, ScalarType.createVarchar(20)))
+ .build();
+ private SetType type;
Review Comment:
```suggestion
.build();
private final SetType type;
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -3999,4 +4005,45 @@ public SetUserPropertiesCommand
visitSetUserProperties(SetUserPropertiesContext
public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStorageVaultContext ctx) {
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+
+ @Override
+ public LogicalPlan visitShowVariables(ShowVariablesContext ctx) {
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ return new ShowVariablesCommand(type,
stripQuotes(ctx.wildWhere().STRING_LITERAL().getText()));
+ } else {
+ StringBuilder sb = new StringBuilder();
+ sb.append("select VARIABLE_NAME as Variable_name,
VARIABLE_VALUE as Value from ");
+ sb.append(InternalCatalog.INTERNAL_CATALOG_NAME);
+ sb.append(".");
+ sb.append(InfoSchemaDb.DATABASE_NAME);
Review Comment:
```suggestion
sb.append("`").append(InfoSchemaDb.DATABASE_NAME).append("`");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -3999,4 +4005,45 @@ public SetUserPropertiesCommand
visitSetUserProperties(SetUserPropertiesContext
public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStorageVaultContext ctx) {
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+
+ @Override
+ public LogicalPlan visitShowVariables(ShowVariablesContext ctx) {
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ return new ShowVariablesCommand(type,
stripQuotes(ctx.wildWhere().STRING_LITERAL().getText()));
+ } else {
+ StringBuilder sb = new StringBuilder();
+ sb.append("select VARIABLE_NAME as Variable_name,
VARIABLE_VALUE as Value from ");
Review Comment:
```suggestion
sb.append("SELECT `VARIABLE_NAME` AS `Variable_name`,
`VARIABLE_VALUE` AS `Value` FROM ");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowCommand.java:
##########
@@ -0,0 +1,53 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.analysis.StmtType;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.StmtExecutor;
+
+/**
+ * base class for all show commands
+ */
+public abstract class ShowCommand extends Command implements NoForward {
Review Comment:
why ShowCommand implement NoForward?
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowViewCommand.java:
##########
@@ -0,0 +1,148 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.Database;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.catalog.Table;
+import org.apache.doris.catalog.View;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.util.Util;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.nereids.NereidsPlanner;
+import org.apache.doris.nereids.StatementContext;
+import org.apache.doris.nereids.parser.NereidsParser;
+import org.apache.doris.nereids.properties.PhysicalProperties;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.commands.info.TableNameInfo;
+import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.nereids.util.PlanUtils;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.OriginStatement;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.ShowResultSetMetaData;
+import org.apache.doris.qe.StmtExecutor;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * ShowViewCommand
+ */
+public class ShowViewCommand extends ShowCommand {
+ private static final ShowResultSetMetaData META_DATA =
ShowResultSetMetaData.builder()
+ .addColumn(new Column("View", ScalarType.createVarchar(30)))
+ .addColumn(new Column("Create View",
ScalarType.createVarchar(65535)))
+ .build();
+ private String db;
+ private TableNameInfo tbl;
+ private List<View> matchViews = Lists.newArrayList();
+
+ public ShowViewCommand(String db, TableNameInfo tbl) {
+ super(PlanType.SHOW_VIEW_COMMAND);
+ this.db = db;
+ this.tbl = tbl;
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitShowViewCommand(this, context);
+ }
+
+ private void validate(ConnectContext ctx) throws Exception {
+ if (tbl == null) {
Review Comment:
why tbl could be null? i think in syntax, we always have a tbl. so we should
check not null when ctor?
--
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: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
