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

SOLR-2831: resolve IndexableField in BinaryResponseWriter.java 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183178 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2011-10-14 00:34:51 +00:00
parent 212543268b
commit 9e0916333e
2 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
View File

@ -87,7 +87,18 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
writeResults(ctx, codec); writeResults(ctx, codec);
return null; // null means we completely handled it return null; // null means we completely handled it
} }
if( o instanceof IndexableField ) {
if(schema == null) schema = solrQueryRequest.getSchema();
IndexableField f = (IndexableField)o;
SchemaField sf = schema.getFieldOrNull(f.name());
try {
o = getValue(sf, f);
}
catch (Exception e) {
LOG.warn("Error reading a field : " + o, e);
}
}
if (o instanceof SolrDocument) { if (o instanceof SolrDocument) {
// Remove any fields that were not requested. // Remove any fields that were not requested.
// This typically happens when distributed search adds // This typically happens when distributed search adds
@ -163,36 +174,19 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
String fieldName = f.name(); String fieldName = f.name();
if( !returnFields.wantsField(fieldName) ) if( !returnFields.wantsField(fieldName) )
continue; continue;
SchemaField sf = schema.getFieldOrNull(fieldName); SchemaField sf = schema.getFieldOrNull(fieldName);
FieldType ft = null; Object val = null;
if(sf != null) ft =sf.getType(); try {
Object val; val = getValue(sf,f);
if (ft == null) { // handle fields not in the schema } catch (Exception e) {
BytesRef bytesRef = f.binaryValue(); // There is a chance of the underlying field not really matching the
if (bytesRef != null) { // actual field type . So ,it can throw exception
if (bytesRef.offset == 0 && bytesRef.length == bytesRef.bytes.length) { LOG.warn("Error reading a field from document : " + solrDoc, e);
val = bytesRef.bytes; //if it happens log it and continue
} else { continue;
final byte[] bytes = new byte[bytesRef.length];
val = bytes;
System.arraycopy(bytesRef.bytes, bytesRef.offset, bytes, 0, bytesRef.length);
}
} else val = f.stringValue();
} else {
try {
if (useFieldObjects && KNOWN_TYPES.contains(ft.getClass())) {
val = ft.toObject(f);
} else {
val = ft.toExternal(f);
}
} catch (Exception e) {
// There is a chance of the underlying field not really matching the
// actual field type . So ,it can throw exception
LOG.warn("Error reading a field from document : " + solrDoc, e);
//if it happens log it and continue
continue;
}
} }
if(sf != null && sf.multiValued() && !solrDoc.containsKey(fieldName)){ if(sf != null && sf.multiValued() && !solrDoc.containsKey(fieldName)){
ArrayList l = new ArrayList(); ArrayList l = new ArrayList();
l.add(val); l.add(val);
@ -203,7 +197,30 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
} }
return solrDoc; return solrDoc;
} }
public Object getValue(SchemaField sf, IndexableField f) throws Exception {
FieldType ft = null;
if(sf != null) ft =sf.getType();
if (ft == null) { // handle fields not in the schema
BytesRef bytesRef = f.binaryValue();
if (bytesRef != null) {
if (bytesRef.offset == 0 && bytesRef.length == bytesRef.bytes.length) {
return bytesRef.bytes;
} else {
final byte[] bytes = new byte[bytesRef.length];
System.arraycopy(bytesRef.bytes, bytesRef.offset, bytes, 0, bytesRef.length);
return bytes;
}
} else return f.stringValue();
} else {
if (useFieldObjects && KNOWN_TYPES.contains(ft.getClass())) {
return ft.toObject(f);
} else {
return ft.toExternal(f);
}
}
}
} }

3
solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
View File

@ -146,6 +146,9 @@ public abstract class TextResponseWriter {
writeDouble(name, ((Double)val).doubleValue()); writeDouble(name, ((Double)val).doubleValue());
} else if (val instanceof Document) { } else if (val instanceof Document) {
SolrDocument doc = toSolrDocument( (Document)val ); SolrDocument doc = toSolrDocument( (Document)val );
if( returnFields.getTransformer() != null ) {
returnFields.getTransformer().transform( doc, -1 );
}
writeSolrDocument(name, doc, returnFields, 0 ); writeSolrDocument(name, doc, returnFields, 0 );
} else if (val instanceof SolrDocument) { } else if (val instanceof SolrDocument) {
writeSolrDocument(name, (SolrDocument)val, returnFields, 0); writeSolrDocument(name, (SolrDocument)val, returnFields, 0);