You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2015/10/06 14:45:09 UTC
svn commit: r1707041 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/queryparser/
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java
Author: dweiss
Date: Tue Oct 6 12:45:09 2015
New Revision: 1707041
URL: http://svn.apache.org/viewvc?rev=1707041&view=rev
Log:
LUCENE-6827: Use explicit capacity ArrayList instead of a LinkedList in MultiFieldQueryNodeProcessor
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1707041&r1=1707040&r2=1707041&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Tue Oct 6 12:45:09 2015
@@ -117,6 +117,9 @@ Bug Fixes
Other
+* LUCENE-6827: Use explicit capacity ArrayList instead of a LinkedList
+ in MultiFieldQueryNodeProcessor. (Dawid Weiss).
+
* LUCENE-6812: Upgrade RandomizedTesting to 2.1.17. (Dawid Weiss)
* LUCENE-6174: Improve "ant eclipse" to select right JRE for building.
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java?rev=1707041&r1=1707040&r2=1707041&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java Tue Oct 6 12:45:09 2015
@@ -17,6 +17,7 @@ package org.apache.lucene.queryparser.fl
* limitations under the License.
*/
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -91,32 +92,25 @@ public class MultiFieldQueryNodeProcesso
if (fields.length == 1) {
return fieldNode;
-
} else {
- LinkedList<QueryNode> children = new LinkedList<>();
- children.add(fieldNode);
+ List<QueryNode> children = new ArrayList<>(fields.length);
+ children.add(fieldNode);
for (int i = 1; i < fields.length; i++) {
try {
fieldNode = (FieldableNode) fieldNode.cloneTree();
fieldNode.setField(fields[i]);
children.add(fieldNode);
-
} catch (CloneNotSupportedException e) {
- // should never happen
+ throw new RuntimeException(e);
}
-
}
return new GroupQueryNode(new OrQueryNode(children));
-
}
-
}
-
}
-
}
return node;
@@ -126,9 +120,6 @@ public class MultiFieldQueryNodeProcesso
@Override
protected List<QueryNode> setChildrenOrder(List<QueryNode> children)
throws QueryNodeException {
-
return children;
-
}
-
}