Apache Solr open-source search software
SOLR-16160: UpdateXmlMessages duplicate data when data is removed and then added in the same message (#1078)
Alex095976e2a04d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e5a3d1d3503..b789e858dd2 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -67,6 +67,8 @@ Bug Fixes* SOLR-15854: Upgrade semver library to fix versioning constraint bugs in the PackageManager. (Houston Putman, Kevin Risden)+* SOLR-16160: UpdateXmlMessages duplicate data when data is removed and then added in the same message (Alex Deparvu via Kevin Risden)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)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.javaindex c29d271bd85..b3544170c68 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@@ -559,7 +559,7 @@ public class AtomicUpdateDocumentMerger {if (original.size() > initialSize) { // update only if more are addedif (original.size() == 1) { // if single value, pass the value instead of List- doAdd(toDoc, sif, original.toArray()[0]);+ doSet(toDoc, sif, original.toArray()[0]);} else {toDoc.setField(name, original);}diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.javaindex 48882ea7fd3..19f7cf82b83 100644--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java@@ -1725,4 +1725,33 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {"//doc/arr[@name='multiDefault']/str[.='muLti-Default']");}}++ @Test+ public void testAddDistinctToEmptyCollection() {+ SolrInputDocument doc;++ doc = new SolrInputDocument();+ doc.setField("id", "5005");+ doc.setField("intRemove", new Long[] {111L, 222L});+ assertU(adoc(doc));++ assertU(commit());+ assertQ(+ req("q", "intRemove:*", "indent", "true"),+ "//result[@numFound = '1']",+ "//result/doc[1]/arr[@name='intRemove']/int[1][.=111]",+ "//result/doc[1]/arr[@name='intRemove']/int[2][.=222]");++ doc = new SolrInputDocument();+ doc.setField("id", "5005");+ doc.setField("intRemove", ImmutableMap.of("remove", List.of(111L, 222L), "add-distinct", 333L));+ assertU(adoc(doc));+ assertU(commit());++ assertQ(+ req("q", "intRemove:*", "indent", "true"),+ "//result[@numFound = '1']",+ "*[count(//result/doc[1]/arr[@name='intRemove']/int)=1]",+ "//result/doc[1]/arr[@name='intRemove']/int[1][.=333]");+ }}