You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/11/21 01:34:48 UTC
svn commit: r1640843 - in /lucene/dev/trunk:
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/index/
lucene/grouping/src/test/org/apache/lucene/search/grouping/
solr/core/src/java/org/apache/solr/update/processor/
Author: rjernst
Date: Fri Nov 21 00:34:48 2014
New Revision: 1640843
URL: http://svn.apache.org/r1640843
Log:
LUCENE-5950: Remove ecj hacks no longer necessary with current ecj settings
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java?rev=1640843&r1=1640842&r2=1640843&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java Fri Nov 21 00:34:48 2014
@@ -101,7 +101,7 @@ public abstract class LiveFieldValues<S,
if (value == missingValue) {
// Deleted but the deletion is not yet reflected in
// the reader:
- return (T)null;
+ return null;
} else if (value != null) {
return value;
} else {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java?rev=1640843&r1=1640842&r2=1640843&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java Fri Nov 21 00:34:48 2014
@@ -113,9 +113,7 @@ public class TestPrefixCodedTerms extend
}
Iterator<Term> expected = superSet.iterator();
- // NOTE: currenlty using diamond operator on MergedIterator (without explicit Term class) causes
- // errors on ecj used for javadoc lint
- Iterator<Term> actual = new MergedIterator<Term>(subs.toArray(new Iterator[0]));
+ Iterator<Term> actual = new MergedIterator<>(subs.toArray(new Iterator[0]));
while (actual.hasNext()) {
assertTrue(expected.hasNext());
assertEquals(expected.next(), actual.next());
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1640843&r1=1640842&r2=1640843&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Fri Nov 21 00:34:48 2014
@@ -315,9 +315,7 @@ public class TestGrouping extends Lucene
BytesRef groupValue = mvalGd.groupValue.exists() ? ((MutableValueStr) mvalGd.groupValue).value.get() : null;
groups.add(new GroupDocs<>(Float.NaN, mvalGd.maxScore, mvalGd.totalHits, mvalGd.scoreDocs, groupValue, mvalGd.groupSortValues));
}
- // NOTE: currenlty using diamond operator on TopGroups (without explicit Term class) causes
- // errors on ecj used for javadoc lint
- return new TopGroups<BytesRef>(mvalTopGroups.groupSort, mvalTopGroups.withinGroupSort, mvalTopGroups.totalHitCount, mvalTopGroups.totalGroupedHitCount, groups.toArray(new GroupDocs[groups.size()]), Float.NaN);
+ return new TopGroups<>(mvalTopGroups.groupSort, mvalTopGroups.withinGroupSort, mvalTopGroups.totalHitCount, mvalTopGroups.totalGroupedHitCount, groups.toArray(new GroupDocs[groups.size()]), Float.NaN);
}
fail();
return null;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java?rev=1640843&r1=1640842&r2=1640843&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java Fri Nov 21 00:34:48 2014
@@ -59,9 +59,7 @@ public final class MaxFieldValueUpdatePr
public Collection pickSubset(Collection values) {
Collection result = values;
try {
- // NOTE: max must be put into a temp local in order to avoid ecj errors for javadoc lint
- Object max = Collections.max(values);
- result = Collections.singletonList(max);
+ result = Collections.singletonList(Collections.max(values));
} catch (ClassCastException e) {
throw new SolrException
(BAD_REQUEST,
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java?rev=1640843&r1=1640842&r2=1640843&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java Fri Nov 21 00:34:48 2014
@@ -59,9 +59,7 @@ public final class MinFieldValueUpdatePr
public Collection pickSubset(Collection values) {
Collection result = values;
try {
- // NOTE: min must be put into a temp local in order to avoid ecj errors for javadoc lint
- Object min = Collections.min(values);
- result = Collections.singletonList(min);
+ result = Collections.singletonList(Collections.min(values));
} catch (ClassCastException e) {
throw new SolrException
(BAD_REQUEST,