Commit 4f790238 authored by terrymanu's avatar terrymanu
Browse files

for #2084, remove useless field for FunctionExpressionSegment

parent 06357dbb

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

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml; 
import com.google.common.base.Optional;

import com.google.common.base.Preconditions;

import org.antlr.v4.runtime.ParserRuleContext;

import org.antlr.v4.runtime.tree.TerminalNode;

import org.apache.shardingsphere.core.parse.antlr.extractor.api.OptionalSQLSegmentExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.column.ColumnExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml.select.SubqueryExtractor;
@@ -63,8 +62,7 @@ public final class ExpressionExtractor implements OptionalSQLSegmentExtractor { 
    

    // TODO extract column name and value from function

    private ExpressionSegment extractFunctionExpressionSegment(final ParserRuleContext functionNode) {

        return new FunctionExpressionSegment(functionNode.getStart().getStartIndex(), functionNode.getStop().getStopIndex(), functionNode.getChild(0).getText(), 

                ((TerminalNode) functionNode.getChild(1)).getSymbol().getStartIndex(), functionNode.getStop().getStopIndex(), -1);

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

    }

    

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

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/sql/segment/dml/expr/FunctionExpressionSegment.java

+1 −9
Original line number Diff line number Diff line
@@ -35,16 +35,8 @@ public final class FunctionExpressionSegment implements ExpressionSegment { 
    

    private final int stopIndex;

    

    private final String functionName;

    

    private final int innerExpressionStartIndex;

    

    private final int innerExpressionStopIndex; 

    

    private final int distinctExpressionStartIndex;

    

    @Override

    public SQLExpression getSQLExpression(final String sql) {

        return new SQLIgnoreExpression(sql.substring(startIndex, startIndex + 1));

        return new SQLIgnoreExpression(sql.substring(startIndex, stopIndex + 1));

    }

}