Apache Solr open-source search software
SOLR-15292: An ERROR is logged if SignatureUpdateProcessorFactory is used in SolrCloud cluster in a way that is known to be problematic with multiple replicas
Chris Hostetterc7ffbf440b0d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 3bc919c5f26..29aff66a78f 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -313,6 +313,10 @@ Other Changes---------------------* SOLR-15118: Deprecate CollectionAdminRequest.getV2Request(). (Jason Gerlowski)+* SOLR-15292: An ERROR is logged if SignatureUpdateProcessorFactory is used in SolrCloud cluster in a way that is known to+ be problematic with multiple replicas. In 9.0 this situation will prevent collection initialization. (hossman)++================== 8.8.1 ==================Bug Fixesdiff --git a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.javaindex a6cceaee9f3..a899ec78eb6 100644--- a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java@@ -16,6 +16,7 @@*/package org.apache.solr.update.processor;import java.io.IOException;+import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -33,15 +34,21 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.update.AddUpdateCommand;import org.apache.solr.core.SolrCore;+import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;import org.apache.solr.util.plugin.SolrCoreAware;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+/*** @since 3.1**/public class SignatureUpdateProcessorFactoryextends UpdateRequestProcessorFactoryimplements SolrCoreAware {++ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());private List<String> sigFields;private String signatureField;@@ -77,7 +84,9 @@ public class SignatureUpdateProcessorFactory@Overridepublic void inform(SolrCore core) {- final SchemaField field = core.getLatestSchema().getFieldOrNull(getSignatureField());+ final IndexSchema schema = core.getLatestSchema();+ final SchemaField field = schema.getFieldOrNull(getSignatureField());+if (null == field) {throw new SolrException(ErrorCode.SERVER_ERROR,@@ -91,6 +100,15 @@ public class SignatureUpdateProcessorFactory"Can't set overwriteDupes when signatureField is not indexed: "+ getSignatureField());}++ if (getOverwriteDupes() && (null != core.getCoreDescriptor().getCloudDescriptor()) ) {+ // Not Safe, see SOLR-3473 + SOLR-15290+ if ( ! field.equals(schema.getUniqueKeyField()) ) {+ // TODO: throw new SolrException(ErrorCode.SERVER_ERROR, ...+ log.error("Can't use overwriteDupes safely in SolrCloud when signatureField is not the uniqueKeyField: {}",+ schema.getUniqueKeyField().getName());+ }+ }}public List<String> getSigFields() {diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xmlindex 1ea6a0abeb2..c0c964fbfb5 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml@@ -230,38 +230,6 @@<queryParser name="count" class="org.apache.solr.search.AnalyticsTestQParserPlugin"/>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="dedupe-allfields">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">false</bool>- <str name="signatureField">id</str>- <str name="fields"></str>- <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain><updateRequestProcessorChain name="uniq-fields"><processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory"><arr name="fieldName">diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xmlindex 6d077fb43bd..9f2bf3d3cc7 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml@@ -233,38 +233,6 @@<queryParser name="foo" class="FooQParserPlugin"/>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="dedupe-allfields">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">false</bool>- <str name="signatureField">id</str>- <str name="fields"></str>- <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain><updateRequestProcessorChain name="uniq-fields"><processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory"><arr name="fieldName">diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xmlnew file mode 100644index 00000000000..74b19f46a3f--- /dev/null+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml@@ -0,0 +1,81 @@+<?xml version="1.0" ?>++<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->++<config>++ <updateRequestProcessorChain name="dedupe">+ <!-- THIS CHAIN IS NOT VALID IN SOLR CLOUD !+ THIS USE OF THE (DEFAULT) 'signatureField' IS INCOMPATIBLE WITH (DEFAULT) overwriteDupes=true IN SOLR CLOUD+ -->+ <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">+ <bool name="overwriteDupes">true</bool>+ <str name="fields">v_t,t_field</str>+ <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>+ <updateRequestProcessorChain name="dedupe-allfields">+ <!-- this chain is valid, even in cloud, because the signatureField is the unqiueKey field -->+ <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">+ <bool name="overwriteDupes">false</bool>+ <str name="signatureField">id</str>+ <str name="fields"></str>+ <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>+ <updateRequestProcessorChain name="stored_sig">+ <!-- this chain is valid, even in cloud, even though the signature field is not+ indexed, because we are not asking for dups to be overwritten+ -->+ <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">+ <str name="signatureField">non_indexed_signature_sS</str>+ <bool name="overwriteDupes">false</bool>+ <str name="fields">v_t,t_field</str>+ <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>+ </processor>+ <processor class="solr.RunUpdateProcessorFactory" />+ </updateRequestProcessorChain>++ <dataDir>${solr.data.dir:}</dataDir>++ <directoryFactory name="DirectoryFactory"+ class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>+ <schemaFactory class="ClassicIndexSchemaFactory"/>++ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>++ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>++ <updateHandler class="solr.DirectUpdateHandler2">+ <commitWithin>+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>+ </commitWithin>+ <updateLog class="${solr.ulog:solr.UpdateLog}"></updateLog>+ </updateHandler>++ <requestHandler name="/select" class="solr.SearchHandler" />+ <initParams path="/select">+ <lst name="defaults">+ <str name="df">text</str>+ </lst>+ </initParams>++</config>+diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xmlindex bfa396974cd..d8e40dad472 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml@@ -453,38 +453,6 @@<queryParser name="foo" class="FooQParserPlugin"/>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="dedupe-allfields">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">false</bool>- <str name="signatureField">id</str>- <str name="fields"></str>- <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain><updateRequestProcessorChain name="uniq-fields"><processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory"><arr name="fieldName">diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xmlindex da02a61eff8..54da41e86ef 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml@@ -442,38 +442,6 @@<queryParser name="rank" class="org.apache.solr.search.RankQueryTestPlugin"/>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="dedupe-allfields">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">false</bool>- <str name="signatureField">id</str>- <str name="fields"></str>- <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain><updateRequestProcessorChain name="uniq-fields"><processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory"><arr name="fieldName">diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xmlindex f2cad610094..c760d9d19c2 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml@@ -72,30 +72,6 @@</autoSoftCommit></updateHandler>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>--<updateRequestProcessorChain name="distrib-dup-test-chain-explicit"><!-- explicit test using processors before and after distrib --><processor class="solr.RegexReplaceProcessorFactory">diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xmlindex 812c94c15de..c6b80c75ee1 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml@@ -463,38 +463,6 @@<queryParser name="foo" class="FooQParserPlugin"/>- <updateRequestProcessorChain name="dedupe">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">true</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="dedupe-allfields">- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">false</bool>- <bool name="overwriteDupes">false</bool>- <str name="signatureField">id</str>- <str name="fields"></str>- <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>- <updateRequestProcessorChain name="stored_sig">- <!-- this chain is valid even though the signature field is not- indexed, because we are not asking for dups to be overwritten- -->- <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">- <bool name="enabled">true</bool>- <str name="signatureField">non_indexed_signature_sS</str>- <bool name="overwriteDupes">false</bool>- <str name="fields">v_t,t_field</str>- <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>- </processor>- <processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain><updateRequestProcessorChain name="uniq-fields"><processor class="org.apache.solr.update.processor.UniqFieldsUpdateProcessorFactory"><arr name="fieldName">diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.javaindex 99951ccfe0f..acd48775120 100644--- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java@@ -56,8 +56,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {@BeforeClasspublic static void beforeClass() throws Exception {- System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_- initCore("solrconfig.xml", "schema12.xml");+ initCore("solrconfig-dedup-overwrites.xml", "schema15.xml");}@Override@@ -80,14 +79,8 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {@Testpublic void testDupeAllFieldsDetection() throws Exception {-this.chain = "dedupe-allfields";-- SolrCore core = h.getCore();- UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(this.chain);- SignatureUpdateProcessorFactory factory = ((SignatureUpdateProcessorFactory) chained.getProcessors().get(0));- factory.setEnabled(true);- assertNotNull(chained);+ assertNotNull(h.getCore().getUpdateProcessingChain(this.chain));addDoc(adoc("v_t", "Hello Dude man!"));addDoc(adoc("v_t", "Hello Dude man!", "name", "name1'"));@@ -96,18 +89,11 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {addDoc(commit());checkNumDocs(3);-- factory.setEnabled(false);}@Testpublic void testDupeDetection() throws Exception {- SolrCore core = h.getCore();- UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(- "dedupe");- SignatureUpdateProcessorFactory factory = ((SignatureUpdateProcessorFactory) chained.getProcessors().get(0));- factory.setEnabled(true);- assertNotNull(chained);+ assertNotNull(h.getCore().getUpdateProcessingChain(this.chain));addDoc(adoc("id", "1a", "v_t", "Hello Dude man!", "name", "ali babi'"));addDoc(adoc("id", "2a", "name", "ali babi", "v_t", "Hello Dude man . -"));@@ -143,15 +129,12 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {addDoc(commit());checkNumDocs(4);- factory.setEnabled(false);}@Testpublic void testMultiThreaded() throws Exception {- UpdateRequestProcessorChain chained = h.getCore().getUpdateProcessingChain(- "dedupe");- SignatureUpdateProcessorFactory factory = ((SignatureUpdateProcessorFactory) chained.getProcessors().get(0));- factory.setEnabled(true);+ assertNotNull(h.getCore().getUpdateProcessingChain(this.chain));+Thread[] threads = null;Thread[] threads2 = null;@@ -221,7 +204,6 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {assertU(commit());checkNumDocs(1);- factory.setEnabled(false);}/**@@ -229,11 +211,11 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {*/@Testpublic void testNonIndexedSignatureField() throws Exception {- SolrCore core = h.getCore();+ this.chain = "stored_sig";+ assertNotNull(h.getCore().getUpdateProcessingChain(this.chain));checkNumDocs(0);- chain = "stored_sig";addDoc(adoc("id", "2a", "v_t", "Hello Dude man!", "name", "ali babi'"));addDoc(adoc("id", "2b", "v_t", "Hello Dude man!", "name", "ali babi'"));addDoc(commit());@@ -263,13 +245,8 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {@SuppressWarnings({"rawtypes"})public void testNonStringFieldsValues() throws Exception {this.chain = "dedupe-allfields";-- SolrCore core = h.getCore();- UpdateRequestProcessorChain chained = core- .getUpdateProcessingChain(chain);- SignatureUpdateProcessorFactory factory = ((SignatureUpdateProcessorFactory) chained.getProcessors().get(0));- factory.setEnabled(true);-+ assertNotNull(h.getCore().getUpdateProcessingChain(this.chain));+Map<String,String[]> params = new HashMap<>();MultiMapSolrParams mmparams = new MultiMapSolrParams(params);params.put(UpdateParams.UPDATE_CHAIN, new String[] {chain});@@ -338,8 +315,6 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {addDoc(commit());checkNumDocs(4);--}/** A list with an unusual toString */diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java b/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.javaindex bab5cd3fad4..8925da5f6de 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java@@ -28,7 +28,7 @@ import java.util.Map;public class TestPartialUpdateDeduplication extends SolrTestCaseJ4 {@BeforeClasspublic static void beforeClass() throws Exception {- initCore("solrconfig-tlog.xml", "schema15.xml");+ initCore("solrconfig-dedup-overwrites.xml", "schema15.xml");}@Testdiff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex 1243508737f..3d03574c248 100644--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml@@ -1061,7 +1061,6 @@<processor class="solr.processor.SignatureUpdateProcessorFactory"><bool name="enabled">true</bool><str name="signatureField">id</str>- <bool name="overwriteDupes">false</bool><str name="fields">name,features,cat</str><str name="signatureClass">solr.processor.Lookup3Signature</str></processor>diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex e2738e449d8..8a5b255fc2c 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml@@ -1253,7 +1253,6 @@<processor class="solr.processor.SignatureUpdateProcessorFactory"><bool name="enabled">true</bool><str name="signatureField">id</str>- <bool name="overwriteDupes">false</bool><str name="fields">name,features,cat</str><str name="signatureClass">solr.processor.Lookup3Signature</str></processor>