You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2017/08/07 21:19:16 UTC
lucene-solr:master: SOLR-11177: CoreContainer.load needs to send
lazily loaded core descriptors to the proper list rather than send them all
to the transient lists.
Repository: lucene-solr
Updated Branches:
refs/heads/master 432516a1f -> bf168ad37
SOLR-11177: CoreContainer.load needs to send lazily loaded core descriptors to the proper list rather than send them all to the transient lists.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bf168ad3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bf168ad3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bf168ad3
Branch: refs/heads/master
Commit: bf168ad37e4326be28950ede8f958b6c3f1330fa
Parents: 432516a
Author: Erick Erickson <er...@apache.org>
Authored: Mon Aug 7 14:16:21 2017 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Mon Aug 7 14:16:21 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf168ad3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d39a7f6..3adc0a2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -772,6 +772,9 @@ when using one of Exact*StatsCache (Mikhail Khludnev)
* SOLR-11198: downconfig downloads empty file as folder (Erick Erickson)
+* SOLR-11177: CoreContainer.load needs to send lazily loaded core descriptors to the proper list rather than send
+ them all to the transient lists. (Erick Erickson) (note, not in 7.0, is in 7.1)
+
Optimizations
----------------------
* SOLR-10634: JSON Facet API: When a field/terms facet will retrieve all buckets (i.e. limit:-1)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf168ad3/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 0b789f8..6013b28 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -608,7 +608,7 @@ public class CoreContainer {
for (final CoreDescriptor cd : cds) {
if (cd.isTransient() || !cd.isLoadOnStartup()) {
- solrCores.getTransientCacheHandler().addTransientDescriptor(cd.getName(), cd);
+ solrCores.addCoreDescriptor(cd);
} else if (asyncSolrCoreLoad) {
solrCores.markCoreAsLoading(cd);
}
@@ -845,7 +845,6 @@ public class CoreContainer {
core.close();
throw new IllegalStateException("This CoreContainer has been closed");
}
- solrCores.addCoreDescriptor(cd);
SolrCore old = solrCores.putCore(cd, core);
/*
* set both the name of the descriptor and the name of the