You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/12/01 19:37:55 UTC
svn commit: r1642730 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/
solr/CHANGES.txt solr/solrj/
solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java
Author: shalin
Date: Mon Dec 1 18:37:55 2014
New Revision: 1642730
URL: http://svn.apache.org/r1642730
Log:
SOLR-6706: /update/json/docs throws RuntimeException if a nested structure contains a non-leaf float field
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1642730&r1=1642729&r2=1642730&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Mon Dec 1 18:37:55 2014
@@ -60,6 +60,9 @@ Bug Fixes
* SOLR-6685: ConcurrentModificationException in Overseer Status API. (shalin)
+* SOLR-6706: /update/json/docs throws RuntimeException if a nested structure
+ contains a non-leaf float field (Noble Paul, shalin)
+
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java?rev=1642730&r1=1642729&r2=1642730&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java Mon Dec 1 18:37:55 2014
@@ -385,6 +385,7 @@ public class JsonRecordReader {
event = parser.nextEvent();
if (event == STRING ||
event == LONG ||
+ event == NUMBER ||
event == BIGNUMBER ||
event == BOOLEAN ||
event == NULL) {
Modified: lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java?rev=1642730&r1=1642729&r2=1642730&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java Mon Dec 1 18:37:55 2014
@@ -180,7 +180,7 @@ public class TestJsonRecordReader exten
records = streamer.getAllRecords(new StringReader(json));
assertEquals(2, records.size());
for (Map<String, Object> record : records) {
- assertEquals(6,record.size());
+ assertEquals(6, record.size());
}
streamer = JsonRecordReader.getInst("/", Collections.singletonList("txt:/**"));
records = streamer.getAllRecords(new StringReader(json));
@@ -189,4 +189,24 @@ public class TestJsonRecordReader exten
}
+ public void testNestedJsonWithFloats() throws Exception {
+
+ String json = "{\n" +
+ " \"a_string\" : \"abc\",\n" +
+ " \"a_num\" : 2.0,\n" +
+ " \"a\" : {\n" +
+ " \"b\" : [\n" +
+ " {\"id\":\"1\", \"title\" : \"test1\"},\n" +
+ " {\"id\":\"2\", \"title\" : \"test2\"}\n" +
+ " ]\n" +
+ " }\n" +
+ "}\n";
+
+ JsonRecordReader streamer;
+ List<Map<String, Object>> records;
+
+ streamer = JsonRecordReader.getInst("/a/b", Collections.singletonList("title_s:/a/b/title"));
+ records = streamer.getAllRecords(new StringReader(json));
+ assertEquals(2, records.size());
+ }
}