You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by so...@apache.org on 2020/06/03 19:13:55 UTC
[lucene-solr] 26/47: LUCENE-9380: Fix auxiliary class warnings in
Lucene
This is an automated email from the ASF dual-hosted git repository.
sokolov pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 3fe52dd60dd5a328f9899f907093562cd0c6823f
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Wed May 27 12:36:39 2020 -0400
LUCENE-9380: Fix auxiliary class warnings in Lucene
---
lucene/CHANGES.txt | 2 +
.../function/valuesource/DocFreqValueSource.java | 175 ++++++++++-----------
.../function/valuesource/IDFValueSource.java | 2 +-
.../function/valuesource/MaxDocValueSource.java | 2 +-
.../function/valuesource/NumDocsValueSource.java | 2 +-
5 files changed, 92 insertions(+), 91 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 078e8b5..c8b382f 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -292,6 +292,8 @@ Build
* LUCENE-9376: Fix or suppress 20 resource leak precommit warnings in lucene/search
(Andras Salamon via Erick Erickson)
+* LUCENE-9380: Fix auxiliary class warnings in Lucene (Erick Erickson)
+
======================= Lucene 8.5.1 =======================
Bug Fixes
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
index e03e316..bb67627 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
@@ -29,94 +29,6 @@ import java.io.IOException;
import java.util.Map;
-class ConstIntDocValues extends IntDocValues {
- final int ival;
- final float fval;
- final double dval;
- final long lval;
- final String sval;
- final ValueSource parent;
-
- ConstIntDocValues(int val, ValueSource parent) {
- super(parent);
- ival = val;
- fval = val;
- dval = val;
- lval = val;
- sval = Integer.toString(val);
- this.parent = parent;
- }
-
- @Override
- public float floatVal(int doc) {
- return fval;
- }
- @Override
- public int intVal(int doc) {
- return ival;
- }
- @Override
- public long longVal(int doc) {
- return lval;
- }
- @Override
- public double doubleVal(int doc) {
- return dval;
- }
- @Override
- public String strVal(int doc) {
- return sval;
- }
- @Override
- public String toString(int doc) {
- return parent.description() + '=' + sval;
- }
-}
-
-class ConstDoubleDocValues extends DoubleDocValues {
- final int ival;
- final float fval;
- final double dval;
- final long lval;
- final String sval;
- final ValueSource parent;
-
- ConstDoubleDocValues(double val, ValueSource parent) {
- super(parent);
- ival = (int)val;
- fval = (float)val;
- dval = val;
- lval = (long)val;
- sval = Double.toString(val);
- this.parent = parent;
- }
-
- @Override
- public float floatVal(int doc) {
- return fval;
- }
- @Override
- public int intVal(int doc) {
- return ival;
- }
- @Override
- public long longVal(int doc) {
- return lval;
- }
- @Override
- public double doubleVal(int doc) {
- return dval;
- }
- @Override
- public String strVal(int doc) {
- return sval;
- }
- @Override
- public String toString(int doc) {
- return parent.description() + '=' + sval;
- }
-}
-
/**
* <code>DocFreqValueSource</code> returns the number of documents containing the term.
@@ -167,5 +79,92 @@ public class DocFreqValueSource extends ValueSource {
DocFreqValueSource other = (DocFreqValueSource)o;
return this.indexedField.equals(other.indexedField) && this.indexedBytes.equals(other.indexedBytes);
}
+ static class ConstIntDocValues extends IntDocValues {
+ final int ival;
+ final float fval;
+ final double dval;
+ final long lval;
+ final String sval;
+ final ValueSource parent;
+
+ ConstIntDocValues(int val, ValueSource parent) {
+ super(parent);
+ ival = val;
+ fval = val;
+ dval = val;
+ lval = val;
+ sval = Integer.toString(val);
+ this.parent = parent;
+ }
+
+ @Override
+ public float floatVal(int doc) {
+ return fval;
+ }
+ @Override
+ public int intVal(int doc) {
+ return ival;
+ }
+ @Override
+ public long longVal(int doc) {
+ return lval;
+ }
+ @Override
+ public double doubleVal(int doc) {
+ return dval;
+ }
+ @Override
+ public String strVal(int doc) {
+ return sval;
+ }
+ @Override
+ public String toString(int doc) {
+ return parent.description() + '=' + sval;
+ }
+ }
+
+ static class ConstDoubleDocValues extends DoubleDocValues {
+ final int ival;
+ final float fval;
+ final double dval;
+ final long lval;
+ final String sval;
+ final ValueSource parent;
+
+ ConstDoubleDocValues(double val, ValueSource parent) {
+ super(parent);
+ ival = (int)val;
+ fval = (float)val;
+ dval = val;
+ lval = (long)val;
+ sval = Double.toString(val);
+ this.parent = parent;
+ }
+
+ @Override
+ public float floatVal(int doc) {
+ return fval;
+ }
+ @Override
+ public int intVal(int doc) {
+ return ival;
+ }
+ @Override
+ public long longVal(int doc) {
+ return lval;
+ }
+ @Override
+ public double doubleVal(int doc) {
+ return dval;
+ }
+ @Override
+ public String strVal(int doc) {
+ return sval;
+ }
+ @Override
+ public String toString(int doc) {
+ return parent.description() + '=' + sval;
+ }
+ }
}
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
index 4192f2d..7d2afb1 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
@@ -53,7 +53,7 @@ public class IDFValueSource extends DocFreqValueSource {
}
int docfreq = searcher.getIndexReader().docFreq(new Term(indexedField, indexedBytes));
float idf = sim.idf(docfreq, searcher.getIndexReader().maxDoc());
- return new ConstDoubleDocValues(idf, this);
+ return new DocFreqValueSource.ConstDoubleDocValues(idf, this);
}
// tries extra hard to cast the sim to TFIDFSimilarity
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
index ccd7326..87eeddc 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
@@ -48,7 +48,7 @@ public class MaxDocValueSource extends ValueSource {
@Override
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
- return new ConstIntDocValues(searcher.getIndexReader().maxDoc(), this);
+ return new DocFreqValueSource.ConstIntDocValues(searcher.getIndexReader().maxDoc(), this);
}
@Override
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
index 6f92f1e..21e881d 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
@@ -43,7 +43,7 @@ public class NumDocsValueSource extends ValueSource {
@Override
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
// Searcher has no numdocs so we must use the reader instead
- return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader().numDocs(), this);
+ return new DocFreqValueSource.ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader().numDocs(), this);
}
@Override