Replace String.format with String concat

Replaces simple String.format usages in non-exceptional code paths with simple string concatenations where applicable.
trinodb · Mar 27, 2023 · 4f8985c · 4f8985c
1 parent f6a8e1c
commit 4f8985c
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 45 deletions.
diff --git a/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java b/client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java
@@ -31,7 +31,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.client.ClientStandardTypes.ROW;
 import static io.trino.client.ClientStandardTypes.VARCHAR;
-import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
@@ -104,20 +103,18 @@ public String toString()
     @Deprecated
     private String rowToString()
     {
-        String fields = arguments.stream()
+        if (arguments.isEmpty()) {
+            return "row";
+        }
+        return arguments.stream()
                 .map(ClientTypeSignatureParameter::getNamedTypeSignature)
                 .map(parameter -> {
                     if (parameter.getName().isPresent()) {
-                        return format("%s %s", parameter.getName().get(), parameter.getTypeSignature());
+                        return parameter.getName().get() + " " + parameter.getTypeSignature();
                     }
                     return parameter.getTypeSignature().toString();
                 })
-                .collect(joining(","));
-
-        if (fields.isEmpty()) {
-            return "row";
-        }
-        return format("row(%s)", fields);
+                .collect(joining(",", "row(", ")"));
     }
 
     @Override

diff --git a/client/trino-client/src/main/java/io/trino/client/NamedClientTypeSignature.java b/client/trino-client/src/main/java/io/trino/client/NamedClientTypeSignature.java
@@ -19,7 +19,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class NamedClientTypeSignature
@@ -73,7 +72,7 @@ public boolean equals(Object o)
     public String toString()
     {
         if (fieldName.isPresent()) {
-            return format("%s %s", fieldName.get(), typeSignature);
+            return fieldName.get() + " " + typeSignature;
         }
         return typeSignature.toString();
     }

diff --git a/client/trino-client/src/main/java/io/trino/client/Row.java b/client/trino-client/src/main/java/io/trino/client/Row.java
@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 
@@ -64,7 +63,7 @@ public String toString()
         return fields.stream()
                 .map(field -> {
                     if (field.getName().isPresent()) {
-                        return format("%s=%s", field.getName().get(), field.getValue());
+                        return field.getName().get() + "=" + field.getValue();
                     }
                     return String.valueOf(field.getValue());
                 })

diff --git a/client/trino-client/src/main/java/io/trino/client/Warning.java b/client/trino-client/src/main/java/io/trino/client/Warning.java
@@ -18,7 +18,6 @@
 
 import java.util.Objects;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public final class Warning
@@ -70,7 +69,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-        return format("%s, %s", warningCode, message);
+        return warningCode + ", " + message;
     }
 
     public static final class Code

diff --git a/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java b/client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java
@@ -122,7 +122,7 @@ private Request authenticate(Request request)
         String principal = makeServicePrincipal(servicePrincipalPattern, remoteServiceName, hostName, useCanonicalHostname);
         byte[] token = generateToken(principal);
 
-        String credential = format("%s %s", NEGOTIATE, Base64.getEncoder().encodeToString(token));
+        String credential = NEGOTIATE + " " + Base64.getEncoder().encodeToString(token);
         return request.newBuilder()
                 .header(AUTHORIZATION, credential)
                 .build();

diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
@@ -1293,7 +1293,9 @@ else if (node.getArguments().size() > 127) {
             for (int i = 0; i < argumentTypes.size(); i++) {
                 Expression expression = node.getArguments().get(i);
                 Type expectedType = signature.getArgumentTypes().get(i);
-                requireNonNull(expectedType, format("Type '%s' not found", signature.getArgumentTypes().get(i)));
+                if (expectedType == null) {
+                    throw new NullPointerException(format("Type '%s' not found", signature.getArgumentTypes().get(i)));
+                }
                 if (node.isDistinct() && !expectedType.isComparable()) {
                     throw semanticException(TYPE_MISMATCH, node, "DISTINCT can only be applied to comparable types (actual: %s)", expectedType);
                 }

diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/AndCodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/AndCodeGenerator.java
@@ -25,7 +25,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class AndCodeGenerator
@@ -58,7 +57,7 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generator)
             RowExpression term = terms.get(i);
             block.append(generator.generate(term));
 
-            IfStatement ifWasNull = new IfStatement(format("if term %s wasNull...", i))
+            IfStatement ifWasNull = new IfStatement("if term " + i + " wasNull...")
                     .condition(wasNull);
 
             ifWasNull.ifTrue()

diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java b/core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java
@@ -111,7 +111,7 @@ public static BytecodeNode handleNullValue(
 
         isNull.pushJavaDefault(returnType);
         String loadDefaultComment;
-        loadDefaultComment = format("loadJavaDefault(%s)", returnType.getName());
+        loadDefaultComment = "loadJavaDefault(" + returnType.getName() + ")";
 
         isNull.gotoLabel(label);
 

diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/OrCodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/OrCodeGenerator.java
@@ -25,7 +25,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class OrCodeGenerator
@@ -57,7 +56,7 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generator)
             RowExpression term = terms.get(i);
             block.append(generator.generate(term));
 
-            IfStatement ifWasNull = new IfStatement(format("if term %s wasNull...", i))
+            IfStatement ifWasNull = new IfStatement("if term " + i + " wasNull...")
                     .condition(wasNull);
 
             ifWasNull.ifTrue()

diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java
@@ -246,7 +246,9 @@ public Plan plan(Analysis analysis, Stage stage, boolean collectPlanStatistics)
         if (stage.ordinal() >= OPTIMIZED.ordinal()) {
             for (PlanOptimizer optimizer : planOptimizers) {
                 root = optimizer.optimize(root, session, symbolAllocator.getTypes(), symbolAllocator, idAllocator, warningCollector, tableStatsProvider);
-                requireNonNull(root, format("%s returned a null plan", optimizer.getClass().getName()));
+                if (root == null) {
+                    throw new NullPointerException(optimizer.getClass().getName() + " returned a null plan");
+                }
 
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("%s:\n%s", optimizer.getClass().getName(), PlanPrinter.textLogicalPlan(
@@ -545,9 +547,7 @@ private RelationPlan getInsertPlan(
 
     private Expression createNullNotAllowedFailExpression(String columnName, Type type)
     {
-        return new Cast(failFunction(metadata, session, CONSTRAINT_VIOLATION, format(
-                "NULL value not allowed for NOT NULL column: %s",
-                columnName)), toSqlType(type));
+        return new Cast(failFunction(metadata, session, CONSTRAINT_VIOLATION, "NULL value not allowed for NOT NULL column: " + columnName), toSqlType(type));
     }
 
     private static Function<Expression, Expression> failIfPredicateIsNotMet(Metadata metadata, Session session, ErrorCodeSupplier errorCode, String errorMessage)

diff --git a/core/trino-main/src/main/java/io/trino/type/TypeUtils.java b/core/trino-main/src/main/java/io/trino/type/TypeUtils.java
@@ -13,7 +13,6 @@
  */
 package io.trino.type;
 
-import com.google.common.base.Joiner;
 import io.trino.spi.TrinoException;
 import io.trino.spi.type.ArrayType;
 import io.trino.spi.type.CharType;
@@ -28,14 +27,11 @@
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
 
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.trino.spi.type.StandardTypes.ARRAY;
 import static io.trino.spi.type.StandardTypes.MAP;
 import static io.trino.spi.type.StandardTypes.ROW;
-import static java.lang.String.format;
+import static java.util.stream.Collectors.joining;
 
 public final class TypeUtils
 {
@@ -107,16 +103,14 @@ private static String getDisplayLabelForLegacyClients(Type type)
 
     private static String getRowDisplayLabelForLegacyClients(RowType type)
     {
-        List<String> fields = type.getFields().stream()
+        return type.getFields().stream()
                 .map(field -> {
                     String typeDisplayName = getDisplayLabelForLegacyClients(field.getType());
                     if (field.getName().isPresent()) {
                         return field.getName().get() + ' ' + typeDisplayName;
                     }
                     return typeDisplayName;
                 })
-                .collect(toImmutableList());
-
-        return format("%s(%s)", ROW, Joiner.on(", ").join(fields));
+                .collect(joining(", ", ROW + "(", ")"));
     }
 }
diff --git a/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java b/core/trino-parser/src/main/java/io/trino/sql/SqlFormatter.java
@@ -154,7 +154,6 @@
 import static io.trino.sql.ExpressionFormatter.formatStringLiteral;
 import static io.trino.sql.ExpressionFormatter.formatWindowSpecification;
 import static io.trino.sql.RowPatternFormatter.formatPattern;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 
@@ -1343,10 +1342,9 @@ protected Void visitCreateTableAsSelect(CreateTableAsSelect node, Integer indent
             builder.append(formatName(node.getName()));
 
             node.getColumnAliases().ifPresent(columnAliases -> {
-                String columnList = columnAliases.stream()
+                builder.append(columnAliases.stream()
                         .map(SqlFormatter::formatName)
-                        .collect(joining(", "));
-                builder.append(format("( %s )", columnList));
+                        .collect(joining(", ", "( ", " )")));
             });
 
             node.getComment().ifPresent(comment -> builder
@@ -1469,7 +1467,7 @@ private static String formatPrincipal(PrincipalSpecification principal)
                     return principal.getName().toString();
                 case USER:
                 case ROLE:
-                    return format("%s %s", type.name(), principal.getName());
+                    return type.name() + " " + principal.getName();
             }
             throw new IllegalArgumentException("Unsupported principal type: " + type);
         }

diff --git a/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java b/core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java
@@ -3468,7 +3468,9 @@ else if (isHexDigit(ch)) {
                         }
                         else {
                             char currentCodePoint = (char) codePoint;
-                            check(!Character.isSurrogate(currentCodePoint), format("Invalid escaped character: %s. Escaped character is a surrogate. Use '\\+123456' instead.", currentEscapedCode), context);
+                            if (Character.isSurrogate(currentCodePoint)) {
+                                throw parseError(format("Invalid escaped character: %s. Escaped character is a surrogate. Use '\\+123456' instead.", currentEscapedCode), context);
+                            }
                             unicodeStringBuilder.append(currentCodePoint);
                         }
                         state = UnicodeDecodeState.EMPTY;

diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/PathElement.java b/core/trino-parser/src/main/java/io/trino/sql/tree/PathElement.java
@@ -20,7 +20,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public final class PathElement
@@ -98,7 +97,7 @@ public int hashCode()
     public String toString()
     {
         if (catalog.isPresent()) {
-            return format("%s.%s", catalog.get(), schema);
+            return catalog.get() + "." + schema;
         }
         return schema.toString();
     }

diff --git a/core/trino-parser/src/main/java/io/trino/sql/tree/UpdateAssignment.java b/core/trino-parser/src/main/java/io/trino/sql/tree/UpdateAssignment.java
@@ -19,7 +19,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 public class UpdateAssignment
@@ -90,6 +89,6 @@ public int hashCode()
     @Override
     public String toString()
     {
-        return format("%s = %s", name, value);
+        return name + " = " + value;
     }
 }