Author: bpoussin Date: 2010-12-17 17:38:41 +0100 (Fri, 17 Dec 2010) New Revision: 620 Url: http://nuiton.org/repositories/revision/wikitty/620 Log: try to commit purged version of solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:33:52 UTC (rev 619) +++ trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:38:41 UTC (rev 620) @@ -71,33 +71,6 @@ <commitLockTimeout>10000</commitLockTimeout> <!-- - Expert: Turn on Lucene's auto commit capability. - This causes intermediate segment flushes to write a new lucene - index descriptor, enabling it to be opened by an external - IndexReader. - NOTE: Despite the name, this value does not have any relation to Solr's autoCommit functionality - --> - <!--<luceneAutoCommit>false</luceneAutoCommit>--> - <!-- - Expert: - The Merge Policy in Lucene controls how merging is handled by Lucene. The default in 2.3 is the LogByteSizeMergePolicy, previous - versions used LogDocMergePolicy. - - LogByteSizeMergePolicy chooses segments to merge based on their size. The Lucene 2.2 default, LogDocMergePolicy chose when - to merge based on number of documents - - Other implementations of MergePolicy must have a no-argument constructor - --> - <!--<mergePolicy>org.apache.lucene.index.LogByteSizeMergePolicy</mergePolicy>--> - - <!-- - Expert: - The Merge Scheduler in Lucene controls how merges are performed. The ConcurrentMergeScheduler (Lucene 2.3 default) - can perform merges in the background using separate threads. The SerialMergeScheduler (Lucene 2.2 default) does not. - --> - <!--<mergeScheduler>org.apache.lucene.index.ConcurrentMergeScheduler</mergeScheduler>--> - - <!-- This option specifies which Lucene LockFactory implementation to use. single = SingleInstanceLockFactory - suggested for a read-only index @@ -147,46 +120,6 @@ <!-- the default high-performance update handler --> <updateHandler class="solr.DirectUpdateHandler2"> - - <!-- A prefix of "solr." for class names is an alias that - causes solr to search appropriate packages, including - org.apache.solr.(search|update|request|core|analysis) - --> - - <!-- Perform a <commit/> automatically under certain conditions: - maxDocs - number of updates since last commit is greater than this - maxTime - oldest uncommited update (in ms) is this long ago - <autoCommit> - <maxDocs>10000</maxDocs> - <maxTime>1000</maxTime> - </autoCommit> - --> - - <!-- The RunExecutableListener executes an external command. - exe - the name of the executable to run - dir - dir to use as the current working directory. default="." - wait - the calling thread waits until the executable returns. default="true" - args - the arguments to pass to the program. default=nothing - env - environment variables to set. default=nothing - --> - <!-- A postCommit event is fired after every commit or optimize command - <listener event="postCommit" class="solr.RunExecutableListener"> - <str name="exe">solr/bin/snapshooter</str> - <str name="dir">.</str> - <bool name="wait">true</bool> - <arr name="args"> <str>arg1</str> <str>arg2</str> </arr> - <arr name="env"> <str>MYVAR=val1</str> </arr> - </listener> - --> - <!-- A postOptimize event is fired only after every optimize command, useful - in conjunction with index distribution to only distribute optimized indicies - <listener event="postOptimize" class="solr.RunExecutableListener"> - <str name="exe">snapshooter</str> - <str name="dir">solr/bin</str> - <bool name="wait">true</bool> - </listener> - --> - </updateHandler> @@ -215,7 +148,7 @@ class="solr.LRUCache" size="512" initialSize="512" - autowarmCount="128"/> + autowarmCount="0"/> <!-- queryResultCache caches results of searches - ordered lists of document ids (DocList) based on a query, a sort, and the range @@ -224,7 +157,7 @@ class="solr.LRUCache" size="512" initialSize="512" - autowarmCount="32"/> + autowarmCount="0"/> <!-- documentCache caches Lucene Document objects (the stored fields for each document). Since Lucene internal document ids are transient, this cache will not be autowarmed. --> @@ -242,36 +175,19 @@ --> <enableLazyFieldLoading>true</enableLazyFieldLoading> - <!-- Example of a generic cache. These caches may be accessed by name - through SolrIndexSearcher.getCache(),cacheLookup(), and cacheInsert(). - The purpose is to enable easy caching of user/application level data. - The regenerator argument should be specified as an implementation - of solr.search.CacheRegenerator if autowarming is desired. --> - <!-- - <cache name="myUserCache" - class="solr.LRUCache" - size="4096" - initialSize="1024" - autowarmCount="1024" - regenerator="org.mycompany.mypackage.MyRegenerator" - /> - --> - - <!-- An optimization that attempts to use a filter to satisfy a search. - If the requested sort does not include score, then the filterCache - will be checked for a filter matching the query. If found, the filter - will be used as the source of document ids, and then the sort will be - applied to that. - <useFilterForSortedQuery>true</useFilterForSortedQuery> - --> - <!-- An optimization for use with the queryResultCache. When a search is requested, a superset of the requested number of document ids are collected. For example, if a search for a particular query requests matching documents 10 through 19, and queryWindowSize is 50, then documents 0 through 49 will be collected and cached. Any further requests in that range can be satisfied via the cache. --> - <queryResultWindowSize>50</queryResultWindowSize> + <!-- + | Code Lutin + | 1 si Wikitty est plus utilise pour de l'ecriture que de la lecture + | la valeur par defaut est 50. Il semble convenable de mettre deux fois + | la taille de la recherche. Si on pagine par 25, 50 est une bonne valeur. + +--> + <queryResultWindowSize>1</queryResultWindowSize> <!-- Maximum number of documents to cache for any entry in the queryResultCache. --> @@ -283,28 +199,6 @@ iterate over, and faster to take intersections. --> <HashDocSet maxSize="3000" loadFactor="0.75"/> - <!-- a newSearcher event is fired whenever a new searcher is being prepared - and there is a current searcher handling requests (aka registered). --> - <!-- QuerySenderListener takes an array of NamedList and executes a - local query request for each NamedList in sequence. --> - <listener event="newSearcher" class="solr.QuerySenderListener"> - <arr name="queries"> - <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> - <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst> - <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> - - <!-- a firstSearcher event is fired whenever a new searcher is being - prepared but there is no current registered searcher to handle - requests or to gain autowarming data from. --> - <listener event="firstSearcher" class="solr.QuerySenderListener"> - <arr name="queries"> - <lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> </lst> - <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> - <!-- If a search request comes in and there is no current registered searcher, then immediately register the still warming searcher and use it. If "false" then all requests will block until the first searcher is done @@ -314,7 +208,7 @@ <!-- Maximum number of searchers that may be warming in the background concurrently. An error is returned if this limit is exceeded. Recommend 1-2 for read-only slaves, higher for masters w/o cache warming. --> - <maxWarmingSearchers>2</maxWarmingSearchers> + <maxWarmingSearchers>5</maxWarmingSearchers> </query> @@ -326,48 +220,17 @@ <requestDispatcher handleSelect="true" > <!--Make sure your system has some authentication before enabling remote streaming! --> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" /> - - <!-- Set HTTP caching related parameters (for proxy caches and clients). - - To get the behaviour of Solr 1.2 (ie: no caching related headers) - use the never304="true" option and do not specify a value for - <cacheControl> - --> - <!-- <httpCaching never304="true"> --> - <httpCaching lastModifiedFrom="openTime" - etagSeed="Solr"> - <!-- lastModFrom="openTime" is the default, the Last-Modified value - (and validation against If-Modified-Since requests) will all be - relative to when the current Searcher was opened. - You can change it to lastModFrom="dirLastMod" if you want the - value to exactly corrispond to when the physical index was last - modified. - - etagSeed="..." is an option you can change to force the ETag - header (and validation against If-None-Match requests) to be - differnet even if the index has not changed (ie: when making - significant changes to your config file) + </requestDispatcher> - lastModifiedFrom and etagSeed are both ignored if you use the - never304="true" option. - --> - <!-- If you include a <cacheControl> directive, it will be used to - generate a Cache-Control header, as well as an Expires header - if the value contains "max-age=" - - By default, no Cache-Control header is generated. - You can use the <cacheControl> option even if you have set - never304="true" - --> - <!-- <cacheControl>max-age=30, public</cacheControl> --> - </httpCaching> - </requestDispatcher> - - - <!-- requestHandler plugins... incoming queries will be dispatched to the + +<!-- FIXME clean requestHandler to keep only necessary requestHandler --> + + + + <!-- requestHandler plugins... incoming queries will be dispatched to the correct handler based on the path or the qt (query type) param. - Names starting with a '/' are accessed with the a path equal to the + Names starting with a '/' are accessed with the a path equal to the registered name. Names without a leading '/' are accessed with: http://host/app/select?qt=name If no qt is defined, the requestHandler that declares default="true" @@ -377,7 +240,7 @@ <!-- default values for query parameters --> <lst name="defaults"> <str name="echoParams">explicit</str> - <!-- + <!-- <int name="rows">10</int> <str name="fl">*</str> <str name="version">2.1</str> @@ -389,7 +252,7 @@ <!-- DisMaxRequestHandler allows easy searching across multiple fields for simple user-entered phrases. It's implementation is now just the standard SearchHandler with a default query type - of "dismax". + of "dismax". see http://wiki.apache.org/solr/DisMaxRequestHandler --> <requestHandler name="dismax" class="solr.SearchHandler" > @@ -414,7 +277,7 @@ </str> <int name="ps">100</int> <str name="q.alt">*:*</str> - <!-- example highlighter config, enable per-query with hl=true --> + <!-- example highlighter config, enable per-query with hl=true --> <str name="hl.fl">text features name</str> <!-- for this field, we want no fragmenting, just highlighting --> <str name="f.name.hl.fragsize">0</str> @@ -478,13 +341,13 @@ <str name="facet.query">price:[500 TO *]</str> </lst> </requestHandler> - + <!-- Search components are registered to SolrCore and used by Search Handlers - + By default, the following components are avaliable: - + <searchComponent name="query" class="org.apache.solr.handler.component.QueryComponent" /> <searchComponent name="facet" class="org.apache.solr.handler.component.FacetComponent" /> <searchComponent name="mlt" class="org.apache.solr.handler.component.MoreLikeThisComponent" /> @@ -502,11 +365,11 @@ If you register a searchComponent to one of the standard names, that will be used instead. To insert handlers before or after the 'standard' components, use: - + <arr name="first-components"> <str>myFirstComponentName</str> </arr> - + <arr name="last-components"> <str>myLastComponentName</str> </arr> @@ -556,7 +419,7 @@ <str>spellcheck</str> </arr> </requestHandler> - + <!-- a search component that enables you to configure the top results for a given query regardless of the normal lucene scoring.--> @@ -578,12 +441,12 @@ </requestHandler> --> - <!-- Update request handler. - - Note: Since solr1.1 requestHandlers requires a valid content type header if posted in + <!-- Update request handler. + + Note: Since solr1.1 requestHandlers requires a valid content type header if posted in the body. For example, curl now requires: -H 'Content-type:text/xml; charset=utf-8' The response format differs from solr1.1 formatting and returns a standard error code. - + To enable solr1.1 behavior, remove the /update handler or change its path --> <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" /> @@ -593,33 +456,33 @@ for debugging and as a token server for other types of applications --> <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" /> - + <!-- CSV update handler, loaded on demand --> <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" /> - <!-- - Admin Handlers - This will register all the standard admin RequestHandlers. Adding + <!-- + Admin Handlers - This will register all the standard admin RequestHandlers. Adding this single handler is equivolent to registering: - + <requestHandler name="/admin/luke" class="org.apache.solr.handler.admin.LukeRequestHandler" /> <requestHandler name="/admin/system" class="org.apache.solr.handler.admin.SystemInfoHandler" /> <requestHandler name="/admin/plugins" class="org.apache.solr.handler.admin.PluginInfoHandler" /> <requestHandler name="/admin/threads" class="org.apache.solr.handler.admin.ThreadDumpHandler" /> <requestHandler name="/admin/properties" class="org.apache.solr.handler.admin.PropertiesRequestHandler" /> <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" > - + If you wish to hide files under ${solr.home}/conf, explicitly register the ShowFileRequestHandler using: <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" > <lst name="invariants"> - <str name="hidden">synonyms.txt</str> - <str name="hidden">anotherfile.txt</str> + <str name="hidden">synonyms.txt</str> + <str name="hidden">anotherfile.txt</str> </lst> </requestHandler> --> <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" /> - + <!-- ping/healthcheck --> <requestHandler name="/admin/ping" class="PingRequestHandler"> <lst name="defaults"> @@ -628,7 +491,7 @@ <str name="echoParams">all</str> </lst> </requestHandler> - + <!-- Echo the request contents back to the client --> <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > <lst name="defaults"> @@ -636,7 +499,16 @@ <str name="echoHandler">true</str> </lst> </requestHandler> - + + + + + + + + + + <highlighting> <!-- Configure the standard fragmenter --> <!-- This could most likely be commented out in the "default" case --> @@ -657,43 +529,9 @@ <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> </lst> </fragmenter> - - <!-- Configure the standard formatter --> - <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true"> - <lst name="defaults"> - <str name="hl.simple.pre"><![CDATA[<em>]]></str> - <str name="hl.simple.post"><![CDATA[</em>]]></str> - </lst> - </formatter> </highlighting> - - - <!-- queryResponseWriter plugins... query responses will be written using the - writer specified by the 'wt' request parameter matching the name of a registered - writer. - The "default" writer is the default and will be used if 'wt' is not specified - in the request. XMLResponseWriter will be used if nothing is specified here. - The json, python, and ruby writers are also available by default. - <queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/> - <queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/> - <queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/> - <queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/> - <queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/> - <queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/> - - <queryResponseWriter name="custom" class="com.example.MyResponseWriter"/> - --> - - <!-- XSLT response writer transforms the XML output by any xslt file found - in Solr's conf/xslt directory. Changes to xslt files are checked for - every xsltCacheLifetimeSeconds. - --> - <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter"> - <int name="xsltCacheLifetimeSeconds">5</int> - </queryResponseWriter> - - + <queryParser name="lucene" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> <!-- example of registering a query parser