You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/02/17 13:46:57 UTC
svn commit: r1660366 [3/3] - in /lucene/dev/trunk:
lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/
lucene/backward-codecs/src/test/org/apache/lucene/index/
lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/
lucene/codecs/sr...
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Tue Feb 17 12:46:55 2015
@@ -1018,17 +1018,17 @@ public final class TestUtil {
if (random.nextBoolean()) {
final int posFlags;
switch (random.nextInt(4)) {
- case 0: posFlags = PostingsEnum.FLAG_POSITIONS; break;
- case 1: posFlags = PostingsEnum.FLAG_OFFSETS; break;
- case 2: posFlags = PostingsEnum.FLAG_PAYLOADS; break;
- default: posFlags = PostingsEnum.FLAG_OFFSETS | PostingsEnum.FLAG_PAYLOADS; break;
+ case 0: posFlags = PostingsEnum.POSITIONS; break;
+ case 1: posFlags = PostingsEnum.OFFSETS; break;
+ case 2: posFlags = PostingsEnum.PAYLOADS; break;
+ default: posFlags = PostingsEnum.OFFSETS | PostingsEnum.PAYLOADS; break;
}
PostingsEnum docsAndPositions = termsEnum.postings(liveDocs, null, posFlags);
if (docsAndPositions != null) {
return docsAndPositions;
}
}
- flags |= PostingsEnum.FLAG_FREQS;
+ flags |= PostingsEnum.FREQS;
}
return termsEnum.postings(liveDocs, reuse, flags);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Tue Feb 17 12:46:55 2015
@@ -394,7 +394,7 @@ public class LukeRequestHandler extends
if (text == null) { // Ran off the end of the terms enum without finding any live docs with that field in them.
return null;
}
- postingsEnum = termsEnum.postings(reader.getLiveDocs(), postingsEnum, PostingsEnum.FLAG_NONE);
+ postingsEnum = termsEnum.postings(reader.getLiveDocs(), postingsEnum, PostingsEnum.NONE);
if (postingsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
return reader.document(postingsEnum.docID());
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Tue Feb 17 12:46:55 2015
@@ -692,7 +692,7 @@ public class QueryElevationComponent ext
for (String id : elevations.ids) {
term.copyChars(id);
if (seen.contains(id) == false && termsEnum.seekExact(term.get())) {
- postingsEnum = termsEnum.postings(liveDocs, postingsEnum, PostingsEnum.FLAG_NONE);
+ postingsEnum = termsEnum.postings(liveDocs, postingsEnum, PostingsEnum.NONE);
if (postingsEnum != null) {
int docId = postingsEnum.nextDoc();
if (docId == DocIdSetIterator.NO_MORE_DOCS ) continue; // must have been deleted
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Tue Feb 17 12:46:55 2015
@@ -341,7 +341,7 @@ public class TermVectorComponent extends
termInfo.add("tf", freq);
}
- dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL);
+ dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.ALL);
boolean useOffsets = false;
boolean usePositions = false;
if (dpEnum != null) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Tue Feb 17 12:46:55 2015
@@ -780,7 +780,7 @@ public class SimpleFacets {
// TODO: specialize when base docset is a bitset or hash set (skipDocs)? or does it matter for this?
// TODO: do this per-segment for better efficiency (MultiDocsEnum just uses base class impl)
// TODO: would passing deleted docs lead to better efficiency over checking the fastForRandomSet?
- postingsEnum = termsEnum.postings(null, postingsEnum, PostingsEnum.FLAG_NONE);
+ postingsEnum = termsEnum.postings(null, postingsEnum, PostingsEnum.NONE);
c=0;
if (postingsEnum instanceof MultiPostingsEnum) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Tue Feb 17 12:46:55 2015
@@ -424,7 +424,7 @@ class JoinQuery extends Query {
if (freq < minDocFreqFrom) {
fromTermDirectCount++;
// OK to skip liveDocs, since we check for intersection with docs matching query
- fromDeState.postingsEnum = fromDeState.termsEnum.postings(null, fromDeState.postingsEnum, PostingsEnum.FLAG_NONE);
+ fromDeState.postingsEnum = fromDeState.termsEnum.postings(null, fromDeState.postingsEnum, PostingsEnum.NONE);
PostingsEnum postingsEnum = fromDeState.postingsEnum;
if (postingsEnum instanceof MultiPostingsEnum) {
@@ -489,7 +489,7 @@ class JoinQuery extends Query {
toTermDirectCount++;
// need to use liveDocs here so we don't map to any deleted ones
- toDeState.postingsEnum = toDeState.termsEnum.postings(toDeState.liveDocs, toDeState.postingsEnum, PostingsEnum.FLAG_NONE);
+ toDeState.postingsEnum = toDeState.termsEnum.postings(toDeState.liveDocs, toDeState.postingsEnum, PostingsEnum.NONE);
PostingsEnum postingsEnum = toDeState.postingsEnum;
if (postingsEnum instanceof MultiPostingsEnum) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Tue Feb 17 12:46:55 2015
@@ -797,7 +797,7 @@ public class SolrIndexSearcher extends I
if (!termsEnum.seekExact(termBytes)) {
return -1;
}
- PostingsEnum docs = termsEnum.postings(leafReader.getLiveDocs(), null, PostingsEnum.FLAG_NONE);
+ PostingsEnum docs = termsEnum.postings(leafReader.getLiveDocs(), null, PostingsEnum.NONE);
if (docs == null) return -1;
int id = docs.nextDoc();
return id == DocIdSetIterator.NO_MORE_DOCS ? -1 : id;
@@ -819,7 +819,7 @@ public class SolrIndexSearcher extends I
TermsEnum te = terms.iterator(null);
if (te.seekExact(idBytes)) {
- PostingsEnum docs = te.postings(reader.getLiveDocs(), null, PostingsEnum.FLAG_NONE);
+ PostingsEnum docs = te.postings(reader.getLiveDocs(), null, PostingsEnum.NONE);
int id = docs.nextDoc();
if (id == DocIdSetIterator.NO_MORE_DOCS) continue;
assert docs.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
@@ -1164,7 +1164,7 @@ public class SolrIndexSearcher extends I
int bitsSet = 0;
FixedBitSet fbs = null;
- PostingsEnum postingsEnum = deState.termsEnum.postings(deState.liveDocs, deState.postingsEnum, PostingsEnum.FLAG_NONE);
+ PostingsEnum postingsEnum = deState.termsEnum.postings(deState.liveDocs, deState.postingsEnum, PostingsEnum.NONE);
if (deState.postingsEnum == null) {
deState.postingsEnum = postingsEnum;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java Tue Feb 17 12:46:55 2015
@@ -305,7 +305,7 @@ public class FileFloatSource extends Val
continue;
}
- postingsEnum = termsEnum.postings(null, postingsEnum, PostingsEnum.FLAG_NONE);
+ postingsEnum = termsEnum.postings(null, postingsEnum, PostingsEnum.NONE);
int doc;
while ((doc = postingsEnum.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
vals[doc] = fval;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java Tue Feb 17 12:46:55 2015
@@ -195,7 +195,7 @@ public class SolrIndexSplitter {
hash = hashRouter.sliceHash(idString, null, null, null);
}
- postingsEnum = termsEnum.postings(liveDocs, postingsEnum, PostingsEnum.FLAG_NONE);
+ postingsEnum = termsEnum.postings(liveDocs, postingsEnum, PostingsEnum.NONE);
for (;;) {
int doc = postingsEnum.nextDoc();
if (doc == DocIdSetIterator.NO_MORE_DOCS) break;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1660366&r1=1660365&r2=1660366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Tue Feb 17 12:46:55 2015
@@ -132,7 +132,7 @@ public class TestRTGBase extends SolrTes
if (!termsEnum.seekExact(termBytes)) {
return -1;
}
- PostingsEnum docs = termsEnum.postings(MultiFields.getLiveDocs(r), null, PostingsEnum.FLAG_NONE);
+ PostingsEnum docs = termsEnum.postings(MultiFields.getLiveDocs(r), null, PostingsEnum.NONE);
int id = docs.nextDoc();
if (id != DocIdSetIterator.NO_MORE_DOCS) {
int next = docs.nextDoc();