This is an automated email from the ASF dual-hosted git repository.
gus-asf 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 a317f7339c6 Remove 4 unused fields from CachingDirectoryFactory (#4393)
a317f7339c6 is described below
commit a317f7339c6e6b5c62ca399afcfe89c3fb8e9ebe
Author: Gus Heck <[email protected]>
AuthorDate: Sun May 3 15:26:16 2026 -0400
Remove 4 unused fields from CachingDirectoryFactory (#4393)
---
.../java/org/apache/solr/core/CachingDirectoryFactory.java | 13 -------------
.../solr/collection1/conf/solrconfig-analytics-query.xml | 4 ----
.../solr/collection1/conf/solrconfig-collapseqparser.xml | 4 ----
.../test-files/solr/collection1/conf/solrconfig-minhash.xml | 4 ----
.../solr/collection1/conf/solrconfig-plugcollector.xml | 4 ----
.../src/test-files/solr/collection1/conf/solrconfig.xml | 4 ----
.../src/test-files/solr/collection1/conf/solrconfig.xml | 4 ----
7 files changed, 37 deletions(-)
diff --git
a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
index dcf084670f6..8b943b7dc79 100644
--- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
@@ -95,14 +95,6 @@ public abstract class CachingDirectoryFactory extends
DirectoryFactory {
protected Set<CacheValue> removeEntries = new HashSet<>();
- private Double maxWriteMBPerSecFlush;
-
- private Double maxWriteMBPerSecMerge;
-
- private Double maxWriteMBPerSecRead;
-
- private Double maxWriteMBPerSecDefault;
-
private boolean closed;
public interface CloseListener {
@@ -471,11 +463,6 @@ public abstract class CachingDirectoryFactory extends
DirectoryFactory {
@Override
public void init(NamedList<?> args) {
- maxWriteMBPerSecFlush = (Double) args.get("maxWriteMBPerSecFlush");
- maxWriteMBPerSecMerge = (Double) args.get("maxWriteMBPerSecMerge");
- maxWriteMBPerSecRead = (Double) args.get("maxWriteMBPerSecRead");
- maxWriteMBPerSecDefault = (Double) args.get("maxWriteMBPerSecDefault");
-
// override global config
if (args.get(SolrXmlConfig.SOLR_DATA_HOME) != null) {
dataHomePath =
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.xml
index 1012b14a0c8..df769ec03f4 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
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
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.xml
index b346eb08db0..de5721946bf 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
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
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.xml
index 8d6e8e842b8..92cc381d60c 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
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
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.xml
index f543311b856..e3afeae98e5 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
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 6a960666848..d7865f2a73a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
diff --git
a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
index a91253e1b0b..4884c5905e5 100644
--- a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -39,10 +39,6 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
- <double name="maxWriteMBPerSecDefault">1000000</double>
- <double name="maxWriteMBPerSecFlush">2000000</double>
- <double name="maxWriteMBPerSecMerge">3000000</double>
- <double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
<schemaFactory class="ClassicIndexSchemaFactory"/>
