database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[improvement](plsql) Select statement supports insert into variables #31574

Browse Source
This commit is contained in:
Xinyi Zou
2024-02-29 19:49:54 +08:00
committed by yiguolei
parent 4a05e5a275
commit 54709ecf3b
6 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View File

@ -1226,6 +1226,9 @@ public class LogicalPlanBuilder extends DorisParserBaseVisitor<Object> {
} else {
relation = visitFromClause(ctx.fromClause());
}
if (ctx.intoClause() != null && !ConnectContext.get().isRunProcedure()) {
throw new ParseException("Only procedure supports insert into variables", selectCtx);
}
selectPlan = withSelectQuerySpecification(
ctx, relation,
selectCtx,

49
fe/fe-core/src/main/java/org/apache/doris/plsql/Stmt.java
View File

@ -39,14 +39,19 @@ import org.apache.doris.nereids.PLParser.If_bteq_stmtContext;
import org.apache.doris.nereids.PLParser.If_plsql_stmtContext;
import org.apache.doris.nereids.PLParser.If_tsql_stmtContext;
import org.apache.doris.nereids.PLParser.Include_stmtContext;
import org.apache.doris.nereids.PLParser.IntoClauseContext;
import org.apache.doris.nereids.PLParser.Leave_stmtContext;
import org.apache.doris.nereids.PLParser.Open_stmtContext;
import org.apache.doris.nereids.PLParser.Print_stmtContext;
import org.apache.doris.nereids.PLParser.QueryPrimaryDefaultContext;
import org.apache.doris.nereids.PLParser.Quit_stmtContext;
import org.apache.doris.nereids.PLParser.RegularQuerySpecificationContext;
import org.apache.doris.nereids.PLParser.Resignal_stmtContext;
import org.apache.doris.nereids.PLParser.Return_stmtContext;
import org.apache.doris.nereids.PLParser.Set_current_schema_optionContext;
import org.apache.doris.nereids.PLParser.Signal_stmtContext;
import org.apache.doris.nereids.PLParser.StatementDefaultContext;
import org.apache.doris.nereids.PLParser.TableRowContext;
import org.apache.doris.nereids.PLParser.Unconditional_loop_stmtContext;
import org.apache.doris.nereids.PLParser.Values_into_stmtContext;
import org.apache.doris.nereids.PLParser.While_stmtContext;
@ -81,7 +86,7 @@ public class Stmt {
boolean trace = false;
ResultListener resultListener = ResultListener.NONE;
private QueryExecutor queryExecutor;
private final QueryExecutor queryExecutor;
Stmt(Exec e, QueryExecutor queryExecutor) {
exec = e;
@ -186,11 +191,32 @@ public class Stmt {
return 0;
}
/**
* Get INTO clause
*/
IntoClauseContext getIntoClause(ParserRuleContext ctx) {
if (ctx.getChild(0) instanceof StatementDefaultContext) {
ParserRuleContext queryTermDefaultCtx = ((StatementDefaultContext) ctx.getChild(0)).query().queryTerm();
if (queryTermDefaultCtx.getChild(0) instanceof QueryPrimaryDefaultContext) {
ParserRuleContext queryPrimaryDefaultContext
= ((QueryPrimaryDefaultContext) queryTermDefaultCtx.getChild(0));
if (queryPrimaryDefaultContext.getChild(0) instanceof RegularQuerySpecificationContext) {
return ((RegularQuerySpecificationContext) queryPrimaryDefaultContext.getChild(0)).intoClause();
}
}
}
return null;
}
/**
* Get number of elements in INTO or var=col assignment clause
*/
int getIntoCount(ParserRuleContext ctx) {
// TODO
IntoClauseContext into = getIntoClause(ctx);
if (into != null) {
return into.identifier().size() + into.tableRow().size();
}
// TODO support var=col assignment clause
return 0;
}
@ -198,13 +224,22 @@ public class Stmt {
* Get variable name assigned in INTO or var=col clause by index
*/
String getIntoVariable(ParserRuleContext ctx, int idx) {
// TODO
IntoClauseContext into = getIntoClause(ctx);
if (into != null) {
return into.tableRow(idx) != null ? into.tableRow(idx).identifier().getText()
: into.identifier(idx).getText();
}
// TODO support var=col assignment clause
return null;
}
private int getIntoTableIndex(ParserRuleContext ctx, int idx) {
// TODO
return 0;
IntoClauseContext into = getIntoClause(ctx);
TableRowContext row = into.tableRow(idx);
if (row == null) {
throw new RuntimeException("Missing into table index");
}
return Integer.parseInt(row.INTEGER_VALUE().getText());
}
private void populateVariable(ParserRuleContext ctx, QueryResult query, int columnIndex) throws AnalysisException {
@ -380,7 +415,7 @@ public class Stmt {
int cols = ctx.ident_pl().size() - 1;
QueryResult queryResult = cursor.getQueryResult();
if (ctx.bulk_collect_clause() != null) {
if (ctx.bulkCollectClause() != null) {
long limit = ctx.fetch_limit() != null ? evalPop(ctx.fetch_limit().expr()).longValue() : -1;
long rowIndex = 1;
List<Table> tables = exec.intoTables(ctx, intoVariableNames(ctx, cols));
@ -545,7 +580,7 @@ public class Stmt {
if (trace) {
trace(ctx, "COLUMN: " + query.metadata().columnName(i) + ", " + query.metadata()
.columnTypeName(i));
trace(ctx, "SET " + var.getName() + " = " + var.toString());
trace(ctx, "SET " + var.getName() + " = " + var);
}
} else if (trace) {
trace(ctx, "Variable not found: " + ctx.ident_pl(i).getText());