You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/02/06 17:39:49 UTC
svn commit: r1657890 [10/10] - in /lucene/dev/branches/branch_5x: ./
dev-tools/ dev-tools/idea/lucene/highlighter/ lucene/ lucene/analysis/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/luce...
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1657890&r1=1657889&r2=1657890&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Fri Feb 6 16:39:45 2015
@@ -17,8 +17,7 @@
package org.apache.solr.search;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.Fields;
+import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
@@ -133,7 +132,7 @@ public class TestRTGBase extends SolrTes
if (!termsEnum.seekExact(termBytes)) {
return -1;
}
- DocsEnum docs = termsEnum.docs(MultiFields.getLiveDocs(r), null, DocsEnum.FLAG_NONE);
+ PostingsEnum docs = termsEnum.postings(MultiFields.getLiveDocs(r), null, PostingsEnum.FLAG_NONE);
int id = docs.nextDoc();
if (id != DocIdSetIterator.NO_MORE_DOCS) {
int next = docs.nextDoc();
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java?rev=1657890&r1=1657889&r2=1657890&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java Fri Feb 6 16:39:45 2015
@@ -17,23 +17,35 @@
package org.apache.solr.search;
-import org.apache.lucene.index.LeafReaderContext;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.search.FieldComparator;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.InPlaceMergeSorter;
import org.apache.lucene.util.PriorityQueue;
import org.apache.solr.client.solrj.SolrServerException;
@@ -48,24 +60,13 @@ import org.apache.solr.handler.component
import org.apache.solr.handler.component.ShardDoc;
import org.apache.solr.handler.component.ShardRequest;
import org.apache.solr.handler.component.ShardResponse;
+import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
-import org.apache.solr.request.SolrQueryRequest;
import org.junit.Ignore;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
@Ignore
public class TestRankQueryPlugin extends QParserPlugin {
@@ -453,57 +454,78 @@ public class TestRankQueryPlugin extends
}
}
- private class FakeScorer extends Scorer {
- final int docid;
- final float score;
-
- FakeScorer(int docid, float score) {
- super(null);
- this.docid = docid;
- this.score = score;
- }
+ private class FakeScorer extends Scorer {
- @Override
- public int docID() {
- return docid;
- }
+ final int docid;
+ final float score;
- @Override
- public float score() throws IOException {
- return score;
- }
+ FakeScorer(int docid, float score) {
+ super(null);
+ this.docid = docid;
+ this.score = score;
+ }
- @Override
- public int freq() throws IOException {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public int docID() {
+ return docid;
+ }
- @Override
- public int nextDoc() throws IOException {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public float score() throws IOException {
+ return score;
+ }
- @Override
- public int advance(int target) throws IOException {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public int freq() throws IOException {
+ throw new UnsupportedOperationException();
+ }
- @Override
- public long cost() {
- return 1;
- }
+ @Override
+ public int nextPosition() throws IOException {
+ return -1;
+ }
- @Override
- public Weight getWeight() {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public int startOffset() throws IOException {
+ return -1;
+ }
- @Override
- public Collection<ChildScorer> getChildren() {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public int endOffset() throws IOException {
+ return -1;
}
+ @Override
+ public BytesRef getPayload() throws IOException {
+ return null;
+ }
+
+ @Override
+ public int nextDoc() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long cost() {
+ return 1;
+ }
+
+ @Override
+ public Weight getWeight() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Collection<ChildScorer> getChildren() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
public void merge(ResponseBuilder rb, ShardRequest sreq) {
// id to shard mapping, to eliminate any accidental dups
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dashboard.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dashboard.html?rev=1657890&r1=1657889&r2=1657890&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dashboard.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dashboard.html Fri Feb 6 16:39:45 2015
@@ -33,8 +33,8 @@ limitations under the License.
<dt class="index_last-modified">Last Modified:</dt>
<dd class="index_last-modified value timeago"></dd>
- <dt class="index_num-docs">Num Docs:</dt>
- <dd class="index_num-docs value"></dd>
+ <dt class="index_num-doc">Num Docs:</dt>
+ <dd class="index_num-doc value"></dd>
<dt class="index_max-doc">Max Doc:</dt>
<dd class="index_max-doc value"></dd>
@@ -42,8 +42,8 @@ limitations under the License.
<dt class="index_heap-usage-bytes">Heap Memory Usage:</dt>
<dd class="index_heap-usage-bytes value"></dd>
- <dt class="index_deleted-docs">Deleted Docs:</dt>
- <dd class="index_deleted-docs value"></dd>
+ <dt class="index_deleted-doc">Deleted Docs:</dt>
+ <dd class="index_deleted-doc value"></dd>
<dt class="index_version">Version:</dt>
<dd class="index_version value"></dd>
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dataimport.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dataimport.html?rev=1657890&r1=1657889&r2=1657890&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dataimport.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/tpl/dataimport.html Fri Feb 6 16:39:45 2015
@@ -180,4 +180,4 @@ limitations under the License.
</div>
-</div>
\ No newline at end of file
+</div>
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/tpl/schema-browser.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/tpl/schema-browser.html?rev=1657890&r1=1657889&r2=1657890&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/tpl/schema-browser.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/tpl/schema-browser.html Fri Feb 6 16:39:45 2015
@@ -189,4 +189,4 @@ limitations under the License.
</div>
-</div>
\ No newline at end of file
+</div>