You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2014/06/10 18:55:00 UTC
svn commit: r1601681 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/search/
solr/core/src/test-files/solr/collection1/conf/
solr/core/src/test/org/apache/solr/search/
Author: jbernste
Date: Tue Jun 10 16:55:00 2014
New Revision: 1601681
URL: http://svn.apache.org/r1601681
Log:
SOLR-6150: Add new AnalyticsQuery to support pluggable analytics
Added:
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java
- copied unchanged from r1601664, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
- copied unchanged from r1601664, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java
- copied unchanged from r1601664, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java
- copied unchanged from r1601664, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java
- copied, changed from r1601664, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1601681&r1=1601680&r2=1601681&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Jun 10 16:55:00 2014
@@ -68,6 +68,9 @@ New Features
supported by he xml, json, and javabin response formats.
(Varun Thacker via hossman)
+* SOLR-6150: Add new AnalyticsQuery to support pluggable analytics
+ (Joel Bernstein)
+
Bug Fixes
----------------------
Copied: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java (from r1601664, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java?p2=lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java&p1=lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java&r1=1601664&r2=1601681&rev=1601681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java Tue Jun 10 16:55:00 2014
@@ -17,7 +17,6 @@
package org.apache.solr.search;
-import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher;
import org.apache.solr.common.params.SolrParams;
@@ -75,7 +74,7 @@ public class TestAnalyticsQParserPlugin
public void collect(int doc) throws IOException {
++count;
- leafDelegate.collect(doc);
+ delegate.collect(doc);
}
public void finish() throws IOException {