You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2012/03/08 09:40:58 UTC
svn commit: r1298297 -
/lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/
Author: mvg
Date: Thu Mar 8 08:40:58 2012
New Revision: 1298297
URL: http://svn.apache.org/viewvc?rev=1298297&view=rev
Log:
LUCENE-3850: Removed some of the rawtypes compiler warnings
Modified:
lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
Modified: lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java?rev=1298297&r1=1298296&r2=1298297&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java (original)
+++ lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java Thu Mar 8 08:40:58 2012
@@ -41,7 +41,7 @@ import java.util.Map;
public class FunctionAllGroupHeadsCollector extends AbstractAllGroupHeadsCollector<FunctionAllGroupHeadsCollector.GroupHead> {
private final ValueSource groupBy;
- private final Map vsContext;
+ private final Map<?, ?> vsContext;
private final Map<MutableValue, GroupHead> groups;
private final Sort sortWithinGroup;
@@ -57,7 +57,7 @@ public class FunctionAllGroupHeadsCollec
* @param vsContext The ValueSource context
* @param sortWithinGroup The sort within a group
*/
- public FunctionAllGroupHeadsCollector(ValueSource groupBy, Map vsContext, Sort sortWithinGroup) {
+ public FunctionAllGroupHeadsCollector(ValueSource groupBy, Map<?, ?> vsContext, Sort sortWithinGroup) {
super(sortWithinGroup.getSort().length);
groups = new HashMap<MutableValue, GroupHead>();
this.sortWithinGroup = sortWithinGroup;
Modified: lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java?rev=1298297&r1=1298296&r2=1298297&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java (original)
+++ lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java Thu Mar 8 08:40:58 2012
@@ -43,7 +43,7 @@ import java.util.TreeSet;
*/
public class FunctionAllGroupsCollector extends AbstractAllGroupsCollector<MutableValue> {
- private final Map vsContext;
+ private final Map<?, ?> vsContext;
private final ValueSource groupBy;
private final SortedSet<MutableValue> groups = new TreeSet<MutableValue>();
@@ -56,7 +56,7 @@ public class FunctionAllGroupsCollector
* @param groupBy The {@link ValueSource} to group by
* @param vsContext The ValueSource context
*/
- public FunctionAllGroupsCollector(ValueSource groupBy, Map vsContext) {
+ public FunctionAllGroupsCollector(ValueSource groupBy, Map<?, ?> vsContext) {
this.vsContext = vsContext;
this.groupBy = groupBy;
}
Modified: lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java?rev=1298297&r1=1298296&r2=1298297&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java (original)
+++ lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java Thu Mar 8 08:40:58 2012
@@ -36,7 +36,7 @@ import java.util.Map;
public class FunctionFirstPassGroupingCollector extends AbstractFirstPassGroupingCollector<MutableValue> {
private final ValueSource groupByVS;
- private final Map vsContext;
+ private final Map<?, ?> vsContext;
private FunctionValues docValues;
private FunctionValues.ValueFiller filler;
@@ -56,7 +56,7 @@ public class FunctionFirstPassGroupingCo
* @param topNGroups How many top groups to keep.
* @throws IOException When I/O related errors occur
*/
- public FunctionFirstPassGroupingCollector(ValueSource groupByVS, Map vsContext, Sort groupSort, int topNGroups) throws IOException {
+ public FunctionFirstPassGroupingCollector(ValueSource groupByVS, Map<?, ?> vsContext, Sort groupSort, int topNGroups) throws IOException {
super(groupSort, topNGroups);
this.groupByVS = groupByVS;
this.vsContext = vsContext;
Modified: lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java?rev=1298297&r1=1298296&r2=1298297&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java (original)
+++ lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java Thu Mar 8 08:40:58 2012
@@ -39,7 +39,7 @@ import java.util.Map;
public class FunctionSecondPassGroupingCollector extends AbstractSecondPassGroupingCollector<MutableValue> {
private final ValueSource groupByVS;
- private final Map vsContext;
+ private final Map<?, ?> vsContext;
private FunctionValues.ValueFiller filler;
private MutableValue mval;
@@ -58,7 +58,7 @@ public class FunctionSecondPassGroupingC
* @param vsContext The value source context
* @throws IOException IOException When I/O related errors occur
*/
- public FunctionSecondPassGroupingCollector(Collection<SearchGroup<MutableValue>> searchGroups, Sort groupSort, Sort withinGroupSort, int maxDocsPerGroup, boolean getScores, boolean getMaxScores, boolean fillSortFields, ValueSource groupByVS, Map vsContext) throws IOException {
+ public FunctionSecondPassGroupingCollector(Collection<SearchGroup<MutableValue>> searchGroups, Sort groupSort, Sort withinGroupSort, int maxDocsPerGroup, boolean getScores, boolean getMaxScores, boolean fillSortFields, ValueSource groupByVS, Map<?, ?> vsContext) throws IOException {
super(searchGroups, groupSort, withinGroupSort, maxDocsPerGroup, getScores, getMaxScores, fillSortFields);
this.groupByVS = groupByVS;
this.vsContext = vsContext;