You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/01/03 09:54:04 UTC
[1/2] lucene-solr:jira/solr-9854: SOLR-9854 Fix solrconfig.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-9854 b9b69b150 -> f77ff092e
SOLR-9854 Fix solrconfig.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bf785807
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bf785807
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bf785807
Branch: refs/heads/jira/solr-9854
Commit: bf785807ac7b5d94f8a3c48fab95d2d9fe32e521
Parents: b9b69b15
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Jan 3 09:31:03 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Jan 3 09:31:03 2017 +0100
----------------------------------------------------------------------
.../conf/solrconfig-indexmetrics.xml | 21 +++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf785807/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml
index b0105fa..1acf18d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml
@@ -18,6 +18,13 @@
-->
<config>
+
+ <dataDir>${solr.data.dir:}</dataDir>
+
+ <directoryFactory name="DirectoryFactory"
+ class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
@@ -33,6 +40,18 @@
<mergePolicy class="org.apache.lucene.index.TieredMergePolicy"/>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <commitWithin>
+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>
+ </commitWithin>
+
+ </updateHandler>
+ <requestHandler name="/select" class="solr.SearchHandler">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ <str name="indent">true</str>
+ <str name="df">text</str>
+ </lst>
+ </requestHandler>
</config>
[2/2] lucene-solr:jira/solr-9854: SOLR-9854 Update CHANGES.txt
Posted by ab...@apache.org.
SOLR-9854 Update CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f77ff092
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f77ff092
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f77ff092
Branch: refs/heads/jira/solr-9854
Commit: f77ff092ea52ea0adb4f8e65667ffbeabb661fe4
Parents: bf78580
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Jan 3 10:53:46 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Jan 3 10:53:46 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f77ff092/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 02167f3..66623ec 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -210,6 +210,9 @@ New Features
* SOLR-9684: Add schedule Streaming Expression (Joel Bernstein)
+* SOLR-9854: Collect metrics for index merges and index store IO (ab)
+
+
Optimizations
----------------------
* SOLR-9704: Facet Module / JSON Facet API: Optimize blockChildren facets that have