Skip to content

Commit

Permalink
Merge pull request #19 from oreillymedia/SPIDR-1177
Browse files Browse the repository at this point in the history 
SPIDR-1177
  • Loading branch information
@anthonygroves
anthonygroves authored Nov 13, 2019
2 parents b2dd533 + 294923f commit 144d2c2
Show file tree
Hide file tree
Showing 3 changed files with 283 additions and 280 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ifpress</groupId>
<artifactId>ifpress-solr-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.4</version>
<name>ifpress solr plugin</name>
<description>Contains plugins to be installed in the solr server</description>
<dependencies>
Expand Down
96 changes: 49 additions & 47 deletions src/main/java/com/ifactory/press/db/solr/processor/UpdateDocValuesProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@

/**
* Handles docvalues updates. There are three modes of operation: update docvalues, preserve docvalues, and update all.
*
*
* Query parameter <code>updatedv.value.field</code> specifies the docvalues fields to update or preserve.
*
* If parameter <code>updatedv.key.field</code> is present, the processor updates docvalues of documents whose key field
* If parameter <code>updatedv.key.field</code> is present, the processor updates docvalues of documents whose key field
* matches the value provided for that field in the update message.
*
*
* Otherwise it updates documents' stored and indexed fields in the usual way, and also stores the docvalues fields.
* The values stored in the docvalues fields are retrieved from the existing docvalues field unless provided
* in the input document, in which the input value is stored. If no value is found in the input and the document
* does not exist (or has no docvalues field value), a value of 0 is stored.
*
*
* Note that the key field match is performed using a TermQuery, so the provided key must match an indexed term exactly.
* For this reason, it's recommended to use this feature with unanalyzed identifier-style fields.
*/
Expand All @@ -40,25 +40,24 @@ public class UpdateDocValuesProcessor extends UpdateRequestProcessor {
public static final String UPDATEDV_KEY_FIELD = "updatedv.key.field";

private final SolrCore core;

private final String idField;

private final static Logger LOG = LoggerFactory.getLogger(UpdateDocValuesProcessor.class);

public UpdateDocValuesProcessor(String idField, SolrCore core, UpdateRequestProcessor next) throws SolrException {
super(next);
this.core = core;
this.idField = idField;
}

@Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
SolrParams params = cmd.getReq().getParams();
String keyField = params.get(UPDATEDV_KEY_FIELD);
String[] valueFields = params.getParams(UPDATEDV_VALUE_FIELD);
if (keyField != null) {
if (valueFields == null) {
throw new SolrException(ErrorCode.BAD_REQUEST, "missing parameter updatedv.value.field");
throw new SolrException(ErrorCode.BAD_REQUEST, "missing parameter updatedv.value.field");
}
updateDocValues(keyField, valueFields, cmd);
} else {
Expand Down Expand Up @@ -96,6 +95,7 @@ private void updateDocValuesHelper(String keyField, String[] valueFields, IndexW
// update values of child documents, too
List<SolrInputDocument> childDocuments = solrInputDocument.getChildDocuments();
if (childDocuments != null) {
LOG.debug("Updating docvalues for children docs.");
for (SolrInputDocument childDocument : childDocuments) {
updateDocValuesHelper (keyField, valueFields, iw, childDocument);
}
Expand All @@ -115,53 +115,56 @@ private void retrieveDocValues(AddUpdateCommand cmd, String[] valueFields) throw
}
}

private void retrieveDocValuesHelper(String[] valueFields, SolrInputDocument doc, SolrIndexSearcher searcher)
throws IOException {
String id = getStringValue (doc, idField);
private void retrieveDocValuesHelper(String[] valueFields,
SolrInputDocument doc,
SolrIndexSearcher searcher) throws IOException {
// Get input doc's current field value (String)
String id = getStringValue(doc, idField);
if (id == null) {
return;
}
// LOG.debug(String.format("retrieve docvalues %s", id));

Term idTerm = new Term(idField, id);
TermQuery query = new TermQuery (idTerm);
TopDocs docs = searcher.search(query, 1);
TermQuery query = new TermQuery(idTerm);
// Assert TermState is not used and that objects are not null
TopDocs docs = query.getTermContext() == null ? searcher.search(query, 1) : null;
LeafReader leafReader = searcher.getSlowAtomicReader();
if (docs.totalHits == 1) {
// get the value
// LOG.debug(String.format("found %s", id));
int docID = docs.scoreDocs[0].doc;
for (String valueField : valueFields) {
if (doc.get(valueField) == null) {
NumericDocValues ndv = leafReader.getNumericDocValues(valueField);
if (ndv != null) {
// LUCENE-7404 made major change forcing doc values to be retrieved through an iterator
ndv.advanceExact(docID);
long lvalue = ndv.longValue();
doc.addField(valueField, lvalue);
// LOG.debug("retrieved doc value %d", lvalue);
} else {
doc.addField(valueField, 0);
// LOG.debug("Initializing doc value to 0");
if(docs != null && leafReader != null) {
if (docs.totalHits == 1) {
// Use leafReader to get the doc value, default to 0
int docID = docs.scoreDocs[0].doc;
for (String valueField : valueFields) {
if (doc.get(valueField) == null) {
NumericDocValues ndv = leafReader.getNumericDocValues(valueField);
if (ndv != null) {
// LUCENE-7404 made major change forcing doc values to be retrieved through an iterator
ndv.advanceExact(docID);
long lvalue = ndv.longValue();
doc.addField(valueField, lvalue);
} else {
doc.addField(valueField, 0);
}
}
} else {
// LOG.debug(String.format("%s found in input document: %s", valueField, doc.get(valueField)));
}
}
} else {
for (String valueField : valueFields) {
// new document, inserted without dv values: default to zero
doc.addField(valueField, 0);
} else {
// No document matching, handle as new document
for (String valueField : valueFields) {
// new document, inserted without dv values: default to zero
doc.addField(valueField, 0);
}
}
}
List<SolrInputDocument> childDocuments = doc.getChildDocuments();
if (childDocuments != null) {
for (SolrInputDocument childDoc : childDocuments) {
retrieveDocValuesHelper(valueFields, childDoc, searcher);

// Handle updating doc values for the doc's children documents
List<SolrInputDocument> childDocuments = doc.getChildDocuments();
if (childDocuments != null) {
for (SolrInputDocument childDoc : childDocuments) {
retrieveDocValuesHelper(valueFields, childDoc, searcher);
}
}
}
}
private String getStringValue (SolrInputDocument solrInputDocument, String keyField) {

private String getStringValue(SolrInputDocument solrInputDocument, String keyField) {
Object o = solrInputDocument.getFieldValue(keyField);
if (o == null) {
return null;
Expand All @@ -171,7 +174,7 @@ private String getStringValue (SolrInputDocument solrInputDocument, String keyFi
}
return (String) o;
}

private long getLongValue(SolrInputDocument solrInputDocument, String valueField) {
Object o = solrInputDocument.getFieldValue(valueField);
if (o == null) {
Expand All @@ -183,5 +186,4 @@ private long getLongValue(SolrInputDocument solrInputDocument, String valueField
throw new SolrException(ErrorCode.BAD_REQUEST, "Value of DocValue valuefield " + valueField + " must be an integer, not " + o);
}
}

}
Loading

0 comments on commit 144d2c2

Please sign in to comment.