Commit 5285ccd2 authored by terrymanu's avatar terrymanu
Browse files

for #2084, refactor ExpressionExtractor

parent 1e885341

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

+7 −12
Original line number Diff line number Diff line
@@ -44,23 +44,18 @@ public final class ExpressionExtractor implements OptionalSQLSegmentExtractor { 
    @Override

    public Optional<? extends ExpressionSegment> extract(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        Optional<ParserRuleContext> subqueryNode = ExtractorUtils.findFirstChildNode(expressionNode, RuleName.SUBQUERY);

        return subqueryNode.isPresent() ? new SubqueryExtractor().extract(subqueryNode.get(), parameterMarkerIndexes) : Optional.of(extractExpression(expressionNode, parameterMarkerIndexes));

        if (subqueryNode.isPresent()) {

            return new SubqueryExtractor().extract(subqueryNode.get(), parameterMarkerIndexes);

        }

    

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

        Optional<ParameterMarkerExpressionSegment> parameterMarkerExpressionSegment = parameterMarkerExpressionExtractor.extract(expressionNode, parameterMarkerIndexes);

        if (parameterMarkerExpressionSegment.isPresent()) {

            return parameterMarkerExpressionSegment.get();

            return parameterMarkerExpressionSegment;

        }

        Optional<LiteralExpressionSegment> literalExpressionSegment = literalExpressionExtractor.extract(expressionNode, parameterMarkerIndexes);

        if (literalExpressionSegment.isPresent()) {

            return literalExpressionSegment.get();

        }

        return extractCommonExpressionSegment(expressionNode);

            return literalExpressionSegment;

        }

    

        // TODO extract column name and value from expression

    private ExpressionSegment extractCommonExpressionSegment(final ParserRuleContext functionNode) {

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

        return Optional.of(new CommonExpressionSegment(expressionNode.getStart().getStartIndex(), expressionNode.getStop().getStopIndex()));

    }

}