diff --git a/solr/contrib/ltr/README.md b/solr/contrib/ltr/README.md index cc28dcca84c..6b56cdf4341 100644 --- a/solr/contrib/ltr/README.md +++ b/solr/contrib/ltr/README.md @@ -8,7 +8,7 @@ deploy that model to Solr and use it to rerank your top X search results. # Getting Started With Solr Learning To Rank For information on how to get started with solr ltr please see: - * [Solr Reference Guide's section on Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank) + * [Solr Reference Guide's section on Learning To Rank](https://lucene.apache.org/solr/guide/learning-to-rank.html) # Getting Started With Solr @@ -21,4 +21,3 @@ For information on how to get started with solr please see: For information on how to contribute see: * http://wiki.apache.org/lucene-java/HowToContribute * http://wiki.apache.org/solr/HowToContribute - diff --git a/solr/contrib/ltr/example/README.md b/solr/contrib/ltr/example/README.md index 054c3ab17af..77e582aab97 100644 --- a/solr/contrib/ltr/example/README.md +++ b/solr/contrib/ltr/example/README.md @@ -1,6 +1,6 @@ This README file is only about this example directory's content. -Please refer to the Solr Reference Guide's section on [Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank) section for broader information on Learning to Rank (LTR) with Apache Solr. +Please refer to the Solr Reference Guide's section on [Learning To Rank](https://lucene.apache.org/solr/guide/learning-to-rank.html) section for broader information on Learning to Rank (LTR) with Apache Solr. # Start Solr with the LTR plugin enabled @@ -101,8 +101,8 @@ hard drive|6H500F0 |0|CLICK_LOGS hard drive|F8V7067-APL-KIT|0|CLICK_LOGS ``` -This is a really trival way to generate a training dataset, and in many settings -it might not produce great results. Indeed, it is a well known fact that +This is a really trival way to generate a training dataset, and in many settings +it might not produce great results. Indeed, it is a well known fact that clicks are *biased*: users tend to click on the first result proposed for a query, also if it is not relevant. A click on a document in position five could be considered more important than a click on a document in position one, because @@ -128,5 +128,3 @@ Usually a human worker visualizes a query together with a list of results and th consists in assigning a relevance label to each document (e.g., Perfect, Excellent, Good, Fair, Not relevant). Training data can then be obtained by translating the labels into numeric scores (e.g., Perfect = 4, Excellent = 3, Good = 2, Fair = 1, Not relevant = 0). - - diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml index aa1ae698bd8..c18febb0e2e 100644 --- a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -83,12 +83,12 @@ - @@ -135,19 +135,19 @@ Index Config - These settings control low-level behavior of indexing Most example settings here show the default value, but are commented out, to more easily see where customizations have been made. - + Note: This replaces and from older versions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - - @@ -161,7 +161,7 @@ - - - - @@ -232,12 +232,12 @@ 30MINUTES 1DAY --> - @@ -291,7 +291,7 @@ Perform a hard commit automatically under certain conditions. Instead of enabling autoCommit, consider using "commitWithin" - when adding documents. + when adding documents. http://wiki.apache.org/solr/UpdateXmlMessages @@ -300,7 +300,7 @@ maxTime - Maximum amount of time in ms that is allowed to pass since a document was added before automatically - triggering a new commit. + triggering a new commit. openSearcher - if false, the commit causes recent index changes to be flushed to stable storage, but does not cause a new searcher to be opened to make those changes visible. @@ -324,7 +324,7 @@ 20 200 @@ -611,19 +611,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -645,21 +645,21 @@ - - + Default configuration in a requestHandler would look like: @@ -843,28 +843,28 @@ debug - If you register a searchComponent to one of the standard names, + If you register a searchComponent to one of the standard names, that will be used instead of the default. To insert components before or after the 'standard' components, use: - + myFirstComponentName - + myLastComponentName NOTE: The component registered with the name "debug" will - always be executed after the "last-components" - + always be executed after the "last-components" + --> @@ -913,7 +913,7 @@ --> - @@ -958,8 +958,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. --> @@ -1032,8 +1032,8 @@ - @@ -1078,7 +1078,7 @@ - - - @@ -1220,8 +1220,8 @@ on the fly based on the hash code of some other fields. This example has overwriteDupes set to false since we are using the id field as the signatureField and Solr will maintain - uniqueness based on that anyway. - + uniqueness based on that anyway. + --> 5 @@ -1331,7 +1331,7 @@ @@ -1364,12 +1364,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 diff --git a/solr/example/example-DIH/README.txt b/solr/example/example-DIH/README.txt index ea8d28fb335..30c37ebf1ba 100644 --- a/solr/example/example-DIH/README.txt +++ b/solr/example/example-DIH/README.txt @@ -46,4 +46,4 @@ When Solr is started connect to: http://localhost:8983/solr/tika/dataimport?command=full-import Check also the Solr Reference Guide for detailed usage guide: -https://cwiki.apache.org/confluence/display/solr/Uploading+Structured+Data+Store+Data+with+the+Data+Import+Handler +https://lucene.apache.org/solr/guide/uploading-structured-data-store-data-with-the-data-import-handler.html diff --git a/solr/example/example-DIH/solr/atom/conf/solrconfig.xml b/solr/example/example-DIH/solr/atom/conf/solrconfig.xml index 2b44ca6f8e0..105f2960eab 100644 --- a/solr/example/example-DIH/solr/atom/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/atom/conf/solrconfig.xml @@ -16,17 +16,17 @@ limitations under the License. --> - diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml index aaef5b895f2..aae723d9b97 100644 --- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -83,14 +83,14 @@ - - + - - - @@ -159,7 +159,7 @@ - - - - @@ -229,12 +229,12 @@ 30MINUTES 1DAY --> - @@ -272,16 +272,16 @@ uncommitted changes to the index, so use of a hard autoCommit is recommended (see below). "dir" - the target directory for transaction logs, defaults to the - solr data directory. --> + solr data directory. --> ${solr.ulog.dir:} - + - - ${solr.autoCommit.maxTime:15000} - false + + ${solr.autoCommit.maxTime:15000} + false - - ${solr.autoSoftCommit.maxTime:-1} + + ${solr.autoSoftCommit.maxTime:-1} - + 1024 @@ -399,7 +399,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 @@ -424,7 +424,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 @@ -550,10 +550,10 @@ prepared but there is no current registered searcher to handle requests or to gain autowarming data from. - + --> @@ -600,19 +600,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -634,21 +634,21 @@ - - @@ -836,18 +836,18 @@ - + @@ -915,11 +915,11 @@ .01 --> - + wordbreak - solr.WordBreakSolrSpellChecker + solr.WordBreakSolrSpellChecker name true true @@ -938,7 +938,7 @@ --> - - - @@ -988,14 +988,14 @@ default wordbreak on - true + true 10 5 - 5 + 5 true - true + true 10 - 5 + 5 spellcheck @@ -1006,7 +1006,7 @@ mySuggester FuzzyLookupFactory - DocumentDictionaryFactory + DocumentDictionaryFactory cat price string @@ -1032,8 +1032,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. --> @@ -1044,7 +1044,7 @@ tvComponent - + - @@ -1107,10 +1107,10 @@ - - @@ -1123,7 +1123,7 @@ - @@ -1133,27 +1133,27 @@ - - - + - - + - - + - - - ]]> - - @@ -1182,8 +1182,8 @@ .,!? - - @@ -1205,15 +1205,15 @@ http://wiki.apache.org/solr/UpdateRequestProcessor - --> + --> - + - + text/plain; charset=UTF-8 - + @@ -1313,7 +1313,7 @@ 5 @@ -1321,7 +1321,7 @@ - - + + @@ -1354,12 +1354,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 diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml index 5bd9f7a68e3..c9eb15c5d82 100644 --- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -86,14 +86,14 @@ - - + - - - @@ -162,7 +162,7 @@ - - - - @@ -232,12 +232,12 @@ 30MINUTES 1DAY --> - @@ -275,16 +275,16 @@ uncommitted changes to the index, so use of a hard autoCommit is recommended (see below). "dir" - the target directory for transaction logs, defaults to the - solr data directory. --> + solr data directory. --> ${solr.ulog.dir:} - + - - ${solr.autoCommit.maxTime:15000} - false + + ${solr.autoCommit.maxTime:15000} + false - - ${solr.autoSoftCommit.maxTime:-1} + + ${solr.autoSoftCommit.maxTime:-1} - + 1024 @@ -402,7 +402,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 @@ -427,7 +427,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 @@ -553,10 +553,10 @@ prepared but there is no current registered searcher to handle requests or to gain autowarming data from. - + --> @@ -603,19 +603,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -637,21 +637,21 @@ - - @@ -839,18 +839,18 @@ - + @@ -918,11 +918,11 @@ .01 --> - + wordbreak - solr.WordBreakSolrSpellChecker + solr.WordBreakSolrSpellChecker name true true @@ -941,7 +941,7 @@ --> - - - @@ -991,14 +991,14 @@ default wordbreak on - true + true 10 5 - 5 + 5 true - true + true 10 - 5 + 5 spellcheck @@ -1009,7 +1009,7 @@ mySuggester FuzzyLookupFactory - DocumentDictionaryFactory + DocumentDictionaryFactory cat price string @@ -1035,8 +1035,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. --> @@ -1062,7 +1062,7 @@ true false - + terms @@ -1102,7 +1102,7 @@ - @@ -1110,10 +1110,10 @@ - - @@ -1126,7 +1126,7 @@ - @@ -1136,27 +1136,27 @@ - - - + - - + - - + - - - ]]> - - @@ -1185,8 +1185,8 @@ .,!? - - @@ -1208,15 +1208,15 @@ http://wiki.apache.org/solr/UpdateRequestProcessor - --> + --> - + - + text/plain; charset=UTF-8 - + @@ -1316,7 +1316,7 @@ 5 @@ -1324,7 +1324,7 @@ - - + + @@ -1357,12 +1357,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 diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml index eea69991f4d..f05f8928fff 100644 --- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -83,14 +83,14 @@ - - + - - - @@ -159,7 +159,7 @@ - - - - @@ -229,12 +229,12 @@ 30MINUTES 1DAY --> - @@ -272,16 +272,16 @@ uncommitted changes to the index, so use of a hard autoCommit is recommended (see below). "dir" - the target directory for transaction logs, defaults to the - solr data directory. --> + solr data directory. --> ${solr.ulog.dir:} - + - - ${solr.autoCommit.maxTime:15000} - false + + ${solr.autoCommit.maxTime:15000} + false - - ${solr.autoSoftCommit.maxTime:-1} + + ${solr.autoSoftCommit.maxTime:-1} - + 1024 @@ -399,7 +399,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 @@ -424,7 +424,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 @@ -550,10 +550,10 @@ prepared but there is no current registered searcher to handle requests or to gain autowarming data from. - + --> @@ -600,19 +600,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -634,21 +634,21 @@ - - @@ -834,18 +834,18 @@ - + @@ -913,11 +913,11 @@ .01 --> - + wordbreak - solr.WordBreakSolrSpellChecker + solr.WordBreakSolrSpellChecker name true true @@ -936,7 +936,7 @@ --> - - - @@ -986,14 +986,14 @@ default wordbreak on - true + true 10 5 - 5 + 5 true - true + true 10 - 5 + 5 spellcheck @@ -1004,7 +1004,7 @@ mySuggester FuzzyLookupFactory - DocumentDictionaryFactory + DocumentDictionaryFactory cat price string @@ -1030,8 +1030,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. --> @@ -1057,7 +1057,7 @@ true false - + terms @@ -1097,7 +1097,7 @@ - @@ -1105,10 +1105,10 @@ - - @@ -1121,7 +1121,7 @@ - @@ -1131,27 +1131,27 @@ - - - + - - + - - + - - - ]]> - - @@ -1180,8 +1180,8 @@ .,!? - - @@ -1203,15 +1203,15 @@ http://wiki.apache.org/solr/UpdateRequestProcessor - --> + --> - + - + text/plain; charset=UTF-8 - + @@ -1311,7 +1311,7 @@ 5 @@ -1319,7 +1319,7 @@ - - + + @@ -1352,12 +1352,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 diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml index 65ed56fb605..b00b623e338 100644 --- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml @@ -16,7 +16,7 @@ limitations under the License. --> - diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml index a2de3e43d40..ae858ec8220 100644 --- a/solr/example/files/conf/solrconfig.xml +++ b/solr/example/files/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -85,12 +85,12 @@ - - - @@ -160,7 +160,7 @@ - - - - @@ -230,12 +230,12 @@ 30MINUTES 1DAY --> - @@ -281,7 +281,7 @@ Perform a hard commit automatically under certain conditions. Instead of enabling autoCommit, consider using "commitWithin" - when adding documents. + when adding documents. http://wiki.apache.org/solr/UpdateXmlMessages @@ -290,7 +290,7 @@ maxTime - Maximum amount of time in ms that is allowed to pass since a document was added before automatically - triggering a new commit. + triggering a new commit. openSearcher - if false, the commit causes recent index changes to be flushed to stable storage, but does not cause a new searcher to be opened to make those changes visible. @@ -309,13 +309,13 @@ faster and more near-realtime friendly than a hard commit. --> 1024 @@ -400,7 +400,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 @@ -433,7 +433,7 @@ autowarmCount="0"/> 20 200 @@ -598,19 +598,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -632,21 +632,21 @@ - @@ -905,7 +905,7 @@ --> - - @@ -978,8 +978,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. --> @@ -1053,8 +1053,8 @@ - @@ -1099,7 +1099,7 @@ - - - @@ -1245,8 +1245,8 @@ on the fly based on the hash code of some other fields. This example has overwriteDupes set to false since we are using the id field as the signatureField and Solr will maintain - uniqueness based on that anyway. - + uniqueness based on that anyway. + --> 5 @@ -1354,7 +1354,7 @@ @@ -1387,12 +1387,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 diff --git a/solr/server/solr/README.txt b/solr/server/solr/README.txt index 28268b19e61..6e572bc4487 100644 --- a/solr/server/solr/README.txt +++ b/solr/server/solr/README.txt @@ -17,7 +17,7 @@ Default Solr Home Directory ============================= -This directory is the default Solr home directory which holds +This directory is the default Solr home directory which holds configuration files and Solr indexes (called cores). @@ -38,17 +38,17 @@ it is recommended to just use automatic core discovery instead of listing cores in solr.xml. If no solr.xml file is found, then Solr assumes that there should be -a single SolrCore named "collection1" and that the "Instance Directory" +a single SolrCore named "collection1" and that the "Instance Directory" for collection1 should be the same as the Solr Home Directory. For more information about solr.xml, please see: -https://cwiki.apache.org/confluence/display/solr/Solr+Cores+and+solr.xml +https://lucene.apache.org/solr/guide/solr-cores-and-solr-xml.html * Individual SolrCore Instance Directories * -Although solr.xml can be configured to look for SolrCore Instance Directories -in any path, simple sub-directories of the Solr Home Dir using relative paths -are common for many installations. +Although solr.xml can be configured to look for SolrCore Instance Directories +in any path, simple sub-directories of the Solr Home Dir using relative paths +are common for many installations. * Core Discovery * @@ -60,18 +60,18 @@ defined in core.properties. For an example of core.properties, please see: example/solr/collection1/core.properties For more information about core discovery, please see: -https://cwiki.apache.org/confluence/display/solr/Moving+to+the+New+solr.xml+Format +https://lucene.apache.org/solr/guide/defining-core-properties.html * A Shared 'lib' Directory * -Although solr.xml can be configured with an optional "sharedLib" attribute -that can point to any path, it is common to use a "./lib" sub-directory of the +Although solr.xml can be configured with an optional "sharedLib" attribute +that can point to any path, it is common to use a "./lib" sub-directory of the Solr Home Directory. * ZooKeeper Files * -When using SolrCloud using the embedded ZooKeeper option for Solr, it is -common to have a "zoo.cfg" file and "zoo_data" directories in the Solr Home +When using SolrCloud using the embedded ZooKeeper option for Solr, it is +common to have a "zoo.cfg" file and "zoo_data" directories in the Solr Home Directory. Please see the SolrCloud wiki page for more details... https://wiki.apache.org/solr/SolrCloud diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml index aa1ae698bd8..c18febb0e2e 100644 --- a/solr/server/solr/configsets/_default/conf/solrconfig.xml +++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -83,12 +83,12 @@ - @@ -135,19 +135,19 @@ Index Config - These settings control low-level behavior of indexing Most example settings here show the default value, but are commented out, to more easily see where customizations have been made. - + Note: This replaces and from older versions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - - @@ -161,7 +161,7 @@ - - - - @@ -232,12 +232,12 @@ 30MINUTES 1DAY --> - @@ -291,7 +291,7 @@ Perform a hard commit automatically under certain conditions. Instead of enabling autoCommit, consider using "commitWithin" - when adding documents. + when adding documents. http://wiki.apache.org/solr/UpdateXmlMessages @@ -300,7 +300,7 @@ maxTime - Maximum amount of time in ms that is allowed to pass since a document was added before automatically - triggering a new commit. + triggering a new commit. openSearcher - if false, the commit causes recent index changes to be flushed to stable storage, but does not cause a new searcher to be opened to make those changes visible. @@ -324,7 +324,7 @@ 20 200 @@ -611,19 +611,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -645,21 +645,21 @@ - - + Default configuration in a requestHandler would look like: @@ -843,28 +843,28 @@ debug - If you register a searchComponent to one of the standard names, + If you register a searchComponent to one of the standard names, that will be used instead of the default. To insert components before or after the 'standard' components, use: - + myFirstComponentName - + myLastComponentName NOTE: The component registered with the name "debug" will - always be executed after the "last-components" - + always be executed after the "last-components" + --> @@ -913,7 +913,7 @@ --> - @@ -958,8 +958,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. --> @@ -1032,8 +1032,8 @@ - @@ -1078,7 +1078,7 @@ - - - @@ -1220,8 +1220,8 @@ on the fly based on the hash code of some other fields. This example has overwriteDupes set to false since we are using the id field as the signatureField and Solr will maintain - uniqueness based on that anyway. - + uniqueness based on that anyway. + --> 5 @@ -1331,7 +1331,7 @@ @@ -1364,12 +1364,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 diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml index 8adf13e76d7..76e4db25599 100644 --- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml +++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml @@ -16,9 +16,9 @@ limitations under the License. --> - - @@ -87,14 +87,14 @@ - - + - @@ -139,19 +139,19 @@ Index Config - These settings control low-level behavior of indexing Most example settings here show the default value, but are commented out, to more easily see where customizations have been made. - + Note: This replaces and from older versions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - - @@ -166,7 +166,7 @@ - - - - @@ -237,12 +237,12 @@ 30MINUTES 1DAY --> - @@ -292,12 +292,12 @@ ${solr.ulog.dir:} ${solr.ulog.numVersionBuckets:65536} - + - - ${solr.autoCommit.maxTime:15000} - false + + ${solr.autoCommit.maxTime:15000} + false - - ${solr.autoSoftCommit.maxTime:-1} + + ${solr.autoSoftCommit.maxTime:-1} - + 1024 - + + --> -1 @@ -419,7 +419,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 @@ -466,19 +466,19 @@ size="512" initialSize="512" autowarmCount="0"/> - + - - + + 20 200 @@ -593,10 +593,10 @@ prepared but there is no current registered searcher to handle requests or to gain autowarming data from. - + --> @@ -644,19 +644,19 @@ multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. - + formdataUploadLimitInKB - specifies the max size (in KiB) of form data (application/x-www-form-urlencoded) sent via POST. You can use POST to pass request parameters not fitting into the URL. - + addHttpRequestToContext - if set to true, it will instruct the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the + object in the context map of the SolrQueryRequest under the key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom + Solr components, but may be useful when developing custom plugins. - + *** WARNING *** Before enabling remote streaming, you should make sure your system has authentication enabled. @@ -678,21 +678,21 @@ - on - false + false 5 2 - 5 + 5 true - true + true 5 - 3 + 3 @@ -949,10 +949,10 @@ - @@ -968,18 +968,18 @@ - + @@ -1047,11 +1047,11 @@ .01 --> - + wordbreak - solr.WordBreakSolrSpellChecker + solr.WordBreakSolrSpellChecker name true true @@ -1070,7 +1070,7 @@ --> - - - @@ -1119,33 +1119,33 @@ default wordbreak on - true + true 10 5 - 5 + 5 true - true + true 10 - 5 + 5 spellcheck - mySuggester - FuzzyLookupFactory + FuzzyLookupFactory DocumentDictionaryFactory cat price @@ -1154,7 +1154,7 @@ - true @@ -1176,8 +1176,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. --> @@ -1194,7 +1194,7 @@ when running solr to run with clustering enabled: -Dsolr.clustering.enabled=true - https://cwiki.apache.org/confluence/display/solr/Result+Clustering + https://lucene.apache.org/solr/guide/result-clustering.html --> true false - + terms @@ -1330,7 +1330,7 @@ - @@ -1338,10 +1338,10 @@ - - @@ -1354,7 +1354,7 @@ - @@ -1364,27 +1364,27 @@ - - - + - - + - - + - - - ]]> - - @@ -1413,8 +1413,8 @@ .,!? - - @@ -1436,15 +1436,15 @@ http://wiki.apache.org/solr/UpdateRequestProcessor - --> + --> - + - + text/plain; charset=UTF-8 - + ${velocity.template.base.dir:} - + 5 @@ -1553,7 +1553,7 @@ @@ -1583,7 +1583,7 @@ when running solr to run with ltr enabled: -Dsolr.ltr.enabled=true - https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank + https://lucene.apache.org/solr/guide/learning-to-rank.html Query parser is used to rerank top docs with a provided model --> @@ -1597,12 +1597,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 @@ -1624,7 +1624,7 @@ when running solr to run with ltr enabled: -Dsolr.ltr.enabled=true - https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank + https://lucene.apache.org/solr/guide/learning-to-rank.html --> QUERY_DOC_FV diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html index ba8609717b6..35cd19600cf 100644 --- a/solr/webapp/web/index.html +++ b/solr/webapp/web/index.html @@ -225,7 +225,7 @@ limitations under the License.
  • Issue Tracker
  • IRC Channel
  • Community forum
    • -
  • Solr Query Syntax
    • +
  • Solr Query Syntax