Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml Thu Feb 1 15:47:58 2018 @@ -15,505 +15,68 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<!-- - For more details about configurations options that may appear in - this file, see http://wiki.apache.org/solr/SolrConfigXml. ---> <config> - <!-- In all configuration below, 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) - - You may also specify a fully qualified Java classname if you - have your own custom plugins. - --> - - <!-- Controls what version of Lucene various components of Solr - adhere to. Generally, you want to use the latest version to - get all bug fixes and improvements. It is highly recommended - that you fully re-index after changing this setting as it can - affect both how text is indexed and queried. - --> - <luceneMatchVersion>4.7</luceneMatchVersion> - - <!-- <lib/> directives can be used to instruct Solr to load an Jars - identified and use them to resolve any "plugins" specified in - your solrconfig.xml or schema.xml (ie: Analyzers, Request - Handlers, etc...). - - All directories and paths are resolved relative to the - instanceDir. - - Please note that <lib/> directives are processed in the order - that they appear in your solrconfig.xml file, and are "stacked" - on top of each other when building a ClassLoader - so if you have - plugin jars with dependencies on other jars, the "lower level" - dependency jars should be loaded first. - - If a "./lib" directory exists in your instanceDir, all files - found in it are included as if you had used the following - syntax... - - <lib dir="./lib" /> - --> - - <!-- A 'dir' option by itself adds any files found in the directory - to the classpath, this is useful for including all jars in a - directory. - - When a 'regex' is specified in addition to a 'dir', only the - files in that directory which completely match the regex - (anchored on both ends) will be included. - - If a 'dir' option (with or without a regex) is used and nothing - is found that matches, a warning will be logged. - - The examples below can be used to load some solr-contribs along - with their external dependencies. - --> - <!-- Data Directory - - Used to specify an alternate directory to hold all index data - other than the default ./data under the Solr home. If - replication is in use, this should match the replication - configuration. - --> - <dataDir>${solr.data.dir:}</dataDir> + <luceneMatchVersion>5.5.5</luceneMatchVersion> - <!-- The DirectoryFactory to use for indexes. + <dataDir>${solr.data.dir:}</dataDir> - solr.StandardDirectoryFactory is filesystem - based and tries to pick the best implementation for the current - JVM and platform. solr.NRTCachingDirectoryFactory, the default, - wraps solr.StandardDirectoryFactory and caches small files in memory - for better NRT performance. - - One can force a particular implementation via solr.MMapDirectoryFactory, - solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory. - - solr.RAMDirectoryFactory is memory based, not - persistent, and doesn't work with replication. - --> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"> </directoryFactory> - <!-- The CodecFactory for defining the format of the inverted index. - The default implementation is SchemaCodecFactory, which is the official Lucene - index format, but hooks into the schema to provide per-field customization of - the postings lists and per-document values in the fieldType element - (postingsFormat/docValuesFormat). Note that most of the alternative implementations - are experimental, so if you choose to customize the index format, its a good - idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader) - before upgrading to a newer version to avoid unnecessary reindexing. - --> <codecFactory class="solr.SchemaCodecFactory"/> - <!-- To enable dynamic schema REST APIs, use the following for <schemaFactory>: - - <schemaFactory class="ManagedIndexSchemaFactory"> - <bool name="mutable">true</bool> - <str name="managedSchemaResourceName">managed-schema</str> - </schemaFactory> - - When ManagedIndexSchemaFactory is specified, Solr will load the schema from - he resource named in 'managedSchemaResourceName', rather than from schema.xml. - Note that the managed schema resource CANNOT be named schema.xml. If the managed - schema does not exist, Solr will create it after reading schema.xml, then rename - 'schema.xml' to 'schema.xml.bak'. - - Do NOT hand edit the managed schema - external modifications will be ignored and - overwritten as a result of schema modification REST API calls. - - When ManagedIndexSchemaFactory is specified with mutable = true, schema - modification REST API calls will be allowed; otherwise, error responses will be - sent back for these requests. - --> <schemaFactory class="ClassicIndexSchemaFactory"/> - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 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 <indexDefaults> and <mainIndex> from older versions - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <indexConfig> - <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a - LimitTokenCountFilterFactory in your fieldType definition. E.g. - <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/> - --> - <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 --> - <!-- <writeLockTimeout>1000</writeLockTimeout> --> - - <!-- The maximum number of simultaneous threads that may be - indexing documents at once in IndexWriter; if more than this - many threads arrive they will wait for others to finish. - Default in Solr/Lucene is 8. --> - <!-- <maxIndexingThreads>8</maxIndexingThreads> --> - - <!-- Expert: Enabling compound file will use less files for the index, - using fewer file descriptors on the expense of performance decrease. - Default in Lucene is "true". Default in Solr is "false" (since 3.6) --> - <!-- <useCompoundFile>false</useCompoundFile> --> - - <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene - indexing for buffering added documents and deletions before they are - flushed to the Directory. - maxBufferedDocs sets a limit on the number of documents buffered - before flushing. - If both ramBufferSizeMB and maxBufferedDocs is set, then - Lucene will flush based on whichever limit is hit first. - The default is 100 MB. --> - <!-- <ramBufferSizeMB>100</ramBufferSizeMB> --> - <!-- <maxBufferedDocs>1000</maxBufferedDocs> --> - - <!-- Expert: Merge Policy - The Merge Policy in Lucene controls how merging of segments is done. - The default since Solr/Lucene 3.3 is TieredMergePolicy. - The default since Lucene 2.3 was the LogByteSizeMergePolicy, - Even older versions of Lucene used LogDocMergePolicy. - --> - <!-- - <mergePolicy class="org.apache.lucene.index.TieredMergePolicy"> - <int name="maxMergeAtOnce">10</int> - <int name="segmentsPerTier">10</int> - </mergePolicy> - --> - - <!-- Merge Factor - The merge factor controls how many segments will get merged at a time. - For TieredMergePolicy, mergeFactor is a convenience parameter which - will set both MaxMergeAtOnce and SegmentsPerTier at once. - For LogByteSizeMergePolicy, mergeFactor decides how many new segments - will be allowed before they are merged into one. - Default is 10 for both merge policies. - --> - - <!-- - <mergeFactor>10</mergeFactor> - --> - - <!-- Expert: Merge Scheduler - 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 class="org.apache.lucene.index.ConcurrentMergeScheduler"/> - --> - - <!-- LockFactory - - This option specifies which Lucene LockFactory implementation - to use. - - single = SingleInstanceLockFactory - suggested for a - read-only index or when there is no possibility of - another process trying to modify the index. - native = NativeFSLockFactory - uses OS native file locking. - Do not use when multiple solr webapps in the same - JVM are attempting to share a single index. - simple = SimpleFSLockFactory - uses a plain file for locking - - Defaults: 'native' is default for Solr3.6 and later, otherwise - 'simple' is the default - - More details on the nuances of each LockFactory... - http://wiki.apache.org/lucene-java/AvailableLockFactories - --> - <lockType>${solr.lock.type:native}</lockType> - <!-- Unlock On Startup + <lockType>${solr.lock.type:native}</lockType> - If true, unlock any held write or commit locks on startup. - This defeats the locking mechanism that allows multiple - processes to safely access a lucene index, and should be used - with care. Default is "false". - - This is not needed if lock type is 'single' - --> - <!-- - <unlockOnStartup>false</unlockOnStartup> - --> - - <!-- Expert: Controls how often Lucene loads terms into memory - Default is 128 and is likely good for most everyone. - --> - <!-- <termIndexInterval>128</termIndexInterval> --> - - <!-- If true, IndexReaders will be opened/reopened from the IndexWriter - instead of from the Directory. Hosts in a master/slave setup - should have this set to false while those in a SolrCloud - cluster need to be set to true. Default: true - --> - <!-- - <nrtMode>true</nrtMode> - --> - - <!-- Commit Deletion Policy - Custom deletion policies can be specified here. The class must - implement org.apache.lucene.index.IndexDeletionPolicy. - - 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. - --> - <!-- - <deletionPolicy class="solr.SolrDeletionPolicy"> - --> - <!-- The number of commit points to be kept --> - <!-- <str name="maxCommitsToKeep">1</str> --> - <!-- The number of optimized commit points to be kept --> - <!-- <str name="maxOptimizedCommitsToKeep">0</str> --> - <!-- - Delete all commit points once they have reached the given age. - Supports DateMathParser syntax e.g. - --> - <!-- - <str name="maxCommitAge">30MINUTES</str> - <str name="maxCommitAge">1DAY</str> - --> - <!-- - </deletionPolicy> - --> - - <!-- Lucene Infostream - - To aid in advanced debugging, Lucene provides an "InfoStream" - of detailed information when indexing. - - Setting the value to true will instruct the underlying Lucene - IndexWriter to write its info stream to solr's log. By default, - this is enabled here, and controlled through log4j.properties. - --> <infoStream>false</infoStream> </indexConfig> - - <!-- JMX - - This example enables JMX if and only if an existing MBeanServer - is found, use this if you want to configure JMX through JVM - parameters. Remove this to disable exposing Solr configuration - and statistics to JMX. - - For more details see http://wiki.apache.org/solr/SolrJmx - --> <jmx /> - <!-- If you want to connect to a particular server, specify the - agentId - --> - <!-- <jmx agentId="myAgent" /> --> - <!-- If you want to start a new MBeanServer, specify the serviceUrl --> - <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/> - --> - <!-- The default high-performance update handler --> <updateHandler class="solr.DirectUpdateHandler2"> - <!-- Enables a transaction log, used for real-time get, durability, and - and solr cloud replica recovery. The log can grow as big as - 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. --> <updateLog> <str name="dir">${solr.ulog.dir:}</str> </updateLog> - <!-- AutoCommit - - Perform a hard commit automatically under certain conditions. - Instead of enabling autoCommit, consider using "commitWithin" - when adding documents. - - http://wiki.apache.org/solr/UpdateXmlMessages - - maxDocs - Maximum number of documents to add since the last - commit before automatically triggering a new commit. - - maxTime - Maximum amount of time in ms that is allowed to pass - since a document was added before automatically - 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. - - If the updateLog is enabled, then it's highly recommended to - have some sort of hard autoCommit to limit the log size. - --> <autoCommit> <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> <openSearcher>false</openSearcher> </autoCommit> - <!-- softAutoCommit is like autoCommit except it causes a - 'soft' commit which only ensures that changes are visible - but does not ensure that data is synced to disk. This is - faster and more near-realtime friendly than a hard commit. - --> - <autoSoftCommit> <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> </autoSoftCommit> - <!-- Update Related Event Listeners - - Various IndexWriter related events can trigger Listeners to - take actions. - - postCommit - fired after every commit or optimize command - postOptimize - fired after every optimize command - --> - <!-- The RunExecutableListener executes an external command from a - hook such as postCommit or postOptimize. - - 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 is none) - env - environment variables to set. (default is none) - --> - <!-- This example shows how RunExecutableListener could be used - with the script based replication... - http://wiki.apache.org/solr/CollectionDistribution - --> - <!-- - <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> - --> - </updateHandler> - <!-- IndexReaderFactory - - Use the following format to specify a custom IndexReaderFactory, - which allows for alternate IndexReader implementations. - ** Experimental Feature ** - - Please note - Using a custom IndexReaderFactory may prevent - certain other features from working. The API to - IndexReaderFactory may change without warning or may even be - removed from future releases if the problems cannot be - resolved. - - - ** Features that may not work with custom IndexReaderFactory ** - - The ReplicationHandler assumes a disk-resident index. Using a - custom IndexReader implementation may cause incompatibility - with ReplicationHandler and may cause replication to not work - correctly. See SOLR-1366 for details. - - --> - <!-- - <indexReaderFactory name="IndexReaderFactory" class="package.class"> - <str name="someArg">Some Value</str> - </indexReaderFactory > - --> - <!-- By explicitly declaring the Factory, the termIndexDivisor can - be specified. - --> - <!-- - <indexReaderFactory name="IndexReaderFactory" - class="solr.StandardIndexReaderFactory"> - <int name="setTermIndexDivisor">12</int> - </indexReaderFactory > - --> - - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Query section - these settings control query time things like caches - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <query> - <!-- Max Boolean Clauses - - Maximum number of clauses in each BooleanQuery, an exception - is thrown if exceeded. - - ** WARNING ** - This option actually modifies a global Lucene property that - will affect all SolrCores. If multiple solrconfig.xml files - disagree on this property, the value at any given moment will - be based on the last SolrCore to be initialized. - - --> <maxBooleanClauses>1024</maxBooleanClauses> - <!-- Solr Internal Query Caches - - There are two implementations of cache available for Solr, - LRUCache, based on a synchronized LinkedHashMap, and - FastLRUCache, based on a ConcurrentHashMap. - - FastLRUCache has faster gets and slower puts in single - threaded operation and thus is generally faster than LRUCache - when the hit ratio of the cache is high (> 75%), and may be - faster under other scenarios on multi-cpu systems. - --> - - <!-- Filter Cache - - Cache used by SolrIndexSearcher for filters (DocSets), - unordered sets of *all* documents that match a query. When a - new searcher is opened, its caches may be prepopulated or - "autowarmed" using data from caches in the old searcher. - autowarmCount is the number of items to prepopulate. For - LRUCache, the autowarmed items will be the most recently - accessed items. - - Parameters: - class - the SolrCache implementation LRUCache or - (LRUCache or FastLRUCache) - size - the maximum number of entries in the cache - 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. - --> <filterCache class="solr.FastLRUCache" size="4096" initialSize="1024" autowarmCount="512"/> - <!-- Query Result Cache - - Caches results of searches - ordered lists of document ids - (DocList) based on a query, a sort, and the range of documents requested. - --> <queryResultCache class="solr.FastLRUCache" size="40960" initialSize="4096" autowarmCount="2048"/> - <!-- Document Cache - - Caches Lucene Document objects (the stored fields for each - document). Since Lucene internal document ids are transient, - this cache will not be autowarmed. - --> <documentCache class="solr.LRUCache" size="40960" initialSize="1024" autowarmCount="0"/> - <!-- custom cache currently used by block join --> <cache name="perSegFilter" class="solr.search.LRUCache" size="10" @@ -521,336 +84,44 @@ autowarmCount="10" regenerator="solr.NoOpRegenerator" /> - <!-- Field Value Cache - Cache used to hold field values that are quickly accessible - by document id. The fieldValueCache is created by default - even if not configured here. - --> <fieldValueCache class="solr.FastLRUCache" size="4096" autowarmCount="1024" showItems="32" /> - <!-- Custom Cache - - 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.CacheRegenerator - if autowarming is desired. - --> - <!-- - <cache name="myUserCache" - class="solr.LRUCache" - size="4096" - initialSize="1024" - autowarmCount="1024" - regenerator="com.mycompany.MyRegenerator" - /> - --> - - - <!-- Lazy Field Loading - - If true, stored fields that are not requested will be loaded - lazily. This can result in a significant speed improvement - if the usual case is to not load all stored fields, - especially if the skipped fields are large compressed text - fields. - --> <enableLazyFieldLoading>true</enableLazyFieldLoading> - <!-- Use Filter For Sorted Query - - A possible 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. - - For most situations, this will not be useful unless you - frequently get the same search repeatedly with different sort - options, and none of them ever use "score" - --> - <!-- - <useFilterForSortedQuery>true</useFilterForSortedQuery> - --> - - <!-- Result Window Size - - 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>20</queryResultWindowSize> - <!-- Maximum number of documents to cache for any entry in the - queryResultCache. - --> <queryResultMaxDocsCached>200</queryResultMaxDocsCached> - <!-- Query Related Event Listeners - - Various IndexSearcher related events can trigger Listeners to - take actions. - - newSearcher - fired whenever a new searcher is being prepared - and there is a current searcher handling requests (aka - registered). It can be used to prime certain caches to - prevent long request times for certain requests. - - firstSearcher - fired whenever a new searcher is being - prepared but there is no current registered searcher to handle - requests or to gain autowarming data from. - - - --> - <!-- 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="sort">price asc</str></lst> - <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst> - </arr> - </listener> - <listener event="firstSearcher" class="solr.QuerySenderListener"> - <arr name="queries"> - <lst> - <str name="q">static firstSearcher warming in solrconfig.xml</str> - </lst> - </arr> - </listener>--> - - <!-- Use Cold Searcher - - 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 warming. - --> <useColdSearcher>false</useColdSearcher> - <!-- Max Warming Searchers - - Maximum number of searchers that may be warming in the - background concurrently. An error is returned if this limit - is exceeded. - - Recommend values of 1-2 for read-only slaves, higher for - masters w/o cache warming. - --> <maxWarmingSearchers>2</maxWarmingSearchers> </query> - <!-- Request Dispatcher - - This section contains instructions for how the SolrDispatchFilter - should behave when processing requests for this SolrCore. - - handleSelect is a legacy option that affects the behavior of requests - such as /select?qt=XXX - - handleSelect="true" will cause the SolrDispatchFilter to process - the request and dispatch the query to a handler specified by the - "qt" param, assuming "/select" isn't already registered. - - handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests, resulting in a 404 unless a handler - is explicitly registered with the name "/select" - - handleSelect="true" is not recommended for new users, but is the default - for backwards compatibility - --> <requestDispatcher handleSelect="false" > - <!-- Request Parsing - - These settings indicate how Solr Requests may be parsed, and - what restrictions may be placed on the ContentStreams from - those requests - - enableRemoteStreaming - enables use of the stream.file - and stream.url parameters for specifying remote streams. - - 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 - key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom - plugins. - - *** WARNING *** - The settings below authorize Solr to fetch remote files, You - should make sure your system has some authentication before - using enableRemoteStreaming="true" - --> <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048" addHttpRequestToContext="false"/> - <!-- HTTP Caching - - Set HTTP caching related parameters (for proxy caches and clients). - - The options below instruct Solr not to output any HTTP Caching - related headers - --> <httpCaching never304="true" /> - <!-- 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" - --> - <!-- - <httpCaching never304="true" > - <cacheControl>max-age=30, public</cacheControl> - </httpCaching> - --> - <!-- To enable Solr to respond with automatically generated HTTP - Caching headers, and to response to Cache Validation requests - correctly, set the value of never304="false" - - This will cause Solr to generate Last-Modified and ETag - headers based on the properties of the Index. - - The following options can also be specified to affect the - values of these headers... - - lastModFrom - the default value is "openTime" which means 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 correspond 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 - different even if the index has not changed (ie: when making - significant changes to your config file) - - (lastModifiedFrom and etagSeed are both ignored if you use - the never304="true" option) - --> - <!-- - <httpCaching lastModifiedFrom="openTime" - etagSeed="Solr"> - <cacheControl>max-age=30, public</cacheControl> - </httpCaching> - --> - </requestDispatcher> - - <!-- Request Handlers - http://wiki.apache.org/solr/SolrRequestHandler - - Incoming queries will be dispatched to a specific handler by name - based on the path specified in the request. + </requestDispatcher> - Legacy behavior: If the request path uses "/select" but no Request - Handler has that name, and if handleSelect="true" has been specified in - the requestDispatcher, then the Request Handler is dispatched based on - the qt parameter. Handlers without a leading '/' are accessed this way - like so: http://host/app/[core/]select?qt=name If no qt is - given, then the requestHandler that declares default="true" will be - used or the one named "standard". - - If a Request Handler is declared with startup="lazy", then it will - not be initialized until the first request that uses it. - - --> - <!-- SearchHandler - - http://wiki.apache.org/solr/SearchHandler - - For processing Search Queries, the primary Request Handler - provided with Solr is "SearchHandler" It delegates to a sequent - of SearchComponents (see below) and supports distributed - queries across multiple shards - --> <requestHandler name="/select" class="solr.SearchHandler"> - <!-- default values for query parameters can be specified, these - will be overridden by parameters in the request - --> <lst name="defaults"> <str name="echoParams">none</str> <str name="wt">json</str> <int name="rows">10</int> <str name="df">catch_all</str> </lst> - <!-- In addition to defaults, "appends" params can be specified - to identify values which should be appended to the list of - multi-val params from the query (or the existing "defaults"). - --> - <!-- In this example, the param "fq=instock:true" would be appended to - any query time fq params the user may specify, as a mechanism for - partitioning the index, independent of any user selected filtering - that may also be desired (perhaps as a result of faceted searching). - - NOTE: there is *absolutely* nothing a client can do to prevent these - "appends" values from being used, so don't use this mechanism - unless you are sure you always want it. - --> - <!-- - <lst name="appends"> - <str name="fq">inStock:true</str> - </lst> - --> - <!-- "invariants" are a way of letting the Solr maintainer lock down - the options available to Solr clients. Any params values - specified here are used regardless of what values may be specified - in either the query, the "defaults", or the "appends" params. - - In this example, the facet.field and facet.query params would - be fixed, limiting the facets clients can use. Faceting is - not turned on by default - but if the client does specify - facet=true in the request, these are the only facets they - will be able to see counts for; regardless of what other - facet.field or facet.query params they may specify. - - NOTE: there is *absolutely* nothing a client can do to prevent these - "invariants" values from being used, so don't use this mechanism - unless you are sure you always want it. - --> - <!-- - <lst name="invariants"> - <str name="facet.field">cat</str> - <str name="facet.field">manu_exact</str> - <str name="facet.query">price:[* TO 500]</str> - <str name="facet.query">price:[500 TO *]</str> - </lst> - --> - <!-- If the default list of SearchComponents is not desired, that - list can either be overridden completely, or components can be - prepended or appended to the default list. (see below) - --> - <!-- - <arr name="components"> - <str>nameOfCustomComponent1</str> - <str>nameOfCustomComponent2</str> - </arr> - --> + <arr name="last-components"> </arr> </requestHandler> @@ -866,17 +137,6 @@ </requestHandler> - <!-- realtime get handler, guaranteed to return the latest stored fields of - any document, without the need to commit or open a new searcher. The - current implementation relies on the updateLog feature being enabled. - - ** WARNING ** - Do NOT disable the realtime get handler at /get if you are using - SolrCloud otherwise any leader election will cause a full sync in ALL - replicas for the shard in question. Similarly, a replica recovery will - also always fetch the complete index from the leader because a partial - sync will not be possible in the absence of this handler. - --> <requestHandler name="/get" class="solr.RealTimeGetHandler"> <lst name="defaults"> <str name="omitHeader">true</str> @@ -885,90 +145,6 @@ </lst> </requestHandler> - - - - - <!-- Update Request Handler. - - http://wiki.apache.org/solr/UpdateXmlMessages - - The canonical Request Handler for Modifying the Index through - commands specified using XML, JSON, CSV, or JAVABIN - - 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' - - To override the request content type and force a specific - Content-type, use the request parameter: - ?update.contentType=text/csv - - This handler will pick a response format to match the input - if the 'wt' parameter is not explicit - --> - <requestHandler name="/update" class="solr.UpdateRequestHandler"> - <!-- See below for information on defining - updateRequestProcessorChains that can be used by name - on each Update Request - --> - <!-- - <lst name="defaults"> - <str name="update.chain">dedupe</str> - </lst> - --> - </requestHandler> - - <!-- for back compat with clients using /update/json and /update/csv --> - <requestHandler name="/update/json" class="solr.UpdateRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/json</str> - </lst> - </requestHandler> - <requestHandler name="/update/csv" class="solr.UpdateRequestHandler"> - <lst name="defaults"> - <str name="stream.contentType">application/csv</str> - </lst> - </requestHandler> - - <!-- Solr Cell Update Request Handler - - http://wiki.apache.org/solr/ExtractingRequestHandler - - --> - <requestHandler name="/update/extract" - startup="lazy" - class="solr.extraction.ExtractingRequestHandler" > - <lst name="defaults"> - <str name="lowernames">true</str> - <str name="uprefix">ignored_</str> - - <!-- capture link hrefs but ignore div attributes --> - <str name="captureAttr">true</str> - <str name="fmap.a">links</str> - <str name="fmap.div">ignored_</str> - </lst> - </requestHandler> - - - <!-- Field Analysis Request Handler - - RequestHandler that provides much the same functionality as - analysis.jsp. Provides the ability to specify multiple field - types and field names in the same request and outputs - index-time and query-time analysis for each of them. - - Request parameters are: - analysis.fieldname - field name whose analyzers are to be used - - analysis.fieldtype - field type whose analyzers are to be used - analysis.fieldvalue - text for index-time analysis - q (or analysis.q) - text for query time analysis - analysis.showmatch (true|false) - When set to true and when - query analysis is performed, the produced tokens of the - field value analysis will be marked as "matched" for every - token that is produces by the query analysis - --> <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" /> @@ -976,78 +152,13 @@ <requestHandler name="/mlt" class="solr.MoreLikeThisHandler"> </requestHandler> - <!-- Document Analysis Handler - - http://wiki.apache.org/solr/AnalysisRequestHandler - - An analysis handler that provides a breakdown of the analysis - process of provided documents. This handler expects a (single) - content stream with the following format: - - <docs> - <doc> - <field name="id">1</field> - <field name="name">The Name</field> - <field name="text">The Text Value</field> - </doc> - <doc>...</doc> - <doc>...</doc> - ... - </docs> - - Note: Each document must contain a field which serves as the - unique key. This key is used in the returned response to associate - an analysis breakdown to the analyzed document. - - Like the FieldAnalysisRequestHandler, this handler also supports - query analysis by sending either an "analysis.query" or "q" - 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". - --> <requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler" startup="lazy" /> - <!-- Admin Handlers - - Admin Handlers - This will register all the standard admin - RequestHandlers. - --> <requestHandler name="/admin/" class="solr.admin.AdminHandlers" /> - <!-- This single handler is equivalent to the following... --> - <!-- - <requestHandler name="/admin/luke" class="solr.admin.LukeRequestHandler" /> - <requestHandler name="/admin/system" class="solr.admin.SystemInfoHandler" /> - <requestHandler name="/admin/plugins" class="solr.admin.PluginInfoHandler" /> - <requestHandler name="/admin/threads" class="solr.admin.ThreadDumpHandler" /> - <requestHandler name="/admin/properties" class="solr.admin.PropertiesRequestHandler" /> - <requestHandler name="/admin/file" class="solr.admin.ShowFileRequestHandler" > - --> - <!-- If you wish to hide files under ${solr.home}/conf, explicitly - register the ShowFileRequestHandler using the definition below. - NOTE: The glob pattern ('*') is the only pattern supported at present, *.xml will - not exclude all files ending in '.xml'. Use it to exclude _all_ updates - --> - <!-- - <requestHandler name="/admin/file" - class="solr.admin.ShowFileRequestHandler" > - <lst name="invariants"> - <str name="hidden">synonyms.txt</str> - <str name="hidden">anotherfile.txt</str> - <str name="hidden">*</str> - </lst> - </requestHandler> - --> - - <!-- - Enabling this request handler (which is NOT a default part of the admin handler) will allow the Solr UI to edit - all the config files. This is intended for secure/development use ONLY! Leaving available and publically - accessible is a security vulnerability and should be done with extreme caution! - --> - <!-- ping/healthcheck --> + <requestHandler name="/admin/ping" class="solr.PingRequestHandler"> <lst name="invariants"> <str name="q">solrpingquery</str> @@ -1055,47 +166,6 @@ <lst name="defaults"> <str name="echoParams">all</str> </lst> - <!-- An optional feature of the PingRequestHandler is to configure the - handler with a "healthcheckFile" which can be used to enable/disable - the PingRequestHandler. - relative paths are resolved against the data dir - --> - <!-- <str name="healthcheckFile">server-enabled.txt</str> --> - </requestHandler> - - <!-- Solr Replication - - The SolrReplicationHandler supports replicating indexes from a - "master" used for indexing and "slaves" used for queries. - - http://wiki.apache.org/solr/SolrReplication - - It is also necessary for SolrCloud to function (in Cloud mode, the - replication handler is used to bulk transfer segments when nodes - are added or need to recover). - - https://wiki.apache.org/solr/SolrCloud/ - --> - <requestHandler name="/replication" class="solr.ReplicationHandler" > - <!-- - To enable simple master/slave replication, uncomment one of the - sections below, depending on whether this solr instance should be - the "master" or a "slave". If this instance is a "slave" you will - also need to fill in the masterUrl to point to a real machine. - --> - <!-- - <lst name="master"> - <str name="replicateAfter">commit</str> - <str name="replicateAfter">startup</str> - <str name="confFiles">schema.xml,stopwords.txt</str> - </lst> - --> - <!-- - <lst name="slave"> - <str name="masterUrl">http://your-master-hostname:8983/solr</str> - <str name="pollInterval">00:00:60</str> - </lst> - --> </requestHandler> @@ -1107,7 +177,7 @@ <str name="field">:suggest</str> <str name="weightField">:suggest-weight</str> <str name="suggestAnalyzerFieldType">string</str> - <str name="buildOnCommit">true</str> + <str name="buildOnStartup">true</str> </lst> </searchComponent> @@ -1122,58 +192,6 @@ </requestHandler> - <!-- Search Components - - Search components are registered to SolrCore and used by - instances of SearchHandler (which can access them by name) - - By default, the following components are available: - - <searchComponent name="query" class="solr.QueryComponent" /> - <searchComponent name="facet" class="solr.FacetComponent" /> - <searchComponent name="mlt" class="solr.MoreLikeThisComponent" /> - <searchComponent name="highlight" class="solr.HighlightComponent" /> - <searchComponent name="stats" class="solr.StatsComponent" /> - <searchComponent name="debug" class="solr.DebugComponent" /> - - Default configuration in a requestHandler would look like: - - <arr name="components"> - <str>query</str> - <str>facet</str> - <str>mlt</str> - <str>highlight</str> - <str>stats</str> - <str>debug</str> - </arr> - - 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: - - <arr name="first-components"> - <str>myFirstComponentName</str> - </arr> - - <arr name="last-components"> - <str>myLastComponentName</str> - </arr> - - NOTE: The component registered with the name "debug" will - always be executed after the "last-components" - - --> - - <!-- Spell Check - - The spell check component can return a list of alternative spelling - suggestions. - - http://wiki.apache.org/solr/SpellCheckComponent - --> - - <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> <str name="queryAnalyzerFieldType">spellcheck</str> @@ -1218,10 +236,7 @@ </arr> </requestHandler> - <!-- Highlighting Component - http://wiki.apache.org/solr/HighlightingParameters - --> <searchComponent class="solr.HighlightComponent" name="highlight"> <highlighting> <!-- Configure the standard fragmenter --> @@ -1326,166 +341,11 @@ </highlighting> </searchComponent> - <!-- Update Processors - - Chains of Update Processor Factories for dealing with Update - Requests can be declared, and then used by name in Update - Request Processors - - http://wiki.apache.org/solr/UpdateRequestProcessor - - --> - <!-- Deduplication - - An example dedup update processor that creates the "id" field - 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. - - --> - <!-- - <updateRequestProcessorChain name="dedupe"> - <processor class="solr.processor.SignatureUpdateProcessorFactory"> - <bool name="enabled">true</bool> - <str name="signatureField">id</str> - <bool name="overwriteDupes">false</bool> - <str name="fields">name,features,cat</str> - <str name="signatureClass">solr.processor.Lookup3Signature</str> - </processor> - <processor class="solr.LogUpdateProcessorFactory" /> - <processor class="solr.RunUpdateProcessorFactory" /> - </updateRequestProcessorChain> - --> - - <!-- Language identification - - This example update chain identifies the language of the incoming - documents using the langid contrib. The detected language is - written to field language_s. No field name mapping is done. - The fields used for detection are text, title, subject and description, - making this example suitable for detecting languages form full-text - rich documents injected via ExtractingRequestHandler. - See more about langId at http://wiki.apache.org/solr/LanguageDetection - --> - <!-- - <updateRequestProcessorChain name="langid"> - <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory"> - <str name="langid.fl">text,title,subject,description</str> - <str name="langid.langField">language_s</str> - <str name="langid.fallback">en</str> - </processor> - <processor class="solr.LogUpdateProcessorFactory" /> - <processor class="solr.RunUpdateProcessorFactory" /> - </updateRequestProcessorChain> - --> - - <!-- Script update processor - - This example hooks in an update processor implemented using JavaScript. - - See more about the script update processor at http://wiki.apache.org/solr/ScriptUpdateProcessor - --> - <!-- - <updateRequestProcessorChain name="script"> - <processor class="solr.StatelessScriptUpdateProcessorFactory"> - <str name="script">update-script.js</str> - <lst name="params"> - <str name="config_param">example config parameter</str> - </lst> - </processor> - <processor class="solr.RunUpdateProcessorFactory" /> - </updateRequestProcessorChain> - --> - - <!-- Response Writers - - http://wiki.apache.org/solr/QueryResponseWriter - - Request 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. - --> - <!-- The following response writers are implicitly configured unless - overridden... - --> - <!-- - <queryResponseWriter name="xml" - default="true" - class="solr.XMLResponseWriter" /> - <queryResponseWriter name="json" class="solr.JSONResponseWriter"/> - <queryResponseWriter name="python" class="solr.PythonResponseWriter"/> - <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/> - <queryResponseWriter name="php" class="solr.PHPResponseWriter"/> - <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/> - <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/> - <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/> - --> <queryResponseWriter name="json" class="solr.JSONResponseWriter"> - <!-- For the purposes of the tutorial, JSON responses are written as - plain text so that they are easy to read in *any* browser. - If you expect a MIME type of "application/json" just remove this override. - --> <str name="content-type">text/plain; charset=UTF-8</str> </queryResponseWriter> - <!-- Query Parsers - - http://wiki.apache.org/solr/SolrQuerySyntax - - Multiple QParserPlugins can be registered by name, and then - used in either the "defType" param for the QueryComponent (used - by SearchHandler) or in LocalParams - --> - <!-- example of registering a query parser --> - <!-- - <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/> - --> - - <!-- Function Parsers - - http://wiki.apache.org/solr/FunctionQuery - - Multiple ValueSourceParsers can be registered by name, and then - used as function names when using the "func" QParser. - --> - <!-- example of registering a custom function parser --> - <!-- - <valueSourceParser name="myfunc" - class="com.mycompany.MyValueSourceParser" /> - --> - - - <!-- Document Transformers - http://wiki.apache.org/solr/DocTransformers - --> - <!-- - Could be something like: - <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" > - <int name="connection">jdbc://....</int> - </transformer> - - To add a constant value to all docs, use: - <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" > - <int name="value">5</int> - </transformer> - - If you want the user to still be able to change it with _value:something_ use this: - <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" > - <double name="defaultValue">5</double> - </transformer> - - If you are using the QueryElevationComponent, you may wish to mark documents that get boosted. The - EditorialMarkerFactory will do exactly that: - <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" /> - --> - - - <!-- Legacy config for the admin interface --> <admin> <defaultQuery>*:*</defaultQuery> </admin>
Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java Thu Feb 1 15:47:58 2018 @@ -35,8 +35,11 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; +import static org.junit.Assert.assertNotNull; + public class SolrOakRepositoryStub extends OakSegmentTarRepositoryStub { public SolrOakRepositoryStub(Properties settings) @@ -46,13 +49,12 @@ public class SolrOakRepositoryStub exten @Override protected void preCreateRepository(Jcr jcr) { - String path = getClass().getResource("/").getFile() + "/queryjcrtest" ; - File f = new File(path); - final SolrServer solrServer; + File f = new File("target" + File.separatorChar + "queryjcrtest-" + System.currentTimeMillis()); + final SolrClient solrServer; try { solrServer = new EmbeddedSolrServerProvider(new EmbeddedSolrServerConfiguration(f.getPath(), "oak")).getSolrServer(); } catch (Exception e) { - throw new RuntimeException(); + throw new RuntimeException(e); } SolrServerProvider solrServerProvider = new SolrServerProvider() { @Override @@ -62,21 +64,22 @@ public class SolrOakRepositoryStub exten @CheckForNull @Override - public SolrServer getSolrServer() throws Exception { + public SolrClient getSolrServer() throws Exception { return solrServer; } @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return solrServer; } @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return solrServer; } }; try { + assertNotNull(solrServer); // safely remove any previous document on the index solrServer.deleteByQuery("*:*"); solrServer.commit(); Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java Thu Feb 1 15:47:58 2018 @@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.EditorHook; import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.junit.After; import org.junit.Before; @@ -45,7 +46,7 @@ public abstract class SolrBaseTest { protected NodeStore store; protected TestUtils provider; - protected SolrServer server; + protected SolrClient server; protected OakSolrConfiguration configuration; protected EditorHook hook; private ContentRepository repository; Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java Thu Feb 1 15:47:58 2018 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.oak.plugins.index.solr; -import java.io.File; -import java.io.IOException; - import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration; @@ -28,7 +27,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import static org.junit.Assert.assertTrue; @@ -40,11 +39,13 @@ public class TestUtils static final String SOLR_HOME_PATH = "/solr"; - public static SolrServer createSolrServer() { - EmbeddedSolrServerConfiguration configuration = new EmbeddedSolrServerConfiguration( - TestUtils.class.getResource(SOLR_HOME_PATH).getFile(), "oak"); - EmbeddedSolrServerProvider provider = new EmbeddedSolrServerProvider(configuration); + public static SolrClient createSolrServer() { try { + File file = new File(TestUtils.class.getResource(SOLR_HOME_PATH).toURI()); + EmbeddedSolrServerConfiguration configuration = new EmbeddedSolrServerConfiguration( + file.getAbsolutePath(), "oak"); + EmbeddedSolrServerProvider provider = new EmbeddedSolrServerProvider(configuration); + return provider.getSolrServer(); } catch (Exception e) { throw new RuntimeException(e); @@ -84,25 +85,25 @@ public class TestUtils }; } - private final SolrServer solrServer = createSolrServer(); + private final SolrClient solrServer = createSolrServer(); private final OakSolrConfiguration configuration = getTestConfiguration(); @CheckForNull @Override - public SolrServer getSolrServer() { + public SolrClient getSolrServer() { return solrServer; } @CheckForNull @Override - public SolrServer getIndexingSolrServer() throws Exception { + public SolrClient getIndexingSolrServer() throws Exception { return solrServer; } @CheckForNull @Override - public SolrServer getSearchingSolrServer() throws Exception { + public SolrClient getSearchingSolrServer() throws Exception { return solrServer; } Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Thu Feb 1 15:47:58 2018 @@ -56,53 +56,53 @@ public class DefaultAnalyzersConfigurati public void setUp() throws Exception { this.exactPathAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.parentPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.parentPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); - TokenStream filter = new ReverseStringFilter(Version.LUCENE_47, source); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); + TokenStream filter = new ReverseStringFilter(source); filter = new PatternReplaceFilter(filter, Pattern.compile("[^\\/]+\\/"), "", false); - filter = new ReverseStringFilter(Version.LUCENE_47, filter); + filter = new ReverseStringFilter(filter); return new TokenStreamComponents(source, filter); } }; this.directChildrenPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); - TokenStream filter = new ReverseStringFilter(Version.LUCENE_47, source); - filter = new LengthFilter(Version.LUCENE_47, filter, 2, Integer.MAX_VALUE); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); + TokenStream filter = new ReverseStringFilter(source); + filter = new LengthFilter(filter, 2, Integer.MAX_VALUE); filter = new PatternReplaceFilter(filter, Pattern.compile("([^\\/]+)(\\/)"), "$2", false); filter = new PatternReplaceFilter(filter, Pattern.compile("(\\/)(.+)"), "$2", false); - filter = new ReverseStringFilter(Version.LUCENE_47, filter); + filter = new ReverseStringFilter(filter); return new TokenStreamComponents(source, filter); } }; this.directChildrenPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; this.allChildrenPathIndexingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new PathHierarchyTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new PathHierarchyTokenizer(); TokenStream filter = new PatternCaptureGroupTokenFilter(source, false, Pattern.compile("((\\/).*)")); filter = new RemoveDuplicatesTokenFilter(filter); return new TokenStreamComponents(source, filter); @@ -110,8 +110,8 @@ public class DefaultAnalyzersConfigurati }; this.allChildrenPathSearchingAnalyzer = new Analyzer() { @Override - protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - Tokenizer source = new KeywordTokenizer(reader); + protected TokenStreamComponents createComponents(String fieldName) { + Tokenizer source = new KeywordTokenizer(); return new TokenStreamComponents(source); } }; Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java Thu Feb 1 15:47:58 2018 @@ -29,7 +29,8 @@ public class SolrServerConfigurationTest @Test public void testCreateRemoteServerFromConfig() throws Exception { - SolrServerConfiguration<RemoteSolrServerProvider> remoteSolrServerProviderSolrServerConfiguration = new RemoteSolrServerConfiguration(null, null, 1, 1, null); + SolrServerConfiguration<RemoteSolrServerProvider> remoteSolrServerProviderSolrServerConfiguration = + new RemoteSolrServerConfiguration(null, null, 1, 1, null, 10, 10, null); RemoteSolrServerProvider remoteSolrServerProvider = remoteSolrServerProviderSolrServerConfiguration.getProvider(); assertNotNull(remoteSolrServerProvider); } Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java Thu Feb 1 15:47:58 2018 @@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; import javax.annotation.Nonnull; @@ -30,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.response.QueryResponse; @@ -46,16 +48,16 @@ public class SolrIndexEditorTest { @Test public void testIndexedProperties() throws Exception { - SolrServer solrServer = TestUtils.createSolrServer(); + SolrClient solrServer = TestUtils.createSolrServer(); OakSolrConfiguration configuration = TestUtils.getTestConfiguration(); IndexUpdateCallback callback = mock(IndexUpdateCallback.class); SolrIndexEditor solrIndexEditor = new SolrIndexEditor(solrServer, configuration, callback); NodeState before = mock(NodeState.class); NodeState after = mock(NodeState.class); - Iterable properties = new Iterable<PropertyState>() { + Iterable properties = new Iterable() { @Override - public Iterator<PropertyState> iterator() { - return Arrays.asList(PropertyStates.createProperty("foo1", "bar")).iterator(); + public Iterator iterator() { + return Collections.singletonList(PropertyStates.createProperty("foo1", "bar")).iterator(); } }; when(after.getProperties()).thenReturn(properties); @@ -67,12 +69,12 @@ public class SolrIndexEditorTest { @Test public void testIgnoredPropertiesNotIndexed() throws Exception { NodeBuilder builder = mock(NodeBuilder.class); - SolrServer solrServer = TestUtils.createSolrServer(); + SolrClient solrServer = TestUtils.createSolrServer(); OakSolrConfiguration configuration = new DefaultSolrConfiguration() { @Nonnull @Override public Collection<String> getIgnoredProperties() { - return Arrays.asList("foo2"); + return Collections.singletonList("foo2"); } @Nonnull @Override @@ -87,7 +89,7 @@ public class SolrIndexEditorTest { Iterable properties = new Iterable<PropertyState>() { @Override public Iterator<PropertyState> iterator() { - return Arrays.asList(PropertyStates.createProperty("foo2", "bar")).iterator(); + return Collections.singletonList(PropertyStates.createProperty("foo2", "bar")).iterator(); } }; when(after.getProperties()).thenReturn(properties); Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Thu Feb 1 15:47:58 2018 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; @@ -349,7 +349,7 @@ public class SolrQueryIndexTest { SelectorImpl selector = newSelector(root, "a"); String sqlQuery = "select [jcr:path], [jcr:score] from [nt:base] as a where" + " contains([jcr:content/*], 'founded')"; - SolrServer solrServer = mock(SolrServer.class); + SolrClient solrServer = mock(SolrClient.class); SolrServerProvider solrServerProvider = mock(SolrServerProvider.class); when(solrServerProvider.getSearchingSolrServer()).thenReturn(solrServer); OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class); @@ -396,7 +396,7 @@ public class SolrQueryIndexTest { String query = "select * from [nt:base] as a where native('solr','select?q=searchKeywords:\"foo\"^20 text:\"foo\"^1 " + "description:\"foo\"^8 something:\"foo\"^3 headline:\"foo\"^5 title:\"foo\"^10 &q.op=OR'"; String sqlQuery = "select * from [nt:base] a where native('solr','" + query + "'"; - SolrServer solrServer = mock(SolrServer.class); + SolrClient solrServer = mock(SolrClient.class); SolrServerProvider solrServerProvider = mock(SolrServerProvider.class); when(solrServerProvider.getSearchingSolrServer()).thenReturn(solrServer); OakSolrConfigurationProvider configurationProvider = mock(OakSolrConfigurationProvider.class); Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java Thu Feb 1 15:47:58 2018 @@ -16,7 +16,13 @@ */ package org.apache.jackrabbit.oak.plugins.index.solr.server; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.URI; + import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.response.SolrPingResponse; import org.junit.Test; @@ -31,9 +37,11 @@ public class EmbeddedSolrServerProviderT @Test public void testEmbeddedSolrServerInitialization() throws Exception { - EmbeddedSolrServerConfiguration solrServerConfiguration = new EmbeddedSolrServerConfiguration(getClass().getResource("/solr").getFile(), "oak"); + URI uri = getClass().getResource("/solr").toURI(); + File file = new File(uri); + EmbeddedSolrServerConfiguration solrServerConfiguration = new EmbeddedSolrServerConfiguration(file.getAbsolutePath(), "oak"); EmbeddedSolrServerProvider embeddedSolrServerProvider = new EmbeddedSolrServerProvider(solrServerConfiguration); - SolrServer solrServer = embeddedSolrServerProvider.getSolrServer(); + SolrClient solrServer = embeddedSolrServerProvider.getSolrServer(); assertNotNull(solrServer); SolrPingResponse ping = solrServer.ping(); assertNotNull(ping); Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProviderIT.java Thu Feb 1 15:47:58 2018 @@ -18,7 +18,9 @@ package org.apache.jackrabbit.oak.plugins.index.solr.server; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration; +import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrServer; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.common.util.NamedList; @@ -42,7 +44,7 @@ public class RemoteSolrServerProviderIT req.setParam("numShards", "2"); req.setParam("replicationFactor", "2"); req.setParam("collection.configName", "myconf"); - CloudSolrServer cloudSolrServer = new CloudSolrServer(host); + CloudSolrClient cloudSolrServer = new CloudSolrClient(host); cloudSolrServer.setZkConnectTimeout(1000); NamedList<Object> request = cloudSolrServer.request(req); return request != null && request.get("success") != null; @@ -60,10 +62,11 @@ public class RemoteSolrServerProviderIT } if (cloudServerAvailable) { String collection = "sample_" + System.nanoTime(); - RemoteSolrServerProvider remoteSolrServerProvider = new RemoteSolrServerProvider(new RemoteSolrServerConfiguration(host, collection, 2, 2, null)); - SolrServer solrServer = remoteSolrServerProvider.getSolrServer(); + RemoteSolrServerProvider remoteSolrServerProvider = new RemoteSolrServerProvider( + new RemoteSolrServerConfiguration(host, collection, 2, 2, null, 10, 10, null)); + SolrClient solrServer = remoteSolrServerProvider.getSolrServer(); assertNotNull(solrServer); - solrServer.shutdown(); + solrServer.close(); break; } } Modified: jackrabbit/oak/branches/1.6/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml?rev=1822884&r1=1822883&r2=1822884&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml (original) +++ jackrabbit/oak/branches/1.6/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml Thu Feb 1 15:47:58 2018 @@ -87,7 +87,7 @@ </fieldtype> <fieldtype name="spellcheck" class="solr.TextField"> <analyzer type="index"> - <tokenizer class="solr.ClassicTokenizerFactory"/> + <tokenizer class="solr.StandardTokenizerFactory"/> <filter class="solr.LowerCaseFilterFactory"/> <filter class="solr.ShingleFilterFactory" minShingleSize="2" maxShingleSize="3" outputUnigrams="true" outputUnigramsIfNoShingles="true" tokenSeparator=" " fillerToken="*"/> @@ -122,7 +122,6 @@ <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType" geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" /> - <fieldType name="currency" class="solr.CurrencyField" precisionStep="8" defaultCurrency="USD" currencyConfig="currency.xml" /> <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField"/> </types> <fields>
