You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/02/12 18:26:25 UTC
[1/3] lucene-solr:branch_7x: LUCENE-8167: fix three
incompleteEnumSwitch warnings
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 6ae6ce2f4 -> f756c5479
LUCENE-8167: fix three incompleteEnumSwitch warnings
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d317b130
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d317b130
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d317b130
Branch: refs/heads/branch_7x
Commit: d317b130ecbe4e7811466a0bd335b6ff88fb39e7
Parents: 6ae6ce2
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 12 17:41:34 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 12 18:06:54 2018 +0000
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/index/FilteredTermsEnum.java | 4 +++-
.../lucene/queries/function/TestDocValuesFieldSources.java | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d317b130/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
index 6498dc0..16f04ab 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
@@ -243,7 +243,9 @@ public abstract class FilteredTermsEnum extends TermsEnum {
case END:
// we are supposed to end the enum
return null;
- // NO: we just fall through and iterate again
+ case NO:
+ // we just iterate again
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d317b130/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
index 479ac3c..f3946cb 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
@@ -92,6 +92,8 @@ public class TestDocValuesFieldSources extends LuceneTestCase {
vals[i] = (long) random().nextInt((int) PackedInts.maxValue(bitsPerValue));
f.setLongValue((Long) vals[i]);
break;
+ default:
+ throw new AssertionError();
}
iw.addDocument(document);
if (random().nextBoolean() && i % 10 == 9) {
@@ -150,6 +152,8 @@ public class TestDocValuesFieldSources extends LuceneTestCase {
case SORTED_NUMERIC:
assertEquals(((Number) expected).longValue(), values.longVal(i));
break;
+ default:
+ throw new AssertionError();
}
}
}
[3/3] lucene-solr:branch_7x: LUCENE-8167: fix two
incompleteEnumSwitch warnings in solr/solrj
Posted by cp...@apache.org.
LUCENE-8167: fix two incompleteEnumSwitch warnings in solr/solrj
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f756c547
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f756c547
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f756c547
Branch: refs/heads/branch_7x
Commit: f756c547936e9d142cb95b21eb78039ee29e339f
Parents: 9d82e79
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 12 17:43:51 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 12 18:07:16 2018 +0000
----------------------------------------------------------------------
.../solr/client/solrj/impl/XMLResponseParser.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f756c547/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
index 953da6a..867b2c5 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
@@ -252,6 +252,15 @@ public class XMLResponseParser extends ResponseParser
case ARR: nl.add( name, readArray( parser ) ); depth--; continue;
case RESULT: nl.add( name, readDocuments( parser ) ); depth--; continue;
case DOC: nl.add( name, readDocument( parser ) ); depth--; continue;
+ case BOOL:
+ case DATE:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case LONG:
+ case NULL:
+ case STR:
+ break;
}
throw new XMLStreamException( "branch element not handled!", parser.getLocation() );
}
@@ -316,6 +325,15 @@ public class XMLResponseParser extends ResponseParser
case ARR: vals.add( readArray( parser ) ); depth--; continue;
case RESULT: vals.add( readDocuments( parser ) ); depth--; continue;
case DOC: vals.add( readDocument( parser ) ); depth--; continue;
+ case BOOL:
+ case DATE:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case LONG:
+ case NULL:
+ case STR:
+ break;
}
throw new XMLStreamException( "branch element not handled!", parser.getLocation() );
}
[2/3] lucene-solr:branch_7x: LUCENE-8167: fix some
incompleteEnumSwitch warnings in solr/core
Posted by cp...@apache.org.
LUCENE-8167: fix some incompleteEnumSwitch warnings in solr/core
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9d82e793
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9d82e793
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9d82e793
Branch: refs/heads/branch_7x
Commit: 9d82e793a1b716bd886cdb94a1bdf688a2dee1d2
Parents: d317b13
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 12 17:43:28 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 12 18:07:04 2018 +0000
----------------------------------------------------------------------
.../solr/handler/component/ExpandComponent.java | 2 ++
.../handler/component/RangeFacetProcessor.java | 3 +++
.../java/org/apache/solr/search/PointMerger.java | 2 ++
.../apache/solr/servlet/SolrDispatchFilter.java | 5 +++++
.../solr/uninverting/UninvertingReader.java | 19 +++++++++++++++++++
5 files changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d82e793/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index dcd1cbc..be6e956 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -731,6 +731,8 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
return Float.toString(Float.intBitsToFloat((int)val));
case DOUBLE:
return Double.toString(Double.longBitsToDouble(val));
+ case DATE:
+ break;
}
}
throw new IllegalArgumentException("FieldType must be INT,LONG,FLOAT,DOUBLE found " + fieldType);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d82e793/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java
index f8ab7b7..6f2fc26 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java
@@ -196,6 +196,9 @@ public class RangeFacetProcessor extends SimpleFacets {
intervals.set(includeBefore ? 1 : 0, new IntervalFacets.FacetInterval(sf, range.lower, range.upper,
range.includeLower, range.includeUpper, FacetRangeOther.BETWEEN.toString()));
break;
+ case ALL:
+ case NONE:
+ break;
}
}
continue;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d82e793/solr/core/src/java/org/apache/solr/search/PointMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/PointMerger.java b/solr/core/src/java/org/apache/solr/search/PointMerger.java
index 22ae05c..59a6fb3 100644
--- a/solr/core/src/java/org/apache/solr/search/PointMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/PointMerger.java
@@ -79,6 +79,8 @@ public class PointMerger {
case DOUBLE:
seg = new DoubleSeg(pv, capacity);
break;
+ case DATE:
+ break;
}
int count = seg.setNextValue();
if (count >= 0) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d82e793/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 714d127..4d944d2 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -388,6 +388,11 @@ public class SolrDispatchFilter extends BaseSolrFilter {
case FORWARD:
request.getRequestDispatcher(call.getPath()).forward(request, response);
break;
+ case ADMIN:
+ case PROCESS:
+ case REMOTEQUERY:
+ case RETURN:
+ break;
}
} finally {
call.destroy();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d82e793/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
index 7158e31..967db54 100644
--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
@@ -309,6 +309,14 @@ public class UninvertingReader extends FilterLeafReader {
case LEGACY_FLOAT: return FieldCache.DEFAULT.getNumerics(in, field, FieldCache.LEGACY_FLOAT_PARSER);
case LEGACY_LONG: return FieldCache.DEFAULT.getNumerics(in, field, FieldCache.LEGACY_LONG_PARSER);
case LEGACY_DOUBLE: return FieldCache.DEFAULT.getNumerics(in, field, FieldCache.LEGACY_DOUBLE_PARSER);
+ case BINARY:
+ case SORTED:
+ case SORTED_SET_BINARY:
+ case SORTED_SET_DOUBLE:
+ case SORTED_SET_FLOAT:
+ case SORTED_SET_INTEGER:
+ case SORTED_SET_LONG:
+ break;
}
}
return null;
@@ -359,6 +367,17 @@ public class UninvertingReader extends FilterLeafReader {
return FieldCache.DEFAULT.getDocTermOrds(in, field, FieldCache.INT64_TERM_PREFIX);
case SORTED_SET_BINARY:
return FieldCache.DEFAULT.getDocTermOrds(in, field, null);
+ case BINARY:
+ case LEGACY_DOUBLE:
+ case LEGACY_FLOAT:
+ case LEGACY_INTEGER:
+ case LEGACY_LONG:
+ case DOUBLE_POINT:
+ case FLOAT_POINT:
+ case INTEGER_POINT:
+ case LONG_POINT:
+ case SORTED:
+ break;
}
}
return null;