Skip to content

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

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
yiguolei merged 1 commit into from
Feb 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ BROKER: 'BROKER';
BUCKETS: 'BUCKETS';
BUILD: 'BUILD';
BUILTIN: 'BUILTIN';
BULK: 'BULK';
BY: 'BY';
CACHED: 'CACHED';
CALL: 'CALL';
Expand All @@ -154,6 +155,7 @@ CLUSTER: 'CLUSTER';
CLUSTERS: 'CLUSTERS';
COLLATE: 'COLLATE';
COLLATION: 'COLLATION';
COLLECT: 'COLLECT';
COLUMN: 'COLUMN';
COLUMNS: 'COLUMNS';
COMMENT: 'COMMENT';
Expand Down
16 changes: 16 additions & 0 deletions fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ queryPrimary

querySpecification
: selectClause
intoClause?
fromClause?
whereClause?
aggClause?
Expand Down Expand Up @@ -337,6 +338,19 @@ fromClause
: FROM relations
;

// For PL-SQL
intoClause
: bulkCollectClause? INTO (tableRow | identifier) (COMMA (tableRow | identifier))*
;

bulkCollectClause :
Copy link
Contributor

@morrySnow morrySnow Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this? not fount in desc

Copy link
Contributor Author

@xinyiZzz xinyiZzz Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/plsql-optimization-and-tuning.html#GUID-19F50644-C88E-49AF-B31C-3EE4B4432714

The BULK COLLECT clause, a feature of bulk SQL, returns results from SQL to PL/SQL in batches rather than one at a time.

With the BULK COLLECT clause, each of the preceding statements retrieves an entire result set and stores it in one or more collection variables in a single operation (which is more efficient than using a loop statement to retrieve one result row at a time).

actually, this is not available yet, and there are still some problems.

Copy link
Contributor Author

@xinyiZzz xinyiZzz Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doris PL-SQL docs, will be added later.

BULK COLLECT
;

tableRow :
identifier LEFT_PAREN INTEGER_VALUE RIGHT_PAREN
;

relations
: relation (COMMA relation)*
;
Expand Down Expand Up @@ -947,6 +961,7 @@ nonReserved
| BUCKETS
| BUILD
| BUILTIN
| BULK
| CACHED
| CALL
| CATALOG
Expand All @@ -958,6 +973,7 @@ nonReserved
| CLUSTER
| CLUSTERS
| COLLATION
| COLLECT
| COLUMNS
| COMMENT
| COMMIT
Expand Down
2 changes: 0 additions & 2 deletions fe/fe-core/src/main/antlr4/org/apache/doris/nereids/PLLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ BINARY_INTEGER: 'BINARY_INTEGER';
BIT: 'BIT';
BODY: 'BODY';
BREAK: 'BREAK';
BULK: 'BULK';
BYTE: 'BYTE';
CALLER: 'CALLER';
CASCADE: 'CASCADE';
Expand All @@ -47,7 +46,6 @@ CLIENT: 'CLIENT';
CLOSE: 'CLOSE';
CLUSTERED: 'CLUSTERED';
CMP: 'CMP';
COLLECT: 'COLLECT';
COLLECTION: 'COLLECTION';
COMPRESS: 'COMPRESS';
CONCAT: 'CONCAT';
Expand Down
8 changes: 1 addition & 7 deletions fe/fe-core/src/main/antlr4/org/apache/doris/nereids/PLParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ open_stmt : // OPEN cursor statement
;

fetch_stmt : // FETCH cursor statement
FETCH FROM? ident_pl bulk_collect_clause? INTO ident_pl (COMMA ident_pl)* fetch_limit?
FETCH FROM? ident_pl bulkCollectClause? INTO ident_pl (COMMA ident_pl)* fetch_limit?
;

fetch_limit:
Expand Down Expand Up @@ -521,10 +521,6 @@ using_clause : // USING var,... clause
USING expr (COMMA expr)*
;

bulk_collect_clause :
BULK COLLECT
;

bool_expr : // Boolean condition
NOT? LEFT_PAREN bool_expr RIGHT_PAREN
| bool_expr bool_expr_logical_operator bool_expr
Expand Down Expand Up @@ -782,7 +778,6 @@ non_reserved_words : // Tokens that are not reserved words
| BIT
| BODY
| BREAK
| BULK
| BYTE
| CALLER
| CASCADE
Expand All @@ -791,7 +786,6 @@ non_reserved_words : // Tokens that are not reserved words
| CLOSE
| CLUSTERED
| CMP
| COLLECT
| COLLECTION
| COMPRESS
| CONSTANT
Expand Down
3 changes: 3 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,9 @@ public LogicalPlan visitRegularQuerySpecification(RegularQuerySpecificationConte
} 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,
Expand Down
49 changes: 42 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/plsql/Stmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,19 @@
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -186,25 +191,55 @@ public Integer statement(ParserRuleContext ctx) {
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;
}

/**
* 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 {
Expand Down Expand Up @@ -380,7 +415,7 @@ public Integer fetch(Fetch_stmtContext ctx) {
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));
Expand Down Expand Up @@ -545,7 +580,7 @@ public Integer assignFromSelect(Assignment_stmt_select_itemContext ctx) {
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());
Expand Down