You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/02/05 20:41:56 UTC
svn commit: r741262 - in /lucene/solr/trunk: ./
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/
contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/
src/common/org/apache/solr/common/util/ src/java/org/ap...
Author: shalin
Date: Thu Feb 5 19:41:55 2009
New Revision: 741262
URL: http://svn.apache.org/viewvc?rev=741262&view=rev
Log:
SOLR-971 -- Replace StringBuffer with StringBuilder for instances that do not require thread-safety
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
lucene/solr/trunk/contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java
lucene/solr/trunk/src/common/org/apache/solr/common/util/DOMUtil.java
lucene/solr/trunk/src/common/org/apache/solr/common/util/NamedList.java
lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java
lucene/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java
lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
lucene/solr/trunk/src/test/org/apache/solr/common/util/IteratorChainTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Feb 5 19:41:55 2009
@@ -168,6 +168,9 @@
with reusable priority queue entries to reduce the amount of
generated garbage during searching. (Mark Miller via yonik)
+ 6. SOLR-971: Replace StringBuffer with StringBuilder for instances that do not require thread-safety.
+ (Kay Kay via shalin)
+
Bug Fixes
----------------------
1. SOLR-774: Fixed logging level display (Sean Timm via Otis Gospodnetic)
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java Thu Feb 5 19:41:55 2009
@@ -163,7 +163,7 @@
public Script(Element e) {
this.language = getStringAttribute(e, "language", "JavaScript");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
String script = getTxt(e, buffer);
if (script != null)
this.script = script.trim();
@@ -268,8 +268,7 @@
return m;
}
- public static String getTxt(Node elem, StringBuffer buffer) {
-
+ public static String getTxt(Node elem, StringBuilder buffer) {
if (elem.getNodeType() != Node.CDATA_SECTION_NODE) {
NodeList childs = elem.getChildNodes();
for (int i = 0; i < childs.getLength(); i++) {
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java Thu Feb 5 19:41:55 2009
@@ -136,7 +136,7 @@
}
if (!errors.isEmpty()) {
- StringBuffer sb = new StringBuffer("There are errors in the Schema\n");
+ StringBuilder sb = new StringBuilder("There are errors in the Schema\n");
for (String error : errors) {
sb.append(error).append("\n");
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java Thu Feb 5 19:41:55 2009
@@ -129,7 +129,7 @@
if(deltaImportQuery != null){
return resolver.replaceTokens(deltaImportQuery);
}
- StringBuffer sb = new StringBuffer(queryString);
+ StringBuilder sb = new StringBuilder(queryString);
if (SELECT_WHERE_PATTERN.matcher(queryString).find()) {
sb.append(" and ");
} else {
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java Thu Feb 5 19:41:55 2009
@@ -86,7 +86,7 @@
s[i] = val == null ? "" : getObjectAsString(val);
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < pcs.size(); i++) {
sb.append(pcs.get(i));
if (i < s.length) {
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java Thu Feb 5 19:41:55 2009
@@ -107,7 +107,7 @@
private String mergeAll(String[] parts, int i) {
if (i == parts.length - 1)
return parts[parts.length - 1];
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int j = i; j < parts.length; j++) {
sb.append(parts[j]);
if (j < parts.length - 1)
Modified: lucene/solr/trunk/contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java (original)
+++ lucene/solr/trunk/contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java Thu Feb 5 19:41:55 2009
@@ -235,7 +235,7 @@
* @throws java.io.IOException
*/
private static String readFileAsString(File file) throws java.io.IOException {
- StringBuffer fileData = new StringBuffer(1000);
+ StringBuilder fileData = new StringBuilder(1000);
BufferedReader reader = new BufferedReader(new FileReader(file));
char[] buf = new char[1024];
int numRead=0;
Modified: lucene/solr/trunk/src/common/org/apache/solr/common/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/common/org/apache/solr/common/util/DOMUtil.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/common/org/apache/solr/common/util/DOMUtil.java (original)
+++ lucene/solr/trunk/src/common/org/apache/solr/common/util/DOMUtil.java Thu Feb 5 19:41:55 2009
@@ -287,7 +287,7 @@
List<String> propertyRefs = new ArrayList<String>();
parsePropertyString(value, fragments, propertyRefs);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Iterator<String> i = fragments.iterator();
Iterator<String> j = propertyRefs.iterator();
Modified: lucene/solr/trunk/src/common/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/common/org/apache/solr/common/util/NamedList.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/common/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/solr/trunk/src/common/org/apache/solr/common/util/NamedList.java Thu Feb 5 19:41:55 2009
@@ -198,7 +198,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append('{');
int sz = size();
for (int i=0; i<sz; i++) {
Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseCharFilter.java Thu Feb 5 19:41:55 2009
@@ -63,7 +63,7 @@
}
public String toString(){
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append('(');
sb.append(pos);
sb.append(',');
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java Thu Feb 5 19:41:55 2009
@@ -49,7 +49,7 @@
/** Prints a user-readable version of this query. */
public String toString(String field)
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
if (!prefix.field().equals(field)) {
buffer.append(prefix.field());
buffer.append(":");
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java Thu Feb 5 19:41:55 2009
@@ -263,7 +263,7 @@
public String validateAddDoc(String... fieldsAndValues)
throws XPathExpressionException, SAXException, IOException {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("<add>");
appendSimpleDoc(buf, fieldsAndValues);
buf.append("</add>");
@@ -392,7 +392,19 @@
/**
* A helper that adds an xml <doc> containing all of the
* fields and values specified (odds are fields, evens are values)
+ * to a StringBuilder
+ */
+ public void appendSimpleDoc(StringBuilder buf, String... fieldsAndValues)
+ throws IOException {
+
+ buf.append(makeSimpleDoc(fieldsAndValues));
+ }
+
+ /**
+ * A helper that adds an xml <doc> containing all of the
+ * fields and values specified (odds are fields, evens are values)
* to a StringBuffer.
+ * @deprecated see {@link #appendSimpleDoc(StringBuilder, String...)}
*/
public void appendSimpleDoc(StringBuffer buf, String... fieldsAndValues)
throws IOException {
Modified: lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/solr/trunk/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java Thu Feb 5 19:41:55 2009
@@ -176,7 +176,7 @@
* See: http://lucene.apache.org/java/docs/queryparsersyntax.html#Escaping Special Characters
*/
public static String escapeQueryChars(String s) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
// These characters are part of the query syntax and must be escaped
Modified: lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/analysis/BaseTokenTestCase.java Thu Feb 5 19:41:55 2009
@@ -34,7 +34,7 @@
public abstract class BaseTokenTestCase extends AnalysisTestCase
{
public static String tsToString(TokenStream in) throws IOException {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
Token t = in.next();
if (null != t)
out.append(new String(t.termBuffer(), 0, t.termLength()));
Modified: lucene/solr/trunk/src/test/org/apache/solr/common/util/IteratorChainTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/common/util/IteratorChainTest.java?rev=741262&r1=741261&r2=741262&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/common/util/IteratorChainTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/common/util/IteratorChainTest.java Thu Feb 5 19:41:55 2009
@@ -96,7 +96,7 @@
/** dump the contents of it to a String */
private String getString(Iterator<String> it) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append("");
while(it.hasNext()) {
sb.append(it.next());