Commit 96f068ff authored by codefairy08's avatar codefairy08
Browse files

Merge branch 'dev' of https://github.com/apache/incubator-shardingsphere into dev_bug_fixs_2211

parents a03aa058 d1ee204d

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

+65 −0
Original line number Diff line number Diff line
@@ -15,20 +15,20 @@ 
 * limitations under the License.

 */



package org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml;

package org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression;



import com.google.common.base.Optional;

import com.google.common.base.Preconditions;

import org.antlr.v4.runtime.ParserRuleContext;

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

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl.CommonExpressionExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl.LiteralExpressionExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl.ParameterMarkerExpressionExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml.select.SubqueryExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.ExtractorUtils;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.RuleName;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.CommonExpressionSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.ExpressionSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.LiteralExpressionSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.ParameterMarkerExpressionSegment;

import org.apache.shardingsphere.core.util.NumberUtil;



import java.util.Map;
@@ -36,62 +36,30 @@ import java.util.Map; 
 * Expression extractor.

 *

 * @author duhongjun

 * @author zhangliang

 */

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));

    }

    private final ParameterMarkerExpressionExtractor parameterMarkerExpressionExtractor = new ParameterMarkerExpressionExtractor();

    

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

        Optional<ParserRuleContext> parameterMarkerNode = ExtractorUtils.findSingleNodeFromFirstDescendant(expressionNode, RuleName.PARAMETER_MARKER);

        if (parameterMarkerNode.isPresent()) {

            Optional<ParameterMarkerExpressionSegment> result = extractParameterMarkerExpressionSegment(parameterMarkerNode.get(), parameterMarkerIndexes);

            Preconditions.checkState(result.isPresent());

            return result.get();

        }

        Optional<ParserRuleContext> literalsNode = ExtractorUtils.findSingleNodeFromFirstDescendant(expressionNode, RuleName.LITERALS);

        return literalsNode.isPresent() ? extractLiteralExpressionSegment(literalsNode.get()) : extractCommonExpressionSegment(expressionNode);

    }

    private final LiteralExpressionExtractor literalExpressionExtractor = new LiteralExpressionExtractor();

    

    /**

     * Extract parameter marker expression segment.

     *

     * @param parameterMarkerIndexes parameter marker indexes

     * @param expressionNode expression node

     * @return parameter marker expression segment

     */

    public Optional<ParameterMarkerExpressionSegment> extractParameterMarkerExpressionSegment(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

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

        return parameterMarkerNode.isPresent()

                ? Optional.of(new ParameterMarkerExpressionSegment(expressionNode.getStart().getStartIndex(), expressionNode.getStop().getStopIndex(),

                parameterMarkerIndexes.get(parameterMarkerNode.get()))) : Optional.<ParameterMarkerExpressionSegment>absent();

    }

    private final CommonExpressionExtractor commonExpressionExtractor = new CommonExpressionExtractor();

    

    /**

     * Extract literal expression segment.

     *

     * @param expressionNode expression node

     * @return literal expression segment

     */

    public LiteralExpressionSegment extractLiteralExpressionSegment(final ParserRuleContext expressionNode) {

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

        Optional<ParserRuleContext> numberLiteralsNode = ExtractorUtils.findFirstChildNode(expressionNode, RuleName.NUMBER_LITERALS);

        if (numberLiteralsNode.isPresent()) {

            result.setLiterals(NumberUtil.getExactlyNumber(numberLiteralsNode.get().getText(), 10));

    @Override

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

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

        if (subqueryNode.isPresent()) {

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

        }

        Optional<ParserRuleContext> stringLiteralsNode = ExtractorUtils.findFirstChildNode(expressionNode, RuleName.STRING_LITERALS);

        if (stringLiteralsNode.isPresent()) {

            String text = stringLiteralsNode.get().getText();

            result.setLiterals(text.substring(1, text.length() - 1));

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

        if (parameterMarkerExpressionSegment.isPresent()) {

            return parameterMarkerExpressionSegment;

        }

        return result;

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

        if (literalExpressionSegment.isPresent()) {

            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 commonExpressionExtractor.extract(expressionNode, parameterMarkerIndexes);

    }

}

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl;



import com.google.common.base.Optional;

import org.antlr.v4.runtime.ParserRuleContext;

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

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.CommonExpressionSegment;



import java.util.Map;



/**

 * Common expression extractor.

 *

 * @author zhangliang

 */

public final class CommonExpressionExtractor implements OptionalSQLSegmentExtractor {

    

    // TODO extract column name and value from expression

    @Override

    public Optional<CommonExpressionSegment> extract(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

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

    }

}

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

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl;



import com.google.common.base.Optional;

import org.antlr.v4.runtime.ParserRuleContext;

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

import org.apache.shardingsphere.core.parse.antlr.extractor.util.ExtractorUtils;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.RuleName;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.LiteralExpressionSegment;

import org.apache.shardingsphere.core.util.NumberUtil;



import java.util.Map;



/**

 * Literal expression extractor.

 *

 * @author zhangliang

 */

public final class LiteralExpressionExtractor implements OptionalSQLSegmentExtractor {

    

    @Override

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

        Optional<ParserRuleContext> literalsNode = ExtractorUtils.findSingleNodeFromFirstDescendant(expressionNode, RuleName.LITERALS);

        return literalsNode.isPresent() 

                ? Optional.of(new LiteralExpressionSegment(literalsNode.get().getStart().getStartIndex(), literalsNode.get().getStop().getStopIndex(), getLiterals(literalsNode.get())))

                : Optional.<LiteralExpressionSegment>absent();

    }

    

    private Object getLiterals(final ParserRuleContext literalsNode) {

        Optional<Number> numberLiterals = getNumberLiterals(literalsNode);

        if (numberLiterals.isPresent()) {

            return numberLiterals.get();

        }

        return getStringLiterals(literalsNode).orNull();

    }

    

    private Optional<Number> getNumberLiterals(final ParserRuleContext literalsNode) {

        Optional<ParserRuleContext> numberLiteralsNode = ExtractorUtils.findFirstChildNode(literalsNode, RuleName.NUMBER_LITERALS);

        return numberLiteralsNode.isPresent() ? Optional.of(NumberUtil.getExactlyNumber(numberLiteralsNode.get().getText(), 10)) : Optional.<Number>absent();

    }

    

    private Optional<String> getStringLiterals(final ParserRuleContext literalsNode) {

        Optional<ParserRuleContext> stringLiteralsNode = ExtractorUtils.findFirstChildNode(literalsNode, RuleName.STRING_LITERALS);

        if (stringLiteralsNode.isPresent()) {

            String text = stringLiteralsNode.get().getText();

            return Optional.of(text.substring(1, text.length() - 1));

        }

        return Optional.absent();

    }

}

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.apache.shardingsphere.core.parse.antlr.extractor.impl.common.expression.impl;



import com.google.common.base.Optional;

import org.antlr.v4.runtime.ParserRuleContext;

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

import org.apache.shardingsphere.core.parse.antlr.extractor.util.ExtractorUtils;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.RuleName;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.ParameterMarkerExpressionSegment;



import java.util.Map;



/**

 * Parameter marker expression extractor.

 *

 * @author zhangliang

 */

public final class ParameterMarkerExpressionExtractor implements OptionalSQLSegmentExtractor {

    

    @Override

    public Optional<ParameterMarkerExpressionSegment> extract(final ParserRuleContext expressionNode, final Map<ParserRuleContext, Integer> parameterMarkerIndexes) {

        Optional<ParserRuleContext> parameterMarkerNode = ExtractorUtils.findSingleNodeFromFirstDescendant(expressionNode, RuleName.PARAMETER_MARKER);

        return parameterMarkerNode.isPresent() ? Optional.of(new ParameterMarkerExpressionSegment(expressionNode.getStop().getStopIndex(), parameterMarkerIndexes.get(parameterMarkerNode.get())))

                : Optional.<ParameterMarkerExpressionSegment>absent();

    }

}

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

+4 −7
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import lombok.RequiredArgsConstructor; 
import org.antlr.v4.runtime.ParserRuleContext;

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.common.expression.ExpressionExtractor;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.ExtractorUtils;

import org.apache.shardingsphere.core.parse.antlr.extractor.util.RuleName;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.assignment.AssignmentSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.column.ColumnSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.ExpressionSegment;

import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.ParameterMarkerExpressionSegment;



import java.util.Map;
@@ -51,11 +51,8 @@ public final class AssignmentExtractor implements OptionalSQLSegmentExtractor { 
            return Optional.absent();

        }

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

        Preconditions.checkState(columnSegment.isPresent());

        Optional<ParameterMarkerExpressionSegment> parameterMarkerExpressionSegment = expressionExtractor.extractParameterMarkerExpressionSegment(

                (ParserRuleContext) assignmentNode.get().getChild(2), parameterMarkerIndexes);

        ExpressionSegment expressionSegment = parameterMarkerExpressionSegment.isPresent()

                ? parameterMarkerExpressionSegment.get() : expressionExtractor.extractLiteralExpressionSegment((ParserRuleContext) assignmentNode.get().getChild(2));

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

        Optional<? extends ExpressionSegment> expressionSegment = expressionExtractor.extract((ParserRuleContext) assignmentNode.get().getChild(2), parameterMarkerIndexes);

        Preconditions.checkState(columnSegment.isPresent() && expressionSegment.isPresent());

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

    }

}