You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/01/24 03:34:48 UTC
lucene-solr:jira/solr-5944: SOLR-5944: Fixing code comments
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 2415df316 -> fcf71e34f
SOLR-5944: Fixing code comments
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fcf71e34
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fcf71e34
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fcf71e34
Branch: refs/heads/jira/solr-5944
Commit: fcf71e34f20ea74f99933b80d5bd43cd487751f1
Parents: 2415df3
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Tue Jan 24 09:04:31 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Tue Jan 24 09:04:31 2017 +0530
----------------------------------------------------------------------
.../apache/solr/update/processor/AtomicUpdateDocumentMerger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fcf71e34/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 0d5a0c8..f5e5d0a 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
@@ -168,7 +168,7 @@ public class AtomicUpdateDocumentMerger {
}
Object fieldValue = sdoc.getField(fieldName).getValue();
if (! (fieldValue instanceof Map) ) {
- // not even an atomic update, definitely not an in-place update
+ // not an in-place update if there are fields that are not maps
return Collections.emptySet();
}
// else it's a atomic update map...
@@ -194,7 +194,7 @@ public class AtomicUpdateDocumentMerger {
return Collections.emptySet();
}
- // if this field has copy target which is not supported for in place, then false
+ // if this field has copy target which is not supported for in place, then empty
for (CopyField copyField: schema.getCopyFieldsList(fieldName)) {
if (!isSupportedFieldForInPlaceUpdate(copyField.getDestination()))
return Collections.emptySet();