This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ed925605923 Remove IdentifierValue.getQuotedContent() (#33757)
ed925605923 is described below
commit ed9256059230080c6ac1b541fffeb16ad96b3edd
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Nov 21 16:46:55 2024 +0800
Remove IdentifierValue.getQuotedContent() (#33757)
---
.../statement/core/value/identifier/IdentifierValue.java | 11 -----------
.../statement/core/value/identifier/IdentifierValueTest.java | 12 ------------
.../command/query/simple/OpenGaussComQueryExecutor.java | 4 ++--
.../frontend/postgresql/command/query/extended/Portal.java | 4 ++--
.../command/query/simple/PostgreSQLComQueryExecutor.java | 4 ++--
5 files changed, 6 insertions(+), 29 deletions(-)
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java
index beed7c43aa8..1fc968a366b 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sql.parser.statement.core.value.identifier;
-import com.google.common.base.Strings;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -55,14 +54,4 @@ public final class IdentifierValue implements
ValueASTNode<String> {
public String getValueWithQuoteCharacters() {
return null == value ? "" : quoteCharacter.wrap(value);
}
-
- /**
- * Get quoted content.
- *
- * @param text text
- * @return quote content
- */
- public static String getQuotedContent(final String text) {
- return Strings.isNullOrEmpty(text) ? text :
QuoteCharacter.unwrapAndTrimText(text);
- }
}
diff --git
a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java
b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java
index f7ce8802bb8..d0e30925c3e 100644
---
a/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java
+++
b/parser/sql/statement/core/src/test/java/org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java
@@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
class IdentifierValueTest {
@@ -65,15 +64,4 @@ class IdentifierValueTest {
String text = "[foo]";
assertThat(new IdentifierValue(text).getValueWithQuoteCharacters(),
is("[foo]"));
}
-
- @Test
- void assertGetQuotedContentWithNullValue() {
- assertNull(IdentifierValue.getQuotedContent(null));
- }
-
- @Test
- void assertGetQuotedContent() {
- assertThat(IdentifierValue.getQuotedContent(" foo "), is("foo"));
- assertThat(IdentifierValue.getQuotedContent("`foo`"), is("foo"));
- }
}
diff --git
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
index 604f07a431a..05518060ee6 100644
---
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
+++
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
@@ -27,6 +27,7 @@ import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.Pos
import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.simple.PostgreSQLComQueryPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQLCommandCompletePacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.PostgreSQLParameterStatusPacket;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
@@ -47,7 +48,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.EmptySt
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.SetStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -114,7 +114,7 @@ public final class OpenGaussComQueryExecutor implements
QueryCommandExecutor {
Collection<DatabasePacket> result = new ArrayList<>(2);
result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
- result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
+ result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(), null ==
each.getAssignValue() ? null :
QuoteCharacter.unwrapText(each.getAssignValue())));
}
return result;
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
index 7761697e585..1597a147f41 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
@@ -36,6 +36,7 @@ import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.Postgre
import
org.apache.shardingsphere.db.protocol.postgresql.packet.identifier.PostgreSQLIdentifierPacket;
import org.apache.shardingsphere.infra.binder.context.aware.ParameterAware;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import
org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
@@ -53,7 +54,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.VariableA
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.EmptyStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.SetStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -162,7 +162,7 @@ public final class Portal {
List<PostgreSQLPacket> result = new ArrayList<>(2);
result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
- result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
+ result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(), null ==
each.getAssignValue() ? null :
QuoteCharacter.unwrapText(each.getAssignValue())));
}
return result;
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
index 3d20c16d55e..cd911001769 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
@@ -27,6 +27,7 @@ import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.Pos
import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.simple.PostgreSQLComQueryPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQLCommandCompletePacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.PostgreSQLParameterStatusPacket;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
@@ -47,7 +48,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.EmptySt
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.SetStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -114,7 +114,7 @@ public final class PostgreSQLComQueryExecutor implements
QueryCommandExecutor {
Collection<DatabasePacket> result = new ArrayList<>(2);
result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
- result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
+ result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(), null ==
each.getAssignValue() ? null :
QuoteCharacter.unwrapText(each.getAssignValue())));
}
return result;
}
