This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 2e12ce4 SOLR-15699: remove unused
updateHandler/indexWriter/closeWaitsForMerges element (#350)
2e12ce4 is described below
commit 2e12ce45df34c56a05265b34cae265dde745f044
Author: Christine Poerschke <[email protected]>
AuthorDate: Wed Oct 27 14:02:11 2021 +0100
SOLR-15699: remove unused updateHandler/indexWriter/closeWaitsForMerges
element (#350)
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/SolrConfig.java | 6 +-----
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java | 4 ----
solr/core/src/resources/EditableSolrConfigAttributes.json | 3 +--
solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java | 2 --
solr/solr-ref-guide/src/config-api.adoc | 1 -
6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 915a3bf..8576f90 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -380,6 +380,8 @@ Other Changes
* SOLR-15716: Remove deprecated SolrException.ignorePatterns and related code
(hossman)
+* SOLR-15699: Removal of the (unused since 5.0)
"updateHandler/indexWriter/closeWaitsForMerges" solrconfig.xml element.
(Christine Poerschke)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor
that could lead to out of order execution
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index cda9175..abda92a 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -430,7 +430,6 @@ public class SolrConfig extends XmlConfigFile implements
MapSerializable {
getInt("updateHandler/autoCommit/maxDocs", -1),
getInt("updateHandler/autoCommit/maxTime", -1),
convertHeapOptionStyleConfigStringToBytes(get("updateHandler/autoCommit/maxSize",
"")),
- getBool("updateHandler/indexWriter/closeWaitsForMerges", true),
getBool("updateHandler/autoCommit/openSearcher", true),
getInt("updateHandler/autoSoftCommit/maxDocs", -1),
getInt("updateHandler/autoSoftCommit/maxTime", -1),
@@ -647,7 +646,6 @@ public class SolrConfig extends XmlConfigFile implements
MapSerializable {
public final int autoCommmitMaxDocs, autoCommmitMaxTime,
autoSoftCommmitMaxDocs, autoSoftCommmitMaxTime;
public final long autoCommitMaxSizeBytes;
- public final boolean indexWriterCloseWaitsForMerges;
public final boolean openSearcher; // is opening a new searcher part of
hard autocommit?
public final boolean commitWithinSoftCommit;
@@ -656,13 +654,12 @@ public class SolrConfig extends XmlConfigFile implements
MapSerializable {
* @param autoCommmitMaxTime set -1 as default
* @param autoCommitMaxSize set -1 as default
*/
- public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int
autoCommmitMaxTime, long autoCommitMaxSize, boolean
indexWriterCloseWaitsForMerges, boolean openSearcher,
+ public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int
autoCommmitMaxTime, long autoCommitMaxSize, boolean openSearcher,
int autoSoftCommmitMaxDocs, int
autoSoftCommmitMaxTime, boolean commitWithinSoftCommit) {
this.className = className;
this.autoCommmitMaxDocs = autoCommmitMaxDocs;
this.autoCommmitMaxTime = autoCommmitMaxTime;
this.autoCommitMaxSizeBytes = autoCommitMaxSize;
- this.indexWriterCloseWaitsForMerges = indexWriterCloseWaitsForMerges;
this.openSearcher = openSearcher;
this.autoSoftCommmitMaxDocs = autoSoftCommmitMaxDocs;
@@ -674,7 +671,6 @@ public class SolrConfig extends XmlConfigFile implements
MapSerializable {
@Override
public Map<String, Object> toMap(Map<String, Object> map) {
- map.put("indexWriter", Map.of("closeWaitsForMerges",
indexWriterCloseWaitsForMerges));
map.put("commitWithin", Map.of("softCommit", commitWithinSoftCommit));
map.put("autoCommit", Map.of(
"maxDocs", autoCommmitMaxDocs,
diff --git
a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index db8ecbf..acc7c67 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -111,8 +111,6 @@ public class DirectUpdateHandler2 extends UpdateHandler
implements SolrCoreState
this.commitWithinSoftCommit = value;
}
- protected boolean indexWriterCloseWaitsForMerges;
-
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public DirectUpdateHandler2(SolrCore core) {
@@ -132,7 +130,6 @@ public class DirectUpdateHandler2 extends UpdateHandler
implements SolrCoreState
softCommitTracker = new CommitTracker("Soft", core,
softCommitDocsUpperBound, softCommitTimeUpperBound,
NO_FILE_SIZE_UPPER_BOUND_PLACEHOLDER, true, true);
commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;
- indexWriterCloseWaitsForMerges =
updateHandlerInfo.indexWriterCloseWaitsForMerges;
ZkController zkController = core.getCoreContainer().getZkController();
if (zkController != null &&
core.getCoreDescriptor().getCloudDescriptor().getReplicaType() ==
Replica.Type.TLOG) {
@@ -158,7 +155,6 @@ public class DirectUpdateHandler2 extends UpdateHandler
implements SolrCoreState
softCommitTracker = new CommitTracker("Soft", core,
softCommitDocsUpperBound, softCommitTimeUpperBound,
NO_FILE_SIZE_UPPER_BOUND_PLACEHOLDER, updateHandlerInfo.openSearcher, true);
commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;
- indexWriterCloseWaitsForMerges =
updateHandlerInfo.indexWriterCloseWaitsForMerges;
UpdateLog existingLog = updateHandler.getUpdateLog();
if (this.ulog != null && this.ulog == existingLog) {
diff --git a/solr/core/src/resources/EditableSolrConfigAttributes.json
b/solr/core/src/resources/EditableSolrConfigAttributes.json
index 03bb1b6..9b27caa 100644
--- a/solr/core/src/resources/EditableSolrConfigAttributes.json
+++ b/solr/core/src/resources/EditableSolrConfigAttributes.json
@@ -17,8 +17,7 @@
"autoSoftCommit":{
"maxDocs":20,
"maxTime":20},
- "commitWithin":{"softCommit":11},
- "indexWriter":{"closeWaitsForMerges":11}},
+ "commitWithin":{"softCommit":11}},
"query":{
"filterCache":{
"class":0,
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
index 04434bd..7cbc098 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
@@ -32,7 +32,6 @@ public class TestConfigOverlay extends SolrTestCase {
assertTrue(isEditableProp("updateHandler/autoSoftCommit/maxDocs", true,
null));
assertTrue(isEditableProp("updateHandler/autoSoftCommit/maxTime", true,
null));
assertTrue(isEditableProp("updateHandler/commitWithin/softCommit", true,
null));
- assertTrue(isEditableProp("updateHandler/indexWriter/closeWaitsForMerges",
true, null));
assertTrue(isEditableProp("updateHandler.autoCommit.maxDocs", false,
null));
assertTrue(isEditableProp("updateHandler.autoCommit.maxTime", false,
null));
@@ -40,7 +39,6 @@ public class TestConfigOverlay extends SolrTestCase {
assertTrue(isEditableProp("updateHandler.autoSoftCommit.maxDocs", false,
null));
assertTrue(isEditableProp("updateHandler.autoSoftCommit.maxTime", false,
null));
assertTrue(isEditableProp("updateHandler.commitWithin.softCommit", false,
null));
- assertTrue(isEditableProp("updateHandler.indexWriter.closeWaitsForMerges",
false, null));
assertTrue(isEditableProp("query.useFilterForSortedQuery", false, null));
assertTrue(isEditableProp("query.queryResultWindowSize", false, null));
assertTrue(isEditableProp("query.queryResultMaxDocsCached", false, null));
diff --git a/solr/solr-ref-guide/src/config-api.adoc
b/solr/solr-ref-guide/src/config-api.adoc
index d2410a5..cf5e812 100644
--- a/solr/solr-ref-guide/src/config-api.adoc
+++ b/solr/solr-ref-guide/src/config-api.adoc
@@ -177,7 +177,6 @@ See <<commits-transaction-logs.adoc#,Commits and
Transaction Logs>> for defaults
* `updateHandler.autoSoftCommit.maxDocs`
* `updateHandler.autoSoftCommit.maxTime`
* `updateHandler.commitWithin.softCommit`
-* `updateHandler.indexWriter.closeWaitsForMerges`
*Query Settings*
