This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 f84c5dd Replace String format with concat in high frequency code
(#16021)
f84c5dd is described below
commit f84c5dd0b4fcd58eb789d64e0cc37059a3389dfb
Author: 吴伟杰 <[email protected]>
AuthorDate: Sat Mar 12 16:31:36 2022 +0800
Replace String format with concat in high frequency code (#16021)
---
.../row/column/value/time/MySQLDatetime2BinlogProtocolValue.java | 2 +-
.../token/generator/EncryptInsertOnUpdateTokenGenerator.java | 6 +++---
.../encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java | 4 ++--
.../encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java | 2 +-
.../rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java | 2 +-
.../sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java | 2 +-
.../sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java | 2 +-
.../rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java | 2 +-
.../sql/token/pojo/generic/UseDefaultInsertColumnsToken.java | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/time/MySQLDatetime2BinlogProtocolValue.java
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/time/MySQLDatetime2BinlogProtocolValue.java
index 0e11b8d..09f6402 100644
---
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/time/MySQLDatetime2BinlogProtocolValue.java
+++
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/time/MySQLDatetime2BinlogProtocolValue.java
@@ -46,7 +46,7 @@ public final class MySQLDatetime2BinlogProtocolValue
implements MySQLBinlogProto
private Serializable readDatetime(final MySQLBinlogColumnDef columnDef,
final long datetime, final MySQLPacketPayload payload) {
long datetimeWithoutSign = datetime & (0x8000000000L - 1);
- return String.format("%s %s%s", readDate(datetimeWithoutSign >> 17),
readTime(datetimeWithoutSign % (1 << 17)), new
MySQLFractionalSeconds(columnDef.getColumnMeta(), payload));
+ return readDate(datetimeWithoutSign >> 17) + " " +
readTime(datetimeWithoutSign % (1 << 17)) + new
MySQLFractionalSeconds(columnDef.getColumnMeta(), payload);
}
private String readDate(final long date) {
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertOnUpdateTokenGenerator.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertOnUpdateTokenGenerator.java
index 1d0395b..0da4f76 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertOnUpdateTokenGenerator.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptInsertOnUpdateTokenGenerator.java
@@ -129,21 +129,21 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
if (cipherColumnPresent && cipherValueColumnPresent) {
String cipherColumn = encryptRule.getCipherColumn(tableName,
column);
String cipherValueColumn = encryptRule.getCipherColumn(tableName,
valueColumn);
- result.addAssignment(cipherColumn, String.format("VALUES(%s)",
cipherValueColumn));
+ result.addAssignment(cipherColumn, "VALUES(" + cipherValueColumn +
")");
} else if (cipherColumnPresent != cipherValueColumnPresent) {
throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
}
Optional<String> assistedQueryColumn =
encryptRule.findAssistedQueryColumn(tableName, column);
Optional<String> valueAssistedQueryColumn =
encryptRule.findAssistedQueryColumn(tableName, valueColumn);
if (assistedQueryColumn.isPresent() &&
valueAssistedQueryColumn.isPresent()) {
- result.addAssignment(assistedQueryColumn.get(),
String.format("VALUES(%s)", valueAssistedQueryColumn.get()));
+ result.addAssignment(assistedQueryColumn.get(), "VALUES(" +
valueAssistedQueryColumn.get() + ")");
} else if (assistedQueryColumn.isPresent() !=
valueAssistedQueryColumn.isPresent()) {
throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
}
Optional<String> plainColumn = encryptRule.findPlainColumn(tableName,
column);
Optional<String> valuePlainColumn =
encryptRule.findPlainColumn(tableName, valueColumn);
if (plainColumn.isPresent() && valuePlainColumn.isPresent()) {
- result.addAssignment(plainColumn.get(),
String.format("VALUES(%s)", valuePlainColumn.get()));
+ result.addAssignment(plainColumn.get(), "VALUES(" +
valuePlainColumn.get() + ")");
} else if (plainColumn.isPresent() != valuePlainColumn.isPresent()) {
throw new ShardingSphereException("The SQL clause `%s` is
unsupported in encrypt rule.", String.format("%s=VALUES(%s)", column,
valueColumn));
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java
index 625b0c8..2ca4849 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java
@@ -58,11 +58,11 @@ public final class EncryptLiteralAssignmentToken extends
EncryptAssignmentToken
@Override
public String toString() {
- return String.format("%s = %s", columnName, toString(value));
+ return columnName + " = " + toString(value);
}
private String toString(final Object value) {
- return String.class == value.getClass() ? String.format("'%s'",
value) : value.toString();
+ return value instanceof String ? "'" + value + "'" :
value.toString();
}
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java
index 04f4686..508b0c5 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java
@@ -45,7 +45,7 @@ public final class EncryptParameterAssignmentToken extends
EncryptAssignmentToke
@Override
public String toString() {
- Collection<String> items = Collections2.transform(columnNames, input
-> String.format("%s = ?", input));
+ Collection<String> items = Collections2.transform(columnNames, input
-> input + " = ?");
return Joiner.on(", ").join(items);
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
index b3a0584..a0e40a0 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
@@ -48,7 +48,7 @@ public final class EncryptPredicateEqualRightValueToken
extends SQLToken impleme
@Override
public String toString() {
if (parameterMarkerIndexes.isEmpty()) {
- return indexValues.get(0) instanceof String ?
String.format("'%s'", indexValues.get(0)) : indexValues.get(0).toString();
+ return indexValues.get(0) instanceof String ? "'" +
indexValues.get(0) + "'" : indexValues.get(0).toString();
}
return "?";
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
index d54d2f5..a60b86c 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
@@ -34,7 +34,7 @@ public abstract class GeneratedKeyAssignmentToken extends
SQLToken implements At
@Override
public final String toString() {
- return String.format(", %s = %s", columnName, getRightValue());
+ return ", " + columnName + " = " + getRightValue();
}
protected abstract String getRightValue();
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
index 9a8ec8e..b1a046b 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
@@ -34,6 +34,6 @@ public final class GeneratedKeyInsertColumnToken extends
SQLToken implements Att
@Override
public String toString() {
- return String.format(", %s", column);
+ return ", " + column;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
index 70e403d..094afa1 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
@@ -31,6 +31,6 @@ public final class LiteralGeneratedKeyAssignmentToken extends
GeneratedKeyAssign
@Override
protected String getRightValue() {
- return value instanceof String ? String.format("'%s'", value) :
value.toString();
+ return value instanceof String ? "'" + value + "'" : value.toString();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/UseDefaultInsertColumnsToken.java
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/UseDefaultInsertColumnsToken.java
index efc3b0c..5d2e5f2 100644
---
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/UseDefaultInsertColumnsToken.java
+++
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/UseDefaultInsertColumnsToken.java
@@ -39,6 +39,6 @@ public final class UseDefaultInsertColumnsToken extends
SQLToken implements Atta
@Override
public String toString() {
- return columns.isEmpty() ? "" : String.format("(%s)", Joiner.on(",
").join(columns));
+ return columns.isEmpty() ? "" : "(" + Joiner.on(", ").join(columns) +
")";
}
}
