Commit d332a26d authored by terrymanu's avatar terrymanu
Browse files

for #2084, ExpressionExtractor.extractCommonExpressionSegment => extractLiteralExpressionSegment

parent e33aefac

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/AssignmentExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public final class AssignmentExtractor implements OptionalSQLSegmentExtractor { 
        }

        Optional<ColumnSegment> columnSegment = columnExtractor.extract((ParserRuleContext) assignmentNode.get().getChild(0), parameterMarkerIndexes);

        Preconditions.checkState(columnSegment.isPresent());

        LiteralExpressionSegment expressionSegment = expressionExtractor.extractCommonExpressionSegment((ParserRuleContext) assignmentNode.get().getChild(2), parameterMarkerIndexes);

        LiteralExpressionSegment expressionSegment = expressionExtractor.extractLiteralExpressionSegment((ParserRuleContext) assignmentNode.get().getChild(2), parameterMarkerIndexes);

        return Optional.of(new AssignmentSegment(columnSegment.get(), expressionSegment));

    }

}

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/ExpressionExtractor.java

+6 −9
Original line number Diff line number Diff line
@@ -44,29 +44,26 @@ public final class ExpressionExtractor implements OptionalSQLSegmentExtractor { 
    }

    

    private ExpressionSegment extractExpression(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        Optional<ParserRuleContext> functionNode = ExtractorUtils.findFirstChildNode(expressionNode, RuleName.FUNCTION_CALL);

        if (functionNode.isPresent()) {

            return extractCommonExpressionSegment(functionNode.get());

        }

        if (RuleName.COLUMN_NAME.getName().equals(expressionNode.getChild(0).getClass().getSimpleName())) {

        if (ExtractorUtils.findFirstChildNode(expressionNode, RuleName.FUNCTION_CALL).isPresent()

                || ExtractorUtils.findFirstChildNodeNoneRecursive(expressionNode, RuleName.COLUMN_NAME).isPresent()) {

            return extractCommonExpressionSegment(expressionNode);

        }

        return extractCommonExpressionSegment(expressionNode, parameterMarkerIndexes);

        return extractLiteralExpressionSegment(expressionNode, parameterMarkerIndexes);

    }

    

    // TODO extract column name and value from function

    // TODO extract column name and value from expression

    private ExpressionSegment extractCommonExpressionSegment(final ParserRuleContext functionNode) {

        return new CommonExpressionSegment(functionNode.getStart().getStartIndex(), functionNode.getStop().getStopIndex());

    }

    

    /**

     * Extract common expression segment.

     * Extract literal expression segment.

     *

     * @param parameterMarkerIndexes parameter marker indexes

     * @param expressionNode expression node

     * @return common expression segment

     */

    public LiteralExpressionSegment extractCommonExpressionSegment(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

    public LiteralExpressionSegment extractLiteralExpressionSegment(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        LiteralExpressionSegment result = new LiteralExpressionSegment(expressionNode.getStart().getStartIndex(), expressionNode.getStop().getStopIndex());

        Optional<ParserRuleContext> questionNode = ExtractorUtils.findFirstChildNode(expressionNode, RuleName.PARAMETER_MARKER);

        if (questionNode.isPresent()) {

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/PredicateExtractor.java

+6 −6
Original line number Diff line number Diff line
@@ -135,21 +135,21 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { 
    }

    

    private Optional<PredicateSegment> extractBetweenPredicate(final ParserRuleContext predicateNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes, final ColumnSegment column) {

        Optional<? extends ExpressionSegment> beginSQLExpression = expressionExtractor.extract((ParserRuleContext) predicateNode.getChild(2), parameterMarkerIndexes);

        Optional<? extends ExpressionSegment> endSQLExpression = expressionExtractor.extract((ParserRuleContext) predicateNode.getChild(4), parameterMarkerIndexes);

        return beginSQLExpression.isPresent() && endSQLExpression.isPresent()

        Optional<? extends ExpressionSegment> betweenSQLExpression = expressionExtractor.extract((ParserRuleContext) predicateNode.getChild(2), parameterMarkerIndexes);

        Optional<? extends ExpressionSegment> andSQLExpression = expressionExtractor.extract((ParserRuleContext) predicateNode.getChild(4), parameterMarkerIndexes);

        return betweenSQLExpression.isPresent() && andSQLExpression.isPresent()

                ? Optional.of(new PredicateSegment(

                        column, ShardingOperator.BETWEEN.name(), new BetweenValueExpressionSegment(beginSQLExpression.get(), endSQLExpression.get()), predicateNode.getStop().getStopIndex()))

                        column, ShardingOperator.BETWEEN.name(), new BetweenValueExpressionSegment(betweenSQLExpression.get(), andSQLExpression.get()), predicateNode.getStop().getStopIndex()))

                : Optional.<PredicateSegment>absent();

    }

    

    private Optional<PredicateSegment> extractInPredicate(final ParserRuleContext predicateNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes, final ColumnSegment column) {

        Collection<ExpressionSegment> sqlExpressions = extractExpressionSegments(predicateNode, parameterMarkerIndexes);

        Collection<ExpressionSegment> sqlExpressions = extractInExpressionSegments(predicateNode, parameterMarkerIndexes);

        return sqlExpressions.isEmpty() ? Optional.<PredicateSegment>absent()

                : Optional.of(new PredicateSegment(column, ShardingOperator.IN.name(), new InValueExpressionSegment(sqlExpressions), predicateNode.getStop().getStopIndex()));

    }

    

    private Collection<ExpressionSegment> extractExpressionSegments(final ParserRuleContext predicateNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

    private Collection<ExpressionSegment> extractInExpressionSegments(final ParserRuleContext predicateNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        List<ExpressionSegment> result = new LinkedList<>();

        for (int i = 3; i < predicateNode.getChildCount(); i++) {

            if (RuleName.EXPR.getName().equals(predicateNode.getChild(i).getClass().getSimpleName())) {

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/insert/InsertValuesExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public final class InsertValuesExtractor implements CollectionSQLSegmentExtracto 
    private Collection<LiteralExpressionSegment> extractCommonExpressionSegments(final ParserRuleContext assignmentValuesNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        Collection<LiteralExpressionSegment> result = new LinkedList<>();

        for (ParserRuleContext each : ExtractorUtils.getAllDescendantNodes(assignmentValuesNode, RuleName.ASSIGNMENT_VALUE)) {

            result.add(expressionExtractor.extractCommonExpressionSegment(each, parameterMarkerIndexes));

            result.add(expressionExtractor.extractLiteralExpressionSegment(each, parameterMarkerIndexes));

        }

        return result;

    }