Skip to content
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

Jump to bottom

Fix LiteralExpressionSegment cast exception in sql parser. #33332

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix LiteralExpressionSegment cast exception in sql parser. #33332

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
15 changes: 7 additions & 8 deletions ...ingsphere/sql/parser/clickhouse/visitor/statement/type/ClickHouseDMLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
import org.apache.shardingsphere.sql.parser.autogen.ClickHouseStatementParser.SelectClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.ClickHouseStatementParser.SubqueryContext;
import org.apache.shardingsphere.sql.parser.clickhouse.visitor.statement.ClickHouseStatementVisitor;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseDeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseInsertStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseSelectStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseUpdateStatement;
import org.apache.shardingsphere.sql.parser.statement.core.enums.JoinType;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.InsertValuesSegment;
Expand All @@ -39,7 +43,6 @@
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.complex.CommonExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubqueryExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubquerySegment;
Expand All @@ -64,10 +67,6 @@
import org.apache.shardingsphere.sql.parser.statement.core.value.collection.CollectionValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.BooleanLiteralValue;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseDeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseInsertStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseSelectStatement;
import org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseUpdateStatement;

import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -324,9 +323,9 @@ private ASTNode createProjection(final ClickHouseStatementParser.ProjectionConte
result.setAlias(alias);
return projection;
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias ? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
ExpressionSegment column = (ExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias ? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), column.getText(), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), column.getText(), column);
result.setAlias(alias);
return result;
}
Expand Down
5 changes: 2 additions & 3 deletions ...a/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1811,10 +1811,9 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
|| projection instanceof CollateExpression || projection instanceof NotExpression) {
return createExpressionProjectionSegment(ctx, alias, projection);
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
? new ExpressionProjectionSegment(projection.getStartIndex(), projection.getStopIndex(), projection.getText(), projection)
: new ExpressionProjectionSegment(projection.getStartIndex(), ctx.alias().stop.getStopIndex(), projection.getText(), projection);
result.setAlias(alias);
return result;
}
Expand Down
12 changes: 6 additions & 6 deletions ...apache/shardingsphere/sql/parser/hive/visitor/statement/type/HiveDMLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ public ASTNode visitConvertFunction(final ConvertFunctionContext ctx) {
public ASTNode visitPositionFunction(final PositionFunctionContext ctx) {
calculateParameterCount(ctx.expr());
FunctionSegment result = new FunctionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.POSITION().getText(), getOriginalText(ctx));
result.getParameters().add((LiteralExpressionSegment) visit(ctx.expr(0)));
result.getParameters().add((LiteralExpressionSegment) visit(ctx.expr(1)));
result.getParameters().add((ExpressionSegment) visit(ctx.expr(0)));
result.getParameters().add((ExpressionSegment) visit(ctx.expr(1)));
return result;
}

Expand All @@ -637,7 +637,7 @@ public ASTNode visitExtractFunction(final ExtractFunctionContext ctx) {
calculateParameterCount(Collections.singleton(ctx.expr()));
FunctionSegment result = new FunctionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.EXTRACT().getText(), getOriginalText(ctx));
result.getParameters().add(new LiteralExpressionSegment(ctx.identifier().getStart().getStartIndex(), ctx.identifier().getStop().getStopIndex(), ctx.identifier().getText()));
result.getParameters().add((LiteralExpressionSegment) visit(ctx.expr()));
result.getParameters().add((ExpressionSegment) visit(ctx.expr()));
return result;
}

Expand Down Expand Up @@ -1213,10 +1213,10 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
result.setAlias(alias);
return result;
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionSegment column = (ExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), column.getText(), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), column.getText(), column);
result.setAlias(alias);
return result;
}
Expand Down
5 changes: 2 additions & 3 deletions ...a/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,10 +1786,9 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
|| projection instanceof CollateExpression || projection instanceof NotExpression) {
return createExpressionProjectionSegment(ctx, alias, projection);
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
? new ExpressionProjectionSegment(projection.getStartIndex(), projection.getStopIndex(), projection.getText(), projection)
: new ExpressionProjectionSegment(projection.getStartIndex(), ctx.alias().stop.getStopIndex(), projection.getText(), projection);
result.setAlias(alias);
return result;
}
Expand Down
6 changes: 3 additions & 3 deletions ...ache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ public ASTNode visitSelectLimitValue(final SelectLimitValueContext ctx) {
if (astNode instanceof ParameterMarkerExpressionSegment) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((ExpressionSegment) astNode).getText()));
}

@Override
Expand All @@ -1400,7 +1400,7 @@ public ASTNode visitSelectOffsetValue(final SelectOffsetValueContext ctx) {
if (astNode instanceof ParameterMarkerExpressionSegment) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((ExpressionSegment) astNode).getText()));
}

