lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sim...@apache.org
Subject svn commit: r1402552 [2/2] - in /lucene/dev/branches/LUCENE-2878: lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/java/org/apache/lucene/search/positions/ lucene/core/src/java/org/apache/lucene/search/spans/ lucene/core/src/test/org/apac...
Date Fri, 26 Oct 2012 15:49:39 GMT
Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
Fri Oct 26 15:49:36 2012
@@ -219,7 +219,7 @@ class TermsIncludingScoreQuery extends Q
       return docId;
     }
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       throw new UnsupportedOperationException();
     }
 
@@ -340,7 +340,7 @@ class TermsIncludingScoreQuery extends Q
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions)
+    public IntervalIterator intervals(boolean collectIntervals)
         throws IOException {
       return null;
     }

Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
Fri Oct 26 15:49:36 2012
@@ -304,8 +304,8 @@ public class ToChildBlockJoinQuery exten
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {    
 // nocommit is that correct here?
-      return parentScorer.positions(collectPositions);
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {    
 // nocommit is that correct here?
+      return parentScorer.intervals(collectIntervals);
     }
   }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
Fri Oct 26 15:49:36 2012
@@ -350,7 +350,7 @@ public class ToParentBlockJoinCollector 
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       throw new UnsupportedOperationException();
     }
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
Fri Oct 26 15:49:36 2012
@@ -417,7 +417,7 @@ public class ToParentBlockJoinQuery exte
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       throw new UnsupportedOperationException();
     }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
Fri Oct 26 15:49:36 2012
@@ -349,8 +349,8 @@ public class CustomScoreQuery extends Qu
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
-      return subQueryScorer.positions(collectPositions);
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
+      return subQueryScorer.intervals(collectIntervals);
     }
   }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
Fri Oct 26 15:49:36 2012
@@ -191,8 +191,8 @@ public class BoostedQuery extends Query 
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
-      return scorer.positions(collectPositions);
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
+      return scorer.intervals(collectIntervals);
     }
   }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
Fri Oct 26 15:49:36 2012
@@ -177,7 +177,7 @@ public class FunctionQuery extends Query
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       throw new UnsupportedOperationException();
       //nocommit - is that correct here?
     }

Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
(original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
Fri Oct 26 15:49:36 2012
@@ -89,7 +89,7 @@ public class ValueSourceScorer extends S
   }
 
   @Override
-  public IntervalIterator positions(boolean collectPositions) throws IOException {    
+  public IntervalIterator intervals(boolean collectIntervals) throws IOException {    
     throw new UnsupportedOperationException();
     //nocommit - is that correct here?
   }

Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
(original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
Fri Oct 26 15:49:36 2012
@@ -508,7 +508,7 @@ class SpatialDistanceQuery extends Exten
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       throw new UnsupportedOperationException();
     }
   }

Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
(original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
Fri Oct 26 15:49:36 2012
@@ -545,9 +545,9 @@ class JoinQuery extends Query {
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       if (iter instanceof Scorer) {
-        return ((Scorer) iter).positions(collectPositions);
+        return ((Scorer) iter).intervals(collectIntervals);
       }
       throw new UnsupportedOperationException("Positions are only supported for Scorers");
 

Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1402552&r1=1402551&r2=1402552&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
(original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
Fri Oct 26 15:49:36 2012
@@ -199,9 +199,9 @@ public class SolrConstantScoreQuery exte
     }
 
     @Override
-    public IntervalIterator positions(boolean collectPositions) throws IOException {
+    public IntervalIterator intervals(boolean collectIntervals) throws IOException {
       if (docIdSetIterator instanceof Scorer) {
-        return ((Scorer) docIdSetIterator).positions(collectPositions);
+        return ((Scorer) docIdSetIterator).intervals(collectIntervals);
       }
       throw new UnsupportedOperationException("Positions are only supported for Scorers");
     }



Mime
View raw message