From 116c60d3d4d66f039b6d456d80dbe6fdc879ce92 Mon Sep 17 00:00:00 2001 From: niu niu Date: Tue, 5 Dec 2023 18:47:21 +0800 Subject: [PATCH] Rename xmlNamespacesClause define --- .../main/antlr4/imports/oracle/BaseRule.g4 | 8 +++--- .../antlr4/imports/oracle/DDLStatement.g4 | 4 +-- .../statement/OracleStatementVisitor.java | 26 +++++++++---------- ...mlNamespaceStringAsIdentifierSegment.java} | 8 +++--- ...t.java => XmlNamespacesClauseSegment.java} | 6 ++--- .../oracle/xml/XmlTableFunctionSegment.java | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) rename parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/{XmlNameSpaceStringAsIdentifierSegment.java => XmlNamespaceStringAsIdentifierSegment.java} (85%) rename parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/{XmlNameSpacesClauseSegment.java => XmlNamespacesClauseSegment.java} (89%) diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4 index cb285ac74feef..e11ae2d0bc6cf 100644 --- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4 +++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4 @@ -2042,18 +2042,18 @@ xmlSerializeFunction ; xmlTableFunction - : XMLTABLE LP_ (xmlNameSpacesClause COMMA_)? STRING_ xmlTableOptions RP_ + : XMLTABLE LP_ (xmlNamespacesClause COMMA_)? STRING_ xmlTableOptions RP_ ; xmlIsSchemaValidFunction : (owner DOT_)* name DOT_ ISSCHEMAVALID LP_ expr (COMMA_ expr)* RP_ ; -xmlNameSpacesClause - : XMLNAMESPACES LP_ (defaultString COMMA_)? (xmlNameSpaceStringAsIdentifier | defaultString) (COMMA_ (xmlNameSpaceStringAsIdentifier | defaultString))* RP_ +xmlNamespacesClause + : XMLNAMESPACES LP_ (defaultString COMMA_)? (xmlNamespaceStringAsIdentifier | defaultString) (COMMA_ (xmlNamespaceStringAsIdentifier | defaultString))* RP_ ; -xmlNameSpaceStringAsIdentifier +xmlNamespaceStringAsIdentifier : STRING_ AS identifier ; diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 index 2c0f6d6b40772..93ac702ad6c9a 100644 --- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 +++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 @@ -520,7 +520,7 @@ groupsClause xmlIndexXmltableClause : XMLTABLE identifier (LP_ segmentAttributesClause tableCompression? inmemoryTableClause? tableProperties RP_)? - ( xmlNameSpacesClause COMMA_)? xQueryString=STRING_ (PASSING identifier)? COLUMNS columnClause (COMMA_ columnClause)* + ( xmlNamespacesClause COMMA_)? xQueryString=STRING_ (PASSING identifier)? COLUMNS columnClause (COMMA_ columnClause)* ; columnClause @@ -534,7 +534,7 @@ alterIndexGroupClause ; addColumnOptions - : (GROUP identifier)? XMLTABLE identifier (xmlNameSpacesClause COMMA_)? COLUMNS columnClause (COMMA_ columnClause)* + : (GROUP identifier)? XMLTABLE identifier (xmlNamespacesClause COMMA_)? COLUMNS columnClause (COMMA_ columnClause)* ; dropColumnOptions diff --git a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java index 7b375b5e28a4a..5f9c266aa2a62 100644 --- a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java +++ b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java @@ -94,8 +94,8 @@ import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlForestFunctionContext; import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlFunctionContext; import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlIsSchemaValidFunctionContext; -import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNameSpaceStringAsIdentifierContext; -import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNameSpacesClauseContext; +import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNamespaceStringAsIdentifierContext; +import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNamespacesClauseContext; import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlParseFunctionContext; import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlPiFunctionContext; import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlQueryFunctionContext; @@ -127,8 +127,8 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.multiset.MultisetExpression; import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.NotExpression; import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlElementFunctionSegment; -import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNameSpaceStringAsIdentifierSegment; -import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNameSpacesClauseSegment; +import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNamespaceStringAsIdentifierSegment; +import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNamespacesClauseSegment; import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlPiFunctionSegment; import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlQueryAndExistsFunctionSegment; import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlSerializeFunctionSegment; @@ -874,25 +874,25 @@ public ASTNode visitXmlSerializeFunction(final XmlSerializeFunctionContext ctx) @Override public ASTNode visitXmlTableFunction(final XmlTableFunctionContext ctx) { - XmlNameSpacesClauseSegment xmlNameSpacesClause = null == ctx.xmlNameSpacesClause() ? null : (XmlNameSpacesClauseSegment) visit(ctx.xmlNameSpacesClause()); + XmlNamespacesClauseSegment xmlNamespacesClause = null == ctx.xmlNamespacesClause() ? null : (XmlNamespacesClauseSegment) visit(ctx.xmlNamespacesClause()); return new XmlTableFunctionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.XMLTABLE().getText(), - xmlNameSpacesClause, ctx.STRING_().getText(), (XmlTableOptionsSegment) visit(ctx.xmlTableOptions()), getOriginalText(ctx)); + xmlNamespacesClause, ctx.STRING_().getText(), (XmlTableOptionsSegment) visit(ctx.xmlTableOptions()), getOriginalText(ctx)); } @Override - public ASTNode visitXmlNameSpacesClause(final XmlNameSpacesClauseContext ctx) { + public ASTNode visitXmlNamespacesClause(final XmlNamespacesClauseContext ctx) { // TODO : throw exception if more than one defaultString exists in a xml name space clause String defaultString = null == ctx.defaultString() ? null : ctx.defaultString(0).STRING_().getText(); - Collection xmlNameSpaceStringAsIdentifierSegments = null == ctx.xmlNameSpaceStringAsIdentifier() ? Collections.emptyList() - : ctx.xmlNameSpaceStringAsIdentifier().stream().map(each -> (XmlNameSpaceStringAsIdentifierSegment) visit(each)).collect(Collectors.toList()); - XmlNameSpacesClauseSegment result = new XmlNameSpacesClauseSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), defaultString, getOriginalText(ctx)); - result.getStringAsIdentifier().addAll(xmlNameSpaceStringAsIdentifierSegments); + Collection xmlNamespaceStringAsIdentifierSegments = null == ctx.xmlNamespaceStringAsIdentifier() ? Collections.emptyList() + : ctx.xmlNamespaceStringAsIdentifier().stream().map(each -> (XmlNamespaceStringAsIdentifierSegment) visit(each)).collect(Collectors.toList()); + XmlNamespacesClauseSegment result = new XmlNamespacesClauseSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), defaultString, getOriginalText(ctx)); + result.getStringAsIdentifier().addAll(xmlNamespaceStringAsIdentifierSegments); return result; } @Override - public ASTNode visitXmlNameSpaceStringAsIdentifier(final XmlNameSpaceStringAsIdentifierContext ctx) { - return new XmlNameSpaceStringAsIdentifierSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.STRING_().getText(), ctx.identifier().getText(), getOriginalText(ctx)); + public ASTNode visitXmlNamespaceStringAsIdentifier(final XmlNamespaceStringAsIdentifierContext ctx) { + return new XmlNamespaceStringAsIdentifierSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.STRING_().getText(), ctx.identifier().getText(), getOriginalText(ctx)); } @Override diff --git a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpaceStringAsIdentifierSegment.java b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespaceStringAsIdentifierSegment.java similarity index 85% rename from parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpaceStringAsIdentifierSegment.java rename to parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespaceStringAsIdentifierSegment.java index 75eac47e6b49d..07d80ad9a2817 100644 --- a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpaceStringAsIdentifierSegment.java +++ b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespaceStringAsIdentifierSegment.java @@ -22,19 +22,19 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.complex.ComplexExpressionSegment; /** - * Xml name spaces string as identifier segment. + * Xml namespaces string as identifier segment. */ @RequiredArgsConstructor @Getter -public final class XmlNameSpaceStringAsIdentifierSegment implements ComplexExpressionSegment { +public final class XmlNamespaceStringAsIdentifierSegment implements ComplexExpressionSegment { private final int startIndex; private final int stopIndex; - private final String xmlNameSpaceString; + private final String xmlNamespaceString; - private final String xmlNameSpaceIdentifier; + private final String xmlNamespaceIdentifier; private final String text; } diff --git a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpacesClauseSegment.java b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespacesClauseSegment.java similarity index 89% rename from parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpacesClauseSegment.java rename to parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespacesClauseSegment.java index b7f8e17bf8155..c97e7fa5a2ca4 100644 --- a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNameSpacesClauseSegment.java +++ b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlNamespacesClauseSegment.java @@ -25,11 +25,11 @@ import java.util.LinkedList; /** - * Xml name spaces segment. + * Xml namespaces segment. */ @RequiredArgsConstructor @Getter -public final class XmlNameSpacesClauseSegment implements ComplexExpressionSegment { +public final class XmlNamespacesClauseSegment implements ComplexExpressionSegment { private final int startIndex; @@ -37,7 +37,7 @@ public final class XmlNameSpacesClauseSegment implements ComplexExpressionSegmen private final String defaultString; - private final Collection stringAsIdentifier = new LinkedList<>(); + private final Collection stringAsIdentifier = new LinkedList<>(); private final String text; } diff --git a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlTableFunctionSegment.java b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlTableFunctionSegment.java index d3d8c4a76d2d1..d5fa4b75ba39d 100644 --- a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlTableFunctionSegment.java +++ b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlTableFunctionSegment.java @@ -35,7 +35,7 @@ public final class XmlTableFunctionSegment implements ComplexExpressionSegment, private final String functionName; - private final XmlNameSpacesClauseSegment xmlNameSpacesClause; + private final XmlNamespacesClauseSegment xmlNamespacesClause; private final String xQueryString;