You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/10/06 01:42:54 UTC
git commit: minor StringBuilder cleanups
Updated Branches:
refs/heads/trunk 89428ae26 -> 8d9b5fdae
minor StringBuilder cleanups
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d9b5fda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d9b5fda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d9b5fda
Branch: refs/heads/trunk
Commit: 8d9b5fdaedcd06462882212781fe8d86f34c4c44
Parents: 89428ae
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Oct 5 19:42:29 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Oct 5 19:42:29 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliClient.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d9b5fda/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index cf6c9d5..f6306dc 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -628,9 +628,8 @@ public class CliClient
}
catch (RequestValidationException ce)
{
- StringBuilder errorMessage = new StringBuilder("Unknown comparator '" + compareWith + "'. ");
- errorMessage.append("Available functions: ");
- throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString(), e);
+ String message = String.format("Unknown comparator '%s'. Available functions: %s", compareWith, Function.getFunctionNames());
+ throw new RuntimeException(message, e);
}
}
@@ -1766,7 +1765,7 @@ public class CliClient
String prefix = "";
for (Map.Entry<String, String> opt : ksDef.strategy_options.entrySet())
{
- opts.append(prefix + CliUtils.escapeSQLString(opt.getKey()) + " : " + CliUtils.escapeSQLString(opt.getValue()));
+ opts.append(prefix).append(CliUtils.escapeSQLString(opt.getKey())).append(" : ").append(CliUtils.escapeSQLString(opt.getValue()));
prefix = ", ";
}
opts.append("}");
@@ -1778,7 +1777,7 @@ public class CliClient
output.append(";").append(NEWLINE);
output.append(NEWLINE);
- output.append("use " + CliUtils.maybeEscapeName(ksDef.name) + ";");
+ output.append("use ").append(CliUtils.maybeEscapeName(ksDef.name)).append(";");
output.append(NEWLINE);
output.append(NEWLINE);
@@ -2828,9 +2827,8 @@ public class CliClient
}
catch (IllegalArgumentException e)
{
- StringBuilder errorMessage = new StringBuilder("Function '" + functionName + "' not found. ");
- errorMessage.append("Available functions: ");
- throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString(), e);
+ String message = String.format("Function '%s' not found. Available functions: %", functionName, Function.getFunctionNames());
+ throw new RuntimeException(message, e);
}
return function.getValidator();