Commit a6581b9a authored by terrymanu's avatar terrymanu
Browse files

for #2084, XXXSelectItemSegmentExtractor => XXXSelectItemExtractor

parent 2d049d65

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/ColumnSelectItemSegmentExtractor.java→sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/ColumnSelectItemExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.item.ColumnSel 
 *

 * @author zhangliang

 */

public final class ColumnSelectItemSegmentExtractor implements OptionalSQLSegmentExtractor {

public final class ColumnSelectItemExtractor implements OptionalSQLSegmentExtractor {

    

    @Override

    public Optional<ColumnSelectItemSegment> extract(final ParserRuleContext expressionNode) {

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/ExpressionSelectItemSegmentExtractor.java→sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/ExpressionSelectItemExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.item.Expressio 
 *

 * @author zhangliang

 */

public final class ExpressionSelectItemSegmentExtractor implements OptionalSQLSegmentExtractor {

public final class ExpressionSelectItemExtractor implements OptionalSQLSegmentExtractor {

    

    @Override

    public Optional<ExpressionSelectItemSegment> extract(final ParserRuleContext expressionNode) {

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/FunctionSelectItemSegmentExtractor.java→sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/item/FunctionSelectItemExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.item.SelectIte 
 *

 * @author zhangliang

 */

public final class FunctionSelectItemSegmentExtractor implements OptionalSQLSegmentExtractor {

public final class FunctionSelectItemExtractor implements OptionalSQLSegmentExtractor {

    

    @Override

    public Optional<SelectItemSegment> extract(final ParserRuleContext expressionNode) {

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

+5 −5
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ public final class SelectItemExtractor implements OptionalSQLSegmentExtractor { 
    

    private final ShorthandSelectItemExtractor shorthandSelectItemExtractor = new ShorthandSelectItemExtractor();

    

    private final ColumnSelectItemSegmentExtractor columnSelectItemSegmentExtractor = new ColumnSelectItemSegmentExtractor();

    private final ColumnSelectItemExtractor columnSelectItemExtractor = new ColumnSelectItemExtractor();

    

    private final FunctionSelectItemSegmentExtractor functionSelectItemSegmentExtractor = new FunctionSelectItemSegmentExtractor();

    private final FunctionSelectItemExtractor functionSelectItemSegmentExtractor = new FunctionSelectItemExtractor();

    

    private final ExpressionSelectItemSegmentExtractor expressionSelectItemSegmentExtractor = new ExpressionSelectItemSegmentExtractor();

    private final ExpressionSelectItemExtractor expressionSelectItemExtractor = new ExpressionSelectItemExtractor();

    

    private final SubqueryExtractor subqueryExtractor = new SubqueryExtractor();
@@ -47,7 +47,7 @@ public final class SelectItemExtractor implements OptionalSQLSegmentExtractor { 
        if (result.isPresent()) {

            return result;

        }

        result = columnSelectItemSegmentExtractor.extract(expressionNode);

        result = columnSelectItemExtractor.extract(expressionNode);

        if (result.isPresent()) {

            return result;

        }
@@ -55,7 +55,7 @@ public final class SelectItemExtractor implements OptionalSQLSegmentExtractor { 
        if (result.isPresent()) {

            return result;

        }

        result = expressionSelectItemSegmentExtractor.extract(expressionNode);

        result = expressionSelectItemExtractor.extract(expressionNode);

        if (result.isPresent()) {

            return result;

        }