From 6672db0a403048d321eb97134c6a53866703dd4a Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Mon, 5 Mar 2018 13:45:05 +0100 Subject: [PATCH] update to solr 6.6.2 --- doc/schema.xml | 727 +-------------------------------------------- doc/solrconfig.xml | 560 ++++++++++++---------------------- 2 files changed, 194 insertions(+), 1093 deletions(-) diff --git a/doc/schema.xml b/doc/schema.xml index 54f3c5300..ed51a8b99 100644 --- a/doc/schema.xml +++ b/doc/schema.xml @@ -194,50 +194,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -679,404 +415,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1084,75 +433,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/doc/solrconfig.xml b/doc/solrconfig.xml index c57144092..e1484b4bf 100644 --- a/doc/solrconfig.xml +++ b/doc/solrconfig.xml @@ -35,9 +35,9 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - LUCENE_40 + 6.0.1 - - @@ -63,32 +63,34 @@ - - - - - - - + If a 'dir' option (with or without a regex) is used and nothing + is found that matches, a warning will be logged. - - - - - - - + + + - + ${solr.data.dir:} + - + - - @@ -146,7 +149,7 @@ - - + - @@ -177,15 +180,15 @@ can perform merges in the background using separate threads. The SerialMergeScheduler (Lucene 2.2 default) does not. --> - - - + @@ -223,7 +226,7 @@ - @@ -237,11 +240,11 @@ The default Solr IndexDeletionPolicy implementation supports deleting index commit points on number of commits, age of commit point and optimized status. - + The latest commit point should always be preserved regardless of the criteria. --> - @@ -256,24 +259,24 @@ 30MINUTES 1DAY --> - - + @@ -293,11 +296,21 @@ + + + ${solr.ulog.dir:} + + - - 15000 - false + + 15000 + false - - - ${solr.data.dir:} - - - - + 1024 @@ -430,7 +435,7 @@ There are two implementations of cache available for Solr, LRUCache, based on a synchronized LinkedHashMap, and - FastLRUCache, based on a ConcurrentHashMap. + FastLRUCache, based on a ConcurrentHashMap. FastLRUCache has faster gets and slower puts in single threaded operation and thus is generally faster than LRUCache @@ -455,7 +460,7 @@ initialSize - the initial capacity (number of entries) of the cache. (see java.util.HashMap) autowarmCount - the number of entries to prepopulate from - and old cache. + and old cache. --> - + - + 20 200 @@ -573,10 +578,10 @@ prepared but there is no current registered searcher to handle requests or to gain autowarming data from. - + --> @@ -604,7 +609,7 @@ false - + - - + - - explicit - json - true - text - + + explicit + json + true + text + @@ -826,9 +831,9 @@ - - on - false + false 5 2 - 5 + 5 true - true + true 5 - 3 + 3 @@ -925,8 +930,8 @@ - - - + - @@ -994,7 +999,7 @@ field value analysis will be marked as "matched" for every token that is produces by the query analysis --> - @@ -1027,111 +1032,34 @@ request parameter that holds the query text to be analyzed. It also supports the "analysis.showmatch" parameter which when set to true, all field tokens that match the query tokens will be marked - as a "match". + as a "match". --> - - - - - - - - - - - - solrpingquery - - - all - - - - - - explicit + explicit true - - - - - - - - + @@ -1199,11 +1127,11 @@ .01 --> - + wordbreak - solr.WordBreakSolrSpellChecker + solr.WordBreakSolrSpellChecker name true true @@ -1222,7 +1150,7 @@ --> - - @@ -1272,14 +1200,14 @@ default wordbreak on - true + true 10 5 - 5 + 5 true - true + true 10 - 5 + 5 spellcheck @@ -1296,8 +1224,8 @@ This is purely as an example. - In reality you will likely want to add the component to your - already specified request handlers. + In reality you will likely want to add the component to your + already specified request handlers. --> @@ -1309,114 +1237,8 @@ - - - - - - default - - - org.carrot2.clustering.lingo.LingoClusteringAlgorithm + - - 20 - - - clustering/carrot2 - - - ENGLISH - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - *:* - 10 - *,score - - - clustering - - - - @@ -1478,10 +1301,10 @@ - - @@ -1494,7 +1317,7 @@ - @@ -1504,27 +1327,27 @@ - - - + - - + - - + - - - ]]> - - @@ -1553,8 +1376,8 @@ .,!? - - @@ -1576,15 +1399,15 @@ http://wiki.apache.org/solr/UpdateRequestProcessor - --> + --> - + - + @@ -1673,16 +1497,17 @@ --> text/plain; charset=UTF-8 - + - - + + ${velocity.template.base.dir:} + 5 @@ -1710,11 +1535,11 @@ --> - - + + @@ -1723,12 +1548,12 @@ jdbc://.... - + To add a constant value to all docs, use: 5 - + If you want the user to still be able to change it with _value:something_ use this: 5 @@ -1738,11 +1563,6 @@ EditorialMarkerFactory will do exactly that: --> - - - - *:* - -- 2.20.1