You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/12/14 17:58:38 UTC
lucene-solr:jira/solr-5944: tweak formatting to keep comments
associated with function params
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 2ff79c0a2 -> d36e0f530
tweak formatting to keep comments associated with function params
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d36e0f53
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d36e0f53
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d36e0f53
Branch: refs/heads/jira/solr-5944
Commit: d36e0f5308b05d1d9b3999c864c81e2a9c2bde1c
Parents: 2ff79c0
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Dec 13 10:47:59 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Dec 14 10:41:44 2016 -0700
----------------------------------------------------------------------
.../solr/update/processor/AtomicUpdateDocumentMerger.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d36e0f53/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
index 081dc0b..b558d86 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
@@ -235,8 +235,12 @@ public class AtomicUpdateDocumentMerger {
BytesRef idBytes = cmd.getIndexedId();
updatedFields.add(DistributedUpdateProcessor.VERSION_FIELD); // add the version field so that it is fetched too
- SolrInputDocument oldDocument = RealTimeGetComponent.getInputDocument(cmd.getReq().getCore(),
- idBytes, true, updatedFields, true); // avoid stored fields from index
+ SolrInputDocument oldDocument = RealTimeGetComponent.getInputDocument
+ (cmd.getReq().getCore(), idBytes,
+ true, // avoid stored fields from index
+ updatedFields,
+ true); // resolve the full document
+
if (oldDocument == RealTimeGetComponent.DELETED || oldDocument == null) {
// This doc was deleted recently. In-place update cannot work, hence a full atomic update should be tried.
return false;