Skip to content

Commit a317f73

Browse files
authored
Remove 4 unused fields from CachingDirectoryFactory (#4393)
1 parent f254d00 commit a317f73

7 files changed

Lines changed: 0 additions & 37 deletions

File tree

solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,6 @@ public String toString() {
9595

9696
protected Set<CacheValue> removeEntries = new HashSet<>();
9797

98-
private Double maxWriteMBPerSecFlush;
99-
100-
private Double maxWriteMBPerSecMerge;
101-
102-
private Double maxWriteMBPerSecRead;
103-
104-
private Double maxWriteMBPerSecDefault;
105-
10698
private boolean closed;
10799

108100
public interface CloseListener {
@@ -471,11 +463,6 @@ public void incRef(Directory directory) {
471463

472464
@Override
473465
public void init(NamedList<?> args) {
474-
maxWriteMBPerSecFlush = (Double) args.get("maxWriteMBPerSecFlush");
475-
maxWriteMBPerSecMerge = (Double) args.get("maxWriteMBPerSecMerge");
476-
maxWriteMBPerSecRead = (Double) args.get("maxWriteMBPerSecRead");
477-
maxWriteMBPerSecDefault = (Double) args.get("maxWriteMBPerSecDefault");
478-
479466
// override global config
480467
if (args.get(SolrXmlConfig.SOLR_DATA_HOME) != null) {
481468
dataHomePath =

solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743

4844
<schemaFactory class="ClassicIndexSchemaFactory"/>

solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743

4844
<schemaFactory class="ClassicIndexSchemaFactory"/>

solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743

4844
<schemaFactory class="ClassicIndexSchemaFactory"/>

solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743
<schemaFactory class="ClassicIndexSchemaFactory"/>
4844

solr/core/src/test-files/solr/collection1/conf/solrconfig.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743

4844
<schemaFactory class="ClassicIndexSchemaFactory"/>

solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
4141
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
42-
<double name="maxWriteMBPerSecDefault">1000000</double>
43-
<double name="maxWriteMBPerSecFlush">2000000</double>
44-
<double name="maxWriteMBPerSecMerge">3000000</double>
45-
<double name="maxWriteMBPerSecRead">4000000</double>
4642
</directoryFactory>
4743

4844
<schemaFactory class="ClassicIndexSchemaFactory"/>

0 commit comments

Comments
 (0)