You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/30 16:08:27 UTC
[3/4] lucene-solr:jira/solr-8668: SOLR-8668: turn
effectiveUseCompoundFileSetting into useCompoundFile
SOLR-8668: turn effectiveUseCompoundFileSetting into useCompoundFile
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6baf5c68
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6baf5c68
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6baf5c68
Branch: refs/heads/jira/solr-8668
Commit: 6baf5c6856bc0f231c18abb3e76c59b79a1ddf8d
Parents: 5b0b173
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 17:06:45 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 17:06:45 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/solr/update/SolrIndexConfig.java | 14 +++++---------
.../src/test/org/apache/solr/core/TestConfig.java | 4 ++--
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6baf5c68/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index a6bceb5..7d06e0b 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -64,7 +64,7 @@ public class SolrIndexConfig implements MapSerializable {
public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();
public final Version luceneVersion;
- private boolean effectiveUseCompoundFileSetting;
+ public final boolean useCompoundFile;
public final int maxBufferedDocs;
@@ -85,7 +85,7 @@ public class SolrIndexConfig implements MapSerializable {
*/
private SolrIndexConfig(SolrConfig solrConfig) {
luceneVersion = solrConfig.luceneMatchVersion;
- effectiveUseCompoundFileSetting = false;
+ useCompoundFile = false;
maxBufferedDocs = -1;
ramBufferSizeMB = 100;
writeLockTimeout = -1;
@@ -131,7 +131,7 @@ public class SolrIndexConfig implements MapSerializable {
solrConfig.get(prefix + "/luceneAutoCommit", null) == null,
true);
- effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile());
+ useCompoundFile = solrConfig.getBool(prefix+"/useCompoundFile", def.useCompoundFile);
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
ramBufferSizeMB = solrConfig.getDouble(prefix+"/ramBufferSizeMB", def.ramBufferSizeMB);
@@ -181,7 +181,7 @@ public class SolrIndexConfig implements MapSerializable {
@Override
public Map<String, Object> toMap(Map<String, Object> map) {
- Map<String, Object> m = Utils.makeMap("useCompoundFile", effectiveUseCompoundFileSetting,
+ Map<String, Object> m = Utils.makeMap("useCompoundFile", useCompoundFile,
"maxBufferedDocs", maxBufferedDocs,
"ramBufferSizeMB", ramBufferSizeMB,
"writeLockTimeout", writeLockTimeout,
@@ -240,7 +240,7 @@ public class SolrIndexConfig implements MapSerializable {
// do this after buildMergePolicy since the backcompat logic
// there may modify the effective useCompoundFile
- iwc.setUseCompoundFile(getUseCompoundFile());
+ iwc.setUseCompoundFile(useCompoundFile);
if (mergedSegmentWarmerInfo != null) {
// TODO: add infostream -> normal logging system (there is an issue somewhere)
@@ -310,8 +310,4 @@ public class SolrIndexConfig implements MapSerializable {
return scheduler;
}
- public boolean getUseCompoundFile() {
- return effectiveUseCompoundFileSetting;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6baf5c68/solr/core/src/test/org/apache/solr/core/TestConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java
index f64281d..87a453f 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -148,7 +148,7 @@ public class TestConfig extends SolrTestCaseJ4 {
SolrConfig sc = new SolrConfig(new SolrResourceLoader(TEST_PATH().resolve("collection1")), "solrconfig-defaults.xml", null);
SolrIndexConfig sic = sc.indexConfig;
- ++numDefaultsTested; assertEquals("default useCompoundFile", false, sic.getUseCompoundFile());
+ ++numDefaultsTested; assertEquals("default useCompoundFile", false, sic.useCompoundFile);
++numDefaultsTested; assertEquals("default maxBufferedDocs", -1, sic.maxBufferedDocs);
@@ -192,7 +192,7 @@ public class TestConfig extends SolrTestCaseJ4 {
Double.parseDouble(System.getProperty("solr.tests.ramBufferSizeMB")),
sic.ramBufferSizeMB, 0.0D);
assertEquals("useCompoundFile sysprop",
- Boolean.parseBoolean(System.getProperty("useCompoundFile")), sic.getUseCompoundFile());
+ Boolean.parseBoolean(System.getProperty("useCompoundFile")), sic.useCompoundFile);
}
}