Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9452: JsonRecordReader should not deep copy document before handler.handle()

This commit is contained in:
Shalin Shekhar Mangar 2016-08-31 18:12:02 +05:30
parent 26262f4074
commit f0f92d875e
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -103,6 +103,8 @@ Optimizations
* SOLR-9447: Do not clone SolrInputDocument if update processor chain does not contain custom processors. * SOLR-9447: Do not clone SolrInputDocument if update processor chain does not contain custom processors.
(shalin) (shalin)
* SOLR-9452: JsonRecordReader should not deep copy document before handler.handle(). (noble, shalin)
Other Changes Other Changes
---------------------- ----------------------

25
solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
View File

@ -119,9 +119,8 @@ public class JsonRecordReader {
*/ */
public List<Map<String, Object>> getAllRecords(Reader r) throws IOException { public List<Map<String, Object>> getAllRecords(Reader r) throws IOException {
final List<Map<String, Object>> results = new ArrayList<>(); final List<Map<String, Object>> results = new ArrayList<>();
streamRecords(r, (record, path) -> { // Deep copy is required here because the stream might hold on to the map
results.add(record); streamRecords(r, (record, path) -> results.add(Utils.getDeepCopy(record, 2)));
});
return results; return results;
} }
@ -279,23 +278,6 @@ public class JsonRecordReader {
return n; return n;
} }
/**
* Copies a supplied Map to a new Map which is returned. Used to copy a
* records values. If a fields value is a List then they have to be
* deep-copied for thread safety
*/
private static Map<String, Object> getDeepCopy(Map<String, Object> values) {
Map<String, Object> result = new LinkedHashMap<>();
for (Map.Entry<String, Object> entry : values.entrySet()) {
if (entry.getValue() instanceof List) {
result.put(entry.getKey(), new ArrayList((List) entry.getValue()));
} else {
result.put(entry.getKey(), entry.getValue());
}
}
return result;
}
private void parse(JSONParser parser, private void parse(JSONParser parser,
Handler handler, Handler handler,
Map<String, Object> values) throws IOException { Map<String, Object> values) throws IOException {
@ -394,7 +376,7 @@ public class JsonRecordReader {
int event = parser.nextEvent(); int event = parser.nextEvent();
if (event == OBJECT_END) { if (event == OBJECT_END) {
if (isRecord()) { if (isRecord()) {
handler.handle(getDeepCopy(values), splitPath); handler.handle(values, splitPath);
} }
return; return;
} }
@ -456,6 +438,7 @@ public class JsonRecordReader {
} }
private void addChildDoc2ParentDoc(Map<String, Object> record, Map<String, Object> values) { private void addChildDoc2ParentDoc(Map<String, Object> record, Map<String, Object> values) {
record = Utils.getDeepCopy(record, 2);
Object oldVal = values.get(null); Object oldVal = values.get(null);
if (oldVal == null) { if (oldVal == null) {
values.put(null, record); values.put(null, record);