OODT-888 replace =+ with StringBuilder to improve concat performance
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/e1669443 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/e1669443 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/e1669443 Branch: refs/heads/master Commit: e1669443cf8917e3d3a061c0d06f2ec1c55141e4 Parents: ef02b60 Author: Tom Barber <[email protected]> Authored: Sat Oct 10 14:18:24 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Sat Oct 10 14:18:24 2015 +0100 ---------------------------------------------------------------------- .../catalog/query/FreeTextQueryExpression.java | 12 ++++--- .../cas/catalog/query/QueryLogicalGroup.java | 12 ++++--- .../catalog/query/parser/ParseException.java | 34 +++++++++++--------- 3 files changed, 32 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/e1669443/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java index 88278fc..12af21c 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java @@ -81,11 +81,13 @@ public class FreeTextQueryExpression extends TermQueryExpression { * @return The query as a String. */ public String toString() { - String serial = "({" + this.bucketNames + "} " + this.term.getName() + " :|"; - for (String value : this.term.getValues()) - serial += "+" + value; - serial += "|: )"; - return serial; + StringBuilder serial = new StringBuilder(); + serial.append("({" + this.bucketNames + "} " + this.term.getName() + " :|"); + for (String value : this.term.getValues()) { + serial.append("+" + value); + serial.append("|: )"); + } + return serial.toString(); } @Override http://git-wip-us.apache.org/repos/asf/oodt/blob/e1669443/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java index 60be735..c6b764b 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java @@ -56,7 +56,7 @@ public class QueryLogicalGroup extends QueryExpression { /** * - * @param queryCriteria + * @param queryExpression */ public void addExpression(QueryExpression queryExpression) { this.queryExpressions.add(queryExpression); @@ -64,7 +64,7 @@ public class QueryLogicalGroup extends QueryExpression { /** * - * @param queryCriterias + * @param queryExpressions */ public void addExpressions(List<QueryExpression> queryExpressions) { this.queryExpressions.addAll(queryExpressions); @@ -96,9 +96,11 @@ public class QueryLogicalGroup extends QueryExpression { @Override public String toString() { - String query = "({" + this.bucketNames + "} " + this.operator + " : "; - for (QueryExpression queryExpression : this.queryExpressions) - query += queryExpression.toString() + ","; + StringBuilder query = new StringBuilder(); + query.append("({" + this.bucketNames + "} " + this.operator + " : "); + for (QueryExpression queryExpression : this.queryExpressions) { + query.append(queryExpression.toString() + ","); + } return query.substring(0, query.length() - 1) + ")"; } http://git-wip-us.apache.org/repos/asf/oodt/blob/e1669443/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java index 983b30e..1b8a696 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java @@ -89,7 +89,7 @@ public class ParseException extends Exception { int[][] expectedTokenSequences, String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { if (maxSize < expectedTokenSequences[i].length) { @@ -103,29 +103,31 @@ public class ParseException extends Exception { } expected.append(eol).append(" "); } - String retval = "Encountered \""; + StringBuilder retval = new StringBuilder(); + retval.append("Encountered \""); Token tok = currentToken.next; for (int i = 0; i < maxSize; i++) { - if (i != 0) retval += " "; + if (i != 0) retval.append(" "); if (tok.kind == 0) { - retval += tokenImage[0]; + retval.append(tokenImage[0]); break; } - retval += " " + tokenImage[tok.kind]; - retval += " \""; - retval += add_escapes(tok.image); - retval += " \""; + retval.append(" ").append(tokenImage[tok.kind]); + retval.append(" \""); + retval.append(add_escapes(tok.image)); + retval.append(" \""); tok = tok.next; } - retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; - retval += "." + eol; + retval.append("\" at line ").append(currentToken.next.beginLine).append(", column ") + .append(currentToken.next.beginColumn); + retval.append(".").append(eol); if (expectedTokenSequences.length == 1) { - retval += "Was expecting:" + eol + " "; + retval.append("Was expecting:").append(eol).append(" "); } else { - retval += "Was expecting one of:" + eol + " "; + retval.append("Was expecting one of:").append(eol).append(" "); } - retval += expected.toString(); - return retval; + retval.append(expected.toString()); + return retval.toString(); } /** @@ -139,7 +141,7 @@ public class ParseException extends Exception { * string literal. */ static String add_escapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) @@ -173,7 +175,7 @@ public class ParseException extends Exception { default: if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { String s = "0000" + Integer.toString(ch, 16); - retval.append("\\u" + s.substring(s.length() - 4, s.length())); + retval.append("\\u").append(s.substring(s.length() - 4, s.length())); } else { retval.append(ch); }