@Override
Expand All @@ -1409,7 +1409,7 @@ public ASTNode visitSelectFetchValue(final SelectFetchValueContext ctx) {
if (astNode instanceof ParameterMarkerExpressionSegment) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((ExpressionSegment) astNode).getText()));
}

private LimitSegment createLimitSegmentWhenLimitAndOffset(final SelectLimitContext ctx) {
Expand Down
6 changes: 3 additions & 3 deletions ...he/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,7 @@ public ASTNode visitSelectLimitValue(final SelectLimitValueContext ctx) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
(null == ((LiteralExpressionSegment) astNode).getLiterals()) ? null : Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
(null == ((ExpressionSegment) astNode).getText()) ? null : Long.parseLong(((ExpressionSegment) astNode).getText()));
}

@Override
Expand All @@ -1371,7 +1371,7 @@ public ASTNode visitSelectOffsetValue(final SelectOffsetValueContext ctx) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
(null == ((LiteralExpressionSegment) astNode).getLiterals()) ? null : Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
(null == ((ExpressionSegment) astNode).getText()) ? null : Long.parseLong(((ExpressionSegment) astNode).getText()));
}

@Override
Expand All @@ -1381,7 +1381,7 @@ public ASTNode visitSelectFetchValue(final SelectFetchValueContext ctx) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
(null == ((LiteralExpressionSegment) astNode).getLiterals()) ? null : Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
(null == ((ExpressionSegment) astNode).getText()) ? null : Long.parseLong(((ExpressionSegment) astNode).getText()));
}

private LimitSegment createLimitSegmentWhenLimitAndOffset(final SelectLimitContext ctx) {
Expand Down
10 changes: 5 additions & 5 deletions ...he/shardingsphere/sql/parser/presto/visitor/statement/type/PrestoDMLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ public ASTNode visitConvertFunction(final ConvertFunctionContext ctx) {
public ASTNode visitPositionFunction(final PositionFunctionContext ctx) {
calculateParameterCount(ctx.expr());
FunctionSegment result = new FunctionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.POSITION().getText(), getOriginalText(ctx));
result.getParameters().add((LiteralExpressionSegment) visit(ctx.expr(0)));
result.getParameters().add((LiteralExpressionSegment) visit(ctx.expr(1)));
result.getParameters().add((ExpressionSegment) visit(ctx.expr(0)));
result.getParameters().add((ExpressionSegment) visit(ctx.expr(1)));
return result;
}

Expand Down Expand Up @@ -1172,10 +1172,10 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
result.setAlias(alias);
return result;
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionSegment column = (ExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), column.getText(), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), column.getText(), column);
result.setAlias(alias);
return result;
}
Expand Down
9 changes: 4 additions & 5 deletions ...ache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.TableReferencesContext;
import org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.UpdateContext;
import org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.WhereClauseContext;
import org.apache.shardingsphere.sql.parser.sql92.visitor.statement.SQL92StatementVisitor;
import org.apache.shardingsphere.sql.parser.statement.core.enums.JoinType;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.InsertValuesSegment;
Expand All @@ -62,7 +63,6 @@
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.complex.CommonExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubqueryExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubquerySegment;
Expand Down Expand Up @@ -91,7 +91,6 @@
import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92UpdateStatement;
import org.apache.shardingsphere.sql.parser.sql92.visitor.statement.SQL92StatementVisitor;

import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -349,9 +348,9 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
result.setAlias(alias);
return projection;
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias ? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), String.valueOf(column.getLiterals()), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), String.valueOf(column.getLiterals()), column);
ExpressionSegment column = (ExpressionSegment) projection;
ExpressionProjectionSegment result = null == alias ? new ExpressionProjectionSegment(column.getStartIndex(), column.getStopIndex(), column.getText(), column)
: new ExpressionProjectionSegment(column.getStartIndex(), ctx.alias().stop.getStopIndex(), column.getText(), column);
result.setAlias(alias);
return result;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,8 +1545,8 @@ private ASTNode createProjection(final ProjectionContext ctx, final AliasSegment
result.setAlias(alias);
return projection;
}
LiteralExpressionSegment column = (LiteralExpressionSegment) projection;
ExpressionProjectionSegment result = new ExpressionProjectionSegment(getStartIndexWithAlias(column, alias), getStopIndexWithAlias(column, alias), String.valueOf(column.getLiterals()), column);
ExpressionSegment column = (ExpressionSegment) projection;
ExpressionProjectionSegment result = new ExpressionProjectionSegment(getStartIndexWithAlias(column, alias), getStopIndexWithAlias(column, alias), column.getText(), column);
result.setAlias(alias);
return result;
}
Expand Down
Loading