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:05:44 UTC

[2/3] lucene-solr:master: LUCENE-8167: fix some incompleteEnumSwitch warnings in solr/core

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/af5acc89
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/af5acc89
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/af5acc89

Branch: refs/heads/master
Commit: af5acc898ed8da7b459dd44e9accb19baf3cedd5
Parents: 4e40679
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 17:43:28 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/af5acc89/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 8bd68a8..09b4b36 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
@@ -732,6 +732,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/af5acc89/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/af5acc89/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/af5acc89/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/af5acc89/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;