You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/07/14 12:55:23 UTC
lucene-solr:master: SOLR-8984: EnumField's error reporting to
indicate the name of the field
Repository: lucene-solr
Updated Branches:
refs/heads/master baa866970 -> 76363e50d
SOLR-8984: EnumField's error reporting to indicate the name of the field
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/76363e50
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/76363e50
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/76363e50
Branch: refs/heads/master
Commit: 76363e50d9e3d39030fb18235c1c64c76d56f833
Parents: baa8669
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Fri Jul 14 18:25:00 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Fri Jul 14 18:25:00 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/schema/EnumField.java | 7 +++++--
solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java | 6 +++---
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76363e50/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9badab2..b2bc547 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -66,6 +66,9 @@ Bug Fixes
* SOLR-10668: fix NPE at sort=childfield(..) .. on absent values (Mikhail Khludnev)
+* SOLR-8984: EnumField's error reporting to now indicate the field name in failure log (Lanny Ripple,
+ Ann Addicks via Ishan Chattopadhyaya)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76363e50/solr/core/src/java/org/apache/solr/schema/EnumField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/EnumField.java b/solr/core/src/java/org/apache/solr/schema/EnumField.java
index 60e65d5..a60cd80 100644
--- a/solr/core/src/java/org/apache/solr/schema/EnumField.java
+++ b/solr/core/src/java/org/apache/solr/schema/EnumField.java
@@ -386,8 +386,11 @@ public class EnumField extends PrimitiveFieldType {
return null;
}
final Integer intValue = stringValueToIntValue(value.toString());
- if (intValue == null || intValue.equals(DEFAULT_VALUE))
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown value for enum field: " + value.toString());
+ if (intValue == null || intValue.equals(DEFAULT_VALUE)) {
+ String exceptionMessage = String.format(Locale.ENGLISH, "Unknown value for enum field: %s, value: %s",
+ field.getName(), value.toString());
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, exceptionMessage);
+ }
final LegacyFieldType newType = new LegacyFieldType();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76363e50/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
index aa5a8a9..4d70c0e 100644
--- a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
@@ -152,9 +152,9 @@ public class EnumFieldTest extends SolrTestCaseJ4 {
@Test
public void testBogusEnumIndexing() throws Exception {
- ignoreException("Unknown value for enum field: blabla");
- ignoreException("Unknown value for enum field: 10");
- ignoreException("Unknown value for enum field: -4");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: blabla");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: 10");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: -4");
clearIndex();