You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/05/22 18:02:04 UTC
[lucene-solr] branch branch_8x updated: SOLR-14495: Fix or suppress
warnings in solr/search/function
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 5e7be63 SOLR-14495: Fix or suppress warnings in solr/search/function
5e7be63 is described below
commit 5e7be63ca7fbd234526fceb2d7a0594a54f90670
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Fri May 22 14:01:53 2020 -0400
SOLR-14495: Fix or suppress warnings in solr/search/function
---
solr/CHANGES.txt | 5 +++++
.../src/java/org/apache/solr/search/FunctionRangeQuery.java | 3 +++
.../apache/solr/search/function/CollapseScoreFunction.java | 2 ++
.../org/apache/solr/search/function/FieldNameValueSource.java | 1 +
.../java/org/apache/solr/search/function/FileFloatSource.java | 11 +++++++++--
.../org/apache/solr/search/function/MultiStringFunction.java | 1 +
.../java/org/apache/solr/search/function/OrdFieldSource.java | 1 +
.../apache/solr/search/function/ReverseOrdFieldSource.java | 1 +
.../apache/solr/search/function/ValueSourceRangeFilter.java | 2 ++
.../search/function/distance/GeoDistValueSourceParser.java | 3 ++-
.../apache/solr/search/function/distance/GeohashFunction.java | 1 +
.../search/function/distance/GeohashHaversineFunction.java | 2 ++
.../solr/search/function/distance/HaversineConstFunction.java | 2 ++
.../solr/search/function/distance/HaversineFunction.java | 2 ++
.../solr/search/function/distance/StringDistanceFunction.java | 1 +
.../solr/search/function/distance/VectorDistanceFunction.java | 2 ++
16 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c220d63..8febff3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -180,6 +180,11 @@ Other Changes
* SOLR-14482: Fix or suppress warnings in solr/search/facet (Erick Erickson)
+* SOLR-14485: Fix or suppress 11 resource leak warnings in apache/solr/cloud (Andras Salaman via
+ Erick Erickson)
+
+* SOLR-14495: Fix or suppress warnings in solr/search/function (Erick Erickson)
+
================== 8.5.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java b/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java
index fdcdfc3..489d86f 100644
--- a/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java
+++ b/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java
@@ -41,17 +41,20 @@ public class FunctionRangeQuery extends SolrConstantScoreQuery implements PostFi
@Override
public DelegatingCollector getFilterCollector(IndexSearcher searcher) {
+ @SuppressWarnings({"rawtypes"})
Map fcontext = ValueSource.newContext(searcher);
Weight weight = rangeFilt.createWeight(searcher, ScoreMode.COMPLETE, 1);
return new FunctionRangeCollector(fcontext, weight);
}
class FunctionRangeCollector extends DelegatingCollector {
+ @SuppressWarnings({"rawtypes"})
final Map fcontext;
final Weight weight;
ValueSourceScorer scorer;
int maxdoc;
+ @SuppressWarnings({"rawtypes"})
public FunctionRangeCollector(Map fcontext, Weight weight) {
this.fcontext = fcontext;
this.weight = weight;
diff --git a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
index 3932f56..69a3d59 100644
--- a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
@@ -41,6 +41,7 @@ public class CollapseScoreFunction extends ValueSource {
return 1213241257;
}
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return new CollapseScoreFunctionValues(context);
}
@@ -49,6 +50,7 @@ public class CollapseScoreFunction extends ValueSource {
private CollapseScore cscore;
+ @SuppressWarnings({"rawtypes"})
public CollapseScoreFunctionValues(Map context) {
this.cscore = (CollapseScore) context.get("CSCORE");
assert null != this.cscore;
diff --git a/solr/core/src/java/org/apache/solr/search/function/FieldNameValueSource.java b/solr/core/src/java/org/apache/solr/search/function/FieldNameValueSource.java
index c122dbb..7b5714a 100644
--- a/solr/core/src/java/org/apache/solr/search/function/FieldNameValueSource.java
+++ b/solr/core/src/java/org/apache/solr/search/function/FieldNameValueSource.java
@@ -39,6 +39,7 @@ public class FieldNameValueSource extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
throw new UnsupportedOperationException("FieldNameValueSource should not be directly used: " + this);
}
diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
index 3b2eb23..183cf2d 100644
--- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
+++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
@@ -88,6 +88,8 @@ public class FileFloatSource extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
+
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(readerContext);
@@ -165,29 +167,34 @@ public class FileFloatSource extends ValueSource {
/** Internal cache. (from lucene FieldCache) */
abstract static class Cache {
+ @SuppressWarnings({"rawtypes"})
private final Map readerCache = new WeakHashMap();
protected abstract Object createValue(IndexReader reader, Object key);
+ @SuppressWarnings({"unchecked"})
public void refresh(IndexReader reader, Object key) {
Object refreshedValues = createValue(reader, key);
synchronized (readerCache) {
+ @SuppressWarnings({"rawtypes"})
Map innerCache = (Map) readerCache.get(reader);
if (innerCache == null) {
- innerCache = new HashMap();
+ innerCache = new HashMap<>();
readerCache.put(reader, innerCache);
}
innerCache.put(key, refreshedValues);
}
}
+ @SuppressWarnings({"unchecked"})
public Object get(IndexReader reader, Object key) {
+ @SuppressWarnings({"rawtypes"})
Map innerCache;
Object value;
synchronized (readerCache) {
innerCache = (Map) readerCache.get(reader);
if (innerCache == null) {
- innerCache = new HashMap();
+ innerCache = new HashMap<>();
readerCache.put(reader, innerCache);
value = null;
} else {
diff --git a/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java b/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java
index c4aef6c..eca6f3c 100644
--- a/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java
@@ -60,6 +60,7 @@ public abstract class MultiStringFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues[] valsArr = new FunctionValues[sources.length];
for (int i=0; i<sources.length; i++) {
diff --git a/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java b/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java
index 9681995..f4053c6 100644
--- a/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java
+++ b/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java
@@ -71,6 +71,7 @@ public class OrdFieldSource extends ValueSource {
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
final LeafReader r;
diff --git a/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java b/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
index d75dca3..a505709 100644
--- a/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
+++ b/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
@@ -71,6 +71,7 @@ public class ReverseOrdFieldSource extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
final LeafReader r;
diff --git a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
index 9f919ed..c0c0a52 100644
--- a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
+++ b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
@@ -78,6 +78,7 @@ public class ValueSourceRangeFilter extends SolrFilter {
@Override
+ @SuppressWarnings({"rawtypes"})
public DocIdSet getDocIdSet(final Map context, final LeafReaderContext readerContext, Bits acceptDocs) throws IOException {
// NB the IndexSearcher parameter here can be null because Filter Weights don't
// actually use it.
@@ -101,6 +102,7 @@ public class ValueSourceRangeFilter extends SolrFilter {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
valueSource.createWeight(context, searcher);
}
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java
index 4f76b87..c61763c 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java
@@ -193,6 +193,7 @@ public class GeoDistValueSourceParser extends ValueSourceParser {
SchemaField sf = fp.getReq().getSchema().getField(sfield);
FieldType type = sf.getType();
if (type instanceof AbstractSpatialFieldType) {
+ @SuppressWarnings({"rawtypes"})
AbstractSpatialFieldType asft = (AbstractSpatialFieldType) type;
return new SpatialStrategyMultiValueSource(asft.getStrategy(sfield), asft.getDistanceUnits());
}
@@ -209,7 +210,7 @@ public class GeoDistValueSourceParser extends ValueSourceParser {
final SpatialStrategy strategy;
final DistanceUnits distanceUnits;
-
+ @SuppressWarnings({"unchecked"})
public SpatialStrategyMultiValueSource(SpatialStrategy strategy, DistanceUnits distanceUnits) {
super(Collections.EMPTY_LIST);
this.strategy = strategy;
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
index 4e38843..a6090c6 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
@@ -45,6 +45,7 @@ public class GeohashFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues latDV = lat.getValues(context, readerContext);
final FunctionValues lonDV = lon.getValues(context, readerContext);
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
index 40c7aa7..0af9367 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
@@ -59,6 +59,7 @@ public class GeohashHaversineFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues gh1DV = geoHash1.getValues(context, readerContext);
final FunctionValues gh2DV = geoHash2.getValues(context, readerContext);
@@ -96,6 +97,7 @@ public class GeohashHaversineFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
geoHash1.createWeight(context, searcher);
geoHash2.createWeight(context, searcher);
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
index e489ff4..2433c8d 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
@@ -56,6 +56,7 @@ public class HaversineConstFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues latVals = latSource.getValues(context, readerContext);
final FunctionValues lonVals = lonSource.getValues(context, readerContext);
@@ -84,6 +85,7 @@ public class HaversineConstFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
latSource.createWeight(context, searcher);
lonSource.createWeight(context, searcher);
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
index 1697f2b..b1d35ae 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
@@ -93,6 +93,7 @@ public class HaversineFunction extends ValueSource {
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals1 = p1.getValues(context, readerContext);
@@ -114,6 +115,7 @@ public class HaversineFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
p1.createWeight(context, searcher);
p2.createWeight(context, searcher);
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
index 8bf9f1a..0f1e5e5 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
@@ -43,6 +43,7 @@ public class StringDistanceFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues str1DV = str1.getValues(context, readerContext);
final FunctionValues str2DV = str2.getValues(context, readerContext);
diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
index 474ece3..164f97f 100644
--- a/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
@@ -149,6 +149,7 @@ public class VectorDistanceFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
final FunctionValues vals1 = source1.getValues(context, readerContext);
@@ -177,6 +178,7 @@ public class VectorDistanceFunction extends ValueSource {
}
@Override
+ @SuppressWarnings({"rawtypes"})
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
source1.createWeight(context, searcher);
source2.createWeight(context, searcher);