for #2084, remove useless ExpressionSegment.getStartIndex (b496545f) · Commits · SUMMER2020 / students / proj-2004142

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,8 @@ public final class ExpressionExtractor implements OptionalSQLSegmentExtractor {
		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();
		? Optional.of(new ParameterMarkerExpressionSegment(expressionNode.getStop().getStopIndex(), parameterMarkerIndexes.get(parameterMarkerNode.get())))
		: Optional.<ParameterMarkerExpressionSegment>absent();
		}

		/**

+0 −7

Original line number	Diff line number	Diff line
		@@ -27,13 +27,6 @@ import org.apache.shardingsphere.core.parse.old.parser.expression.SQLExpression;
		*/
		public interface ExpressionSegment extends SQLSegment {

		/**
		* Get start index.
		*
		* @return start index
		*/
		int getStartIndex();

		/**
		* Get stop index.
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@ import org.apache.shardingsphere.core.parse.old.parser.expression.SQLPlaceholder
		@Getter
		public final class ParameterMarkerExpressionSegment implements ExpressionSegment {

		private final int startIndex;

		private final int stopIndex;

		private final int parameterMarkerIndex;

+1 −10

Original line number	Diff line number	Diff line
		@@ -66,15 +66,6 @@ public final class SubquerySegment implements SelectItemSegment, ExpressionSegme
		return Optional.fromNullable(selectItemsSegment);
		}

		/**
		* Get from where segment.
		*
		* @return from where segment
		*/
		public Optional<WhereSegment> getWhereSegment() {
		return Optional.fromNullable(whereSegment);
		}

		/**
		* Get group by segment.
		*
		@@ -105,6 +96,6 @@ public final class SubquerySegment implements SelectItemSegment, ExpressionSegme

		@Override
		public SQLExpression getSQLExpression(final String sql) {
		return new SQLIgnoreExpression(sql.substring(startIndex, startIndex + 1));
		return new SQLIgnoreExpression(sql.substring(startIndex, stopIndex + 1));
		}
		}