You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/12/21 12:40:14 UTC
svn commit: r1721134 [34/48] - in /lucene/dev/branches/lucene6835: ./
dev-tools/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/lucene/analysis/morfologik/
dev-tools/scripts/ lucene/ lucene/analysis/ lu...
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<indexConfig>
<useCompoundFile>${testSetNoCFSMergePolicyConfig.useCompoundFile:false}</useCompoundFile>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml Mon Dec 21 11:39:57 2015
@@ -34,6 +34,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" />
<query>
<cache name="myPerSegmentCache"
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml Mon Dec 21 11:39:57 2015
@@ -24,6 +24,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/>
<initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
<lst name="defaults">
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateRequestProcessorChain name="parse-date">
<processor class="solr.ParseDateFieldUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<!-- WFSTLookup suggest component -->
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml Mon Dec 21 11:39:57 2015
@@ -46,6 +46,7 @@
<double name="maxWriteMBPerSecMerge">3000000</double>
<double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler">
<lst name="defaults">
<bool name="hl.defaultSummary">false</bool>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<!-- query parser without final NAME field lead to NPE during query parser initialization-->
<queryParser name="fail" class="solr.search.LuceneQParserPlugin"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml Mon Dec 21 11:39:57 2015
@@ -24,6 +24,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2">
<listener event="postCommit"
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml Mon Dec 21 11:39:57 2015
@@ -24,6 +24,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2">
<listener event="postCommit"
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml Mon Dec 21 11:39:57 2015
@@ -32,6 +32,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<searchComponent name="responselog" class="org.apache.solr.handler.component.ResponseLogComponent" />
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml Mon Dec 21 11:39:57 2015
@@ -22,10 +22,11 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <schemaFactory class="ManagedIndexSchemaFactory">
- <bool name="mutable">${managed.schema.mutable}</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
- </schemaFactory>
+ <!-- This is intentionally commented out, see SOLR-8131 -->
+ <!--<schemaFactory class="ManagedIndexSchemaFactory">-->
+ <!--<bool name="mutable">${managed.schema.mutable}</bool>-->
+ <!--<str name="managedSchemaResourceName">managed-schema</str>-->
+ <!--</schemaFactory>-->
<codecFactory class="solr.SchemaCodecFactory"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml Mon Dec 21 11:39:57 2015
@@ -26,6 +26,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateRequestProcessorChain name="force-script-engine" default="true">
<processor class="solr.StatelessScriptUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml Mon Dec 21 11:39:57 2015
@@ -32,6 +32,8 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -41,11 +42,11 @@
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler">
- <lst name="slave">
- <str name="masterUrl">http://127.0.0.1:TEST_PORT/solr/collection1</str>
- <str name="pollInterval">00:00:01</str>
- <str name="compression">COMPRESSION</str>
- </lst>
+ <lst name="slave">
+ <str name="masterUrl">http://127.0.0.1:TEST_PORT/solr/collection1</str>
+ <str name="pollInterval">00:00:01</str>
+ <str name="compression">COMPRESSION</str>
+ </lst>
</requestHandler>
<!-- enable streaming for testing... -->
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Mon Dec 21 11:39:57 2015
@@ -21,6 +21,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml Mon Dec 21 11:39:57 2015
@@ -22,6 +22,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml Mon Dec 21 11:39:57 2015
@@ -24,15 +24,9 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" />
- <requestHandler name="/export" class="solr.SearchHandler">
- <lst name="invariants">
- <str name="rq">{!xport}</str>
- <str name="wt">xsort</str>
- <str name="distrib">false</str>
- </lst>
-
<query>
<enableLazyFieldLoading>true</enableLazyFieldLoading>
@@ -48,9 +42,4 @@
</query>
- <arr name="components">
- <str>query</str>
- </arr>
- </requestHandler>
-
</config>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" />
<query>
<cache name="perSegSpatialFieldCache_srptgeom"
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml Mon Dec 21 11:39:57 2015
@@ -19,7 +19,20 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <indexConfig>
+ <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+ <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+ <maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
+ <ramBufferSizeMB>${solr.tests.ramBufferSizeMB}</ramBufferSizeMB>
+ <mergeScheduler class="${solr.tests.mergeScheduler}" />
+ <writeLockTimeout>1000</writeLockTimeout>
+ <commitLockTimeout>10000</commitLockTimeout>
+ <lockType>${solr.tests.lockType:single}</lockType>
+ <query>
+ <useColdSearcher>false</useColdSearcher>
+ <maxWarmingSearchers>1</maxWarmingSearchers>
+ </query>
+ </indexConfig>
<requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler>
@@ -32,6 +45,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
<!-- This is slightly different from the field value so we can test dealing with token offset changes -->
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml Mon Dec 21 11:39:57 2015
@@ -22,6 +22,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml Mon Dec 21 11:39:57 2015
@@ -27,6 +27,7 @@
</indexConfig>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2">
<updateLog>
@@ -43,37 +44,6 @@
</lst>
</requestHandler>
- <requestHandler name="/export" class="solr.SearchHandler">
- <lst name="invariants">
- <str name="rq">{!xport}</str>
- <str name="wt">xsort</str>
- <str name="distrib">false</str>
- </lst>
-
- <arr name="components">
- <str>query</str>
- </arr>
- </requestHandler>
-
- <!--
- Distributed Stream processing.
- -->
-
- <requestHandler name="/stream" class="solr.StreamHandler">
- <lst name="invariants">
- <str name="wt">json</str>
- <str name="distrib">false</str>
- </lst>
- </requestHandler>
-
- <requestHandler name="/sql" class="solr.SQLHandler">
- <lst name="invariants">
- <str name="wt">json</str>
- <str name="distrib">false</str>
- </lst>
- </requestHandler>
-
-
<requestDispatcher handleSelect="true" >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
</requestDispatcher>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="solr.NRTCachingDirectoryFactory"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml Mon Dec 21 11:39:57 2015
@@ -24,6 +24,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="solr.NRTCachingDirectoryFactory"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml Mon Dec 21 11:39:57 2015
@@ -26,6 +26,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<!-- see TestConfig.testAutomaticDeprecationSupport -->
<admin>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<indexConfig>
<mergeFactor>7</mergeFactor>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml Mon Dec 21 11:39:57 2015
@@ -30,6 +30,7 @@
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
</directoryFactory>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Mon Dec 21 11:39:57 2015
@@ -30,6 +30,7 @@
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
</directoryFactory>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
@@ -53,6 +54,16 @@
<str name="numRecordsToKeep">${solr.ulog.numRecordsToKeep:100}</str>
<int name="tlogDfsReplication">${solr.ulog.tlogDfsReplication:2}</int>
</updateLog>
+
+
+ <autoCommit>
+ <maxTime>${solr.autoCommit.maxTime:-1}</maxTime>
+ <openSearcher>false</openSearcher>
+ </autoCommit>
+
+ <autoSoftCommit>
+ <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+ </autoSoftCommit>
</updateHandler>
<updateRequestProcessorChain name="dedupe">
@@ -108,6 +119,13 @@
<str name="replacement">x_x</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
+
+ <requestHandler name="/dump" class="DumpRequestHandler" initParams="a">
+ <lst name="defaults">
+ <str name="a">A</str>
+ <str name="b">B</str>
+ </lst>
+ </requestHandler>
</config>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}" />
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml Mon Dec 21 11:39:57 2015
@@ -24,6 +24,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateRequestProcessorChain name="standard">
<processor class="solr.CustomUpdateRequestProcessorFactory" enable="false">
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml Mon Dec 21 11:39:57 2015
@@ -27,6 +27,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateRequestProcessorChain name="comprehensive">
<processor class="solr.FieldLengthUpdateProcessorFactory">
@@ -292,6 +293,17 @@
<str name="dest">dest_s</str>
</processor>
</updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="clone-single-regex">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <str name="source">source1_s</str>
+ <lst name="dest">
+ <str name="pattern">source\d(_s)</str>
+ <str name="replacement">dest$1</str>
+ </lst>
+ </processor>
+ </updateRequestProcessorChain>
+
<updateRequestProcessorChain name="clone-multi">
<processor class="solr.CloneFieldUpdateProcessorFactory">
<str name="source">source1_s</str>
@@ -300,6 +312,17 @@
</processor>
</updateRequestProcessorChain>
+ <updateRequestProcessorChain name="clone-multi-regex">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <str name="source">source1_s</str>
+ <str name="source">source2_s</str>
+ <lst name="dest">
+ <str name="pattern">source\d(_s)</str>
+ <str name="replacement">dest$1</str>
+ </lst>
+ </processor>
+ </updateRequestProcessorChain>
+
<updateRequestProcessorChain name="clone-array">
<processor class="solr.CloneFieldUpdateProcessorFactory">
<arr name="source">
@@ -310,6 +333,19 @@
</processor>
</updateRequestProcessorChain>
+ <updateRequestProcessorChain name="clone-array-regex">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <arr name="source">
+ <str>source1_s</str>
+ <str>source2_s</str>
+ </arr>
+ <lst name="dest">
+ <str name="pattern">source\d(_s)</str>
+ <str name="replacement">dest$1</str>
+ </lst>
+ </processor>
+ </updateRequestProcessorChain>
+
<updateRequestProcessorChain name="clone-selector">
<processor class="solr.CloneFieldUpdateProcessorFactory">
<lst name="source">
@@ -321,6 +357,41 @@
<str name="dest">dest_s</str>
</processor>
</updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="clone-selector-regex">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <lst name="source">
+ <str name="fieldRegex">source\d_.*</str>
+ <lst name="exclude">
+ <str name="fieldRegex">source0_.*</str>
+ </lst>
+ </lst>
+ <lst name="dest">
+ <str name="pattern">source\d(_s)</str>
+ <str name="replacement">dest$1</str>
+ </lst>
+ </processor>
+ </updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="clone-simple-regex-syntax">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <str name="pattern">source\d_.*</str>
+ <str name="replacement">dest_s</str>
+ </processor>
+ </updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="clone-regex-replaceall">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <lst name="source">
+ <str name="fieldRegex">foo.*</str>
+ </lst>
+ <lst name="dest">
+ <!-- unbounded pattern that can be replaced multiple times in field name -->
+ <str name="pattern">x(\d)</str>
+ <str name="replacement">y$1</str>
+ </lst>
+ </processor>
+ </updateRequestProcessorChain>
<updateRequestProcessorChain name="clone-max-chars">
<processor class="solr.CloneFieldUpdateProcessorFactory">
@@ -364,6 +435,16 @@
<str name="fieldName">toField</str>
</processor>
</updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="clone-first">
+ <processor class="solr.CloneFieldUpdateProcessorFactory">
+ <str name="pattern">field(.*)</str>
+ <str name="replacement">toField</str>
+ </processor>
+ <processor class="solr.FirstFieldValueUpdateProcessorFactory">
+ <str name="fieldName">toField</str>
+ </processor>
+ </updateRequestProcessorChain>
<!-- example used in CloneFieldUpdateProcessorFactory javadocs -->
<updateRequestProcessorChain name="multiple-clones">
@@ -380,13 +461,27 @@
</processor>
<processor class="solr.CloneFieldUpdateProcessorFactory">
<lst name="source">
- <str name="fieldRegex">.*_price</str>
+ <str name="fieldRegex">.*_price$</str>
<lst name="exclude">
<str name="fieldName">list_price</str>
</lst>
</lst>
<str name="dest">all_prices</str>
</processor>
+ <processor class="solr.processor.CloneFieldUpdateProcessorFactory">
+ <lst name="source">
+ <str name="fieldRegex">^feat(.*)s$</str>
+ </lst>
+ <lst name="dest">
+ <str name="pattern">^feat(.*)s$</str>
+ <str name="replacement">key_feat$1</str>
+ </lst>
+ </processor>
+ <!-- equivilent sugar syntax to above, with slightly diff destination name -->
+ <processor class="solr.processor.CloneFieldUpdateProcessorFactory">
+ <str name="pattern">^feat(.*)s$</str>
+ <str name="replacement">best_feat$1</str>
+ </processor>
</updateRequestProcessorChain>
<updateRequestProcessorChain name="clone-then-count">
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<indexConfig>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml Mon Dec 21 11:39:57 2015
@@ -27,6 +27,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml Mon Dec 21 11:39:57 2015
@@ -22,6 +22,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<xi:include href="foobar-missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:fallback>
<xi:include href="solrconfig-reqHandler.incl" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Mon Dec 21 11:39:57 2015
@@ -50,6 +50,8 @@
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</str>
</directoryFactory>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<statsCache class="${solr.statsCache:}"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<codecFactory class="solr.SchemaCodecFactory"/>
</config>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml Mon Dec 21 11:39:57 2015
@@ -29,6 +29,7 @@
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml Mon Dec 21 11:39:57 2015
@@ -29,6 +29,7 @@
</indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
</config>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml Mon Dec 21 11:39:57 2015
@@ -34,6 +34,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml Mon Dec 21 11:39:57 2015
@@ -27,6 +27,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/crazy-path-to-config.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/crazy-path-to-config.xml Mon Dec 21 11:39:57 2015
@@ -28,6 +28,8 @@
<updateHandler class="solr.DirectUpdateHandler2"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
<query>
<maxBooleanClauses>1024</maxBooleanClauses>
<useFilterForSortedQuery>true</useFilterForSortedQuery>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/solr.xml?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/solr.xml (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test-files/solr/solr.xml Mon Dec 21 11:39:57 2015
@@ -37,7 +37,7 @@
<str name="hostContext">${hostContext:solr}</str>
<int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
<bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
- <int name="leaderVoteWait">10000</int>
+ <int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
</solrcloud>
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java Mon Dec 21 11:39:57 2015
@@ -111,7 +111,10 @@ public class MinimalSchemaTest extends S
handler.startsWith("/admin") ||
handler.startsWith("/schema") ||
handler.startsWith("/config") ||
- handler.startsWith("/mlt")
+ handler.startsWith("/mlt") ||
+ handler.startsWith("/export") ||
+ handler.startsWith("/sql") ||
+ handler.startsWith("/stream")
) {
continue;
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java Mon Dec 21 11:39:57 2015
@@ -20,9 +20,9 @@ package org.apache.solr;
import java.io.StringWriter;
import java.util.Collections;
+import com.google.common.collect.ImmutableMap;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
@@ -49,15 +49,8 @@ public class TestCrossCoreJoin extends S
// FileUtils.copyDirectory(getFile("solrj/solr"), testHome);
initCore("solrconfig.xml", "schema12.xml", TEST_HOME(), "collection1");
final CoreContainer coreContainer = h.getCoreContainer();
- final CoreDescriptor toCoreDescriptor = coreContainer.getCoreDescriptor("collection1");
- final CoreDescriptor fromCoreDescriptor = new CoreDescriptor("fromCore", toCoreDescriptor) {
- @Override
- public String getSchemaName() {
- return "schema.xml";
- }
- };
- fromCore = coreContainer.create(fromCoreDescriptor);
+ fromCore = coreContainer.create("fromCore", ImmutableMap.of("configSet", "minimal"));
assertU(add(doc("id", "1", "name", "john", "title", "Director", "dept_s", "Engineering")));
assertU(add(doc("id", "2", "name", "mark", "title", "VP", "dept_s", "Marketing")));
@@ -108,15 +101,17 @@ public class TestCrossCoreJoin extends S
@Test
public void testCoresAreDifferent() throws Exception {
assertQEx("schema12.xml" + " has no \"cat\" field", req("cat:*"), ErrorCode.BAD_REQUEST);
- final LocalSolrQueryRequest req = new LocalSolrQueryRequest(fromCore, "cat:*", "lucene", 0, 100, Collections.emptyMap());
+ final LocalSolrQueryRequest req = new LocalSolrQueryRequest(fromCore, "cat:*", "/select", 0, 100, Collections.emptyMap());
final String resp = query(fromCore, req);
assertTrue(resp, resp.contains("numFound=\"1\""));
- assertTrue(resp, resp.contains("<int name=\"id\">10</int>"));
+ assertTrue(resp, resp.contains("<str name=\"id\">10</str>"));
}
public String query(SolrCore core, SolrQueryRequest req) throws Exception {
String handler = "standard";
+ if (req.getParams().get("qt") != null)
+ handler = req.getParams().get("qt");
SolrQueryResponse rsp = new SolrQueryResponse();
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
core.execute(core.getRequestHandler(handler), req, rsp);
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java Mon Dec 21 11:39:57 2015
@@ -259,10 +259,12 @@ public class TestDistributedGrouping ext
assertEquals(shardsArr.length, groupCount);
- // We cannot validate distributed grouping with scoring as first sort. since there is no global idf. We can check if no errors occur
- simpleQuery("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", 10, "sort", i1 + " desc", "group.sort", "score desc"); // SOLR-2955
- simpleQuery("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", 10, "sort", "score desc, _docid_ asc, id asc");
- simpleQuery("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", 10);
+ // We validate distributed grouping with scoring as first sort.
+ // note: this 'q' matches all docs and returns the 'id' as the score, which is unique and so our results should be deterministic.
+ handle.put("maxScore", SKIP);// TODO see SOLR-6612
+ query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", 10, "sort", i1 + " desc", "group.sort", "score desc"); // SOLR-2955
+ query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", 10, "sort", "score desc, _docid_ asc, id asc");
+ query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", 10);
// Can't validate the response, but can check if no errors occur.
simpleQuery("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.query", t1 + ":kings OR " + t1 + ":eggs", "group.limit", 10, "sort", i1 + " asc, id asc", CommonParams.TIME_ALLOWED, 1);
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@
package org.apache.solr;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -55,6 +56,8 @@ import org.apache.solr.handler.component
import org.apache.solr.handler.component.TrackingShardHandlerFactory.RequestTrackingQueue;
import org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO? perhaps use:
@@ -67,6 +70,8 @@ import org.junit.Test;
@Slow
public class TestDistributedSearch extends BaseDistributedSearchTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
String t1="a_t";
String i1="a_i1";
String nint = "n_i";
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Mon Dec 21 11:39:57 2015
@@ -19,6 +19,7 @@ package org.apache.solr;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -45,9 +46,13 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.noggit.JSONUtil;
import org.noggit.ObjectBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestGroupingSearch extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static final String FOO_STRING_FIELD = "foo_s1";
public static final String SMALL_STRING_FIELD = "small_s1";
public static final String SMALL_INT_FIELD = "small_i";
@@ -72,31 +77,30 @@ public class TestGroupingSearch extends
@Test
public void testGroupingGroupSortingScore_basic() {
- assertU(add(doc("id", "1","name", "author1", "title", "a book title", "group_i", "1")));
- assertU(add(doc("id", "2","name", "author1", "title", "the title", "group_i", "2")));
- assertU(add(doc("id", "3","name", "author2", "title", "a book title", "group_i", "1")));
- assertU(add(doc("id", "4","name", "author2", "title", "title", "group_i", "2")));
- assertU(add(doc("id", "5","name", "author3", "title", "the title of a title", "group_i", "1")));
+ assertU(add(doc("id", "1", "id_i", "1", "name", "author1", "title", "a book title", "group_i", "1")));
+ assertU(add(doc("id", "2", "id_i", "2", "name", "author1", "title", "the title", "group_i", "2")));
+ assertU(add(doc("id", "3", "id_i", "3", "name", "author2", "title", "a book title", "group_i", "1")));
+ assertU(add(doc("id", "4", "id_i", "4", "name", "author2", "title", "title", "group_i", "2")));
+ assertU(add(doc("id", "5", "id_i", "5", "name", "author3", "title", "the title of a title", "group_i", "1")));
assertU(commit());
-
- assertQ(req("q","title:title", "group", "true", "group.field","name")
+
+ // function based query for predictable scores not affect by similarity
+ assertQ(req("q","{!func}id_i", "group", "true", "group.field","name", "fl", "id, score")
,"//lst[@name='grouped']/lst[@name='name']"
,"*[count(//arr[@name='groups']/lst) = 3]"
- ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author2']"
- // ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
- ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
- ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
- ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author1']"
- // ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
+ ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author3']"
+ ,"//arr[@name='groups']/lst[1]/result[@numFound='1']"
+ ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='5']"
+
+ ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author2']"
,"//arr[@name='groups']/lst[2]/result[@numFound='2']"
- ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='2']"
+ ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
+
+ ,"//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author1']"
+ ,"//arr[@name='groups']/lst[3]/result[@numFound='2']"
+ ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='2']"
- ,"//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author3']"
- // ,"//arr[@name='groups']/lst[3]/int[@name='matches'][.='1']"
- ,"//arr[@name='groups']/lst[3]/result[@numFound='1']"
- ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
);
assertQ(req("q", "title:title", "group", "true", "group.field", "group_i")
@@ -115,71 +119,76 @@ public class TestGroupingSearch extends
@Test
public void testGroupingGroupSortingScore_withTotalGroupCount() {
- assertU(add(doc("id", "1","name", "author1", "title", "a book title", "group_i", "1")));
- assertU(add(doc("id", "2","name", "author1", "title", "the title", "group_i", "2")));
- assertU(add(doc("id", "3","name", "author2", "title", "a book title", "group_i", "1")));
- assertU(add(doc("id", "4","name", "author2", "title", "title", "group_i", "2")));
- assertU(add(doc("id", "5","name", "author3", "title", "the title of a title", "group_i", "1")));
+ assertU(add(doc("id", "1", "id_i", "1", "name", "author1", "title", "a book title", "group_i", "1")));
+ assertU(add(doc("id", "2", "id_i", "2", "name", "author1", "title", "the title", "group_i", "2")));
+ assertU(add(doc("id", "3", "id_i", "3", "name", "author2", "title", "a book title", "group_i", "1")));
+ assertU(add(doc("id", "4", "id_i", "4", "name", "author2", "title", "title", "group_i", "2")));
+ assertU(add(doc("id", "5", "id_i", "5", "name", "author3", "title", "the title of a title", "group_i", "1")));
assertU(commit());
- assertQ(req("q","title:title", "group", "true", "group.field","name", "group.ngroups", "true")
+ // function based query for predictable scores not affect by similarity
+ assertQ(req("q","{!func}id_i", "group", "true", "group.field","name", "group.ngroups", "true")
,"//lst[@name='grouped']/lst[@name='name']"
,"//lst[@name='grouped']/lst[@name='name']/int[@name='matches'][.='5']"
,"//lst[@name='grouped']/lst[@name='name']/int[@name='ngroups'][.='3']"
,"*[count(//arr[@name='groups']/lst) = 3]"
- ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author2']"
- ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
- ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
- ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author1']"
+ ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author3']"
+ ,"//arr[@name='groups']/lst[1]/result[@numFound='1']"
+ ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='5']"
+
+ ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author2']"
,"//arr[@name='groups']/lst[2]/result[@numFound='2']"
- ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='2']"
+ ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
+
+ ,"//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author1']"
+ ,"//arr[@name='groups']/lst[3]/result[@numFound='2']"
+ ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='2']"
- ,"//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author3']"
- ,"//arr[@name='groups']/lst[3]/result[@numFound='1']"
- ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
);
- assertQ(req("q", "title:title", "group", "true", "group.field", "group_i", "group.ngroups", "true")
+ // function based query for predictable scores not affect by similarity
+ assertQ(req("q", "{!func}id_i", "group", "true", "group.field", "group_i", "group.ngroups", "true")
, "//lst[@name='grouped']/lst[@name='group_i']/int[@name='matches'][.='5']"
, "//lst[@name='grouped']/lst[@name='group_i']/int[@name='ngroups'][.='2']"
, "*[count(//arr[@name='groups']/lst) = 2]"
- , "//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='2']"
- , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
- , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
+ , "//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='1']"
+ , "//arr[@name='groups']/lst[1]/result[@numFound='3']"
+ , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='5']"
+
+ , "//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='2']"
+ , "//arr[@name='groups']/lst[2]/result[@numFound='2']"
+ , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
- , "//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='1']"
- , "//arr[@name='groups']/lst[2]/result[@numFound='3']"
- , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='5']"
);
}
@Test
public void testGroupingGroupSortingScore_basicWithGroupSortEqualToSort() {
- assertU(add(doc("id", "1","name", "author1", "title", "a book title")));
- assertU(add(doc("id", "2","name", "author1", "title", "the title")));
- assertU(add(doc("id", "3","name", "author2", "title", "a book title")));
- assertU(add(doc("id", "4","name", "author2", "title", "title")));
- assertU(add(doc("id", "5","name", "author3", "title", "the title of a title")));
+ assertU(add(doc("id", "1", "id_i", "1", "name", "author1", "title", "a book title")));
+ assertU(add(doc("id", "2", "id_i", "2", "name", "author1", "title", "the title")));
+ assertU(add(doc("id", "3", "id_i", "3", "name", "author2", "title", "a book title")));
+ assertU(add(doc("id", "4", "id_i", "4", "name", "author2", "title", "title")));
+ assertU(add(doc("id", "5", "id_i", "5", "name", "author3", "title", "the title of a title")));
assertU(commit());
- assertQ(req("q", "title:title", "group", "true", "group.field", "name", "sort", "score desc", "group.sort", "score desc")
- , "//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author2']"
- // ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
- , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
- , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
- , "//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author1']"
- // ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
+ // function based query for predictable scores not affect by similarity
+ assertQ(req("q", "{!func}id_i", "group", "true", "group.field", "name",
+ "sort", "score desc", "group.sort", "score desc")
+
+ , "//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author3']"
+ , "//arr[@name='groups']/lst[1]/result[@numFound='1']"
+ , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='5']"
+
+ , "//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author2']"
, "//arr[@name='groups']/lst[2]/result[@numFound='2']"
- , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='2']"
+ , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
+
+ , "//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author1']"
+ , "//arr[@name='groups']/lst[3]/result[@numFound='2']"
+ , "//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='2']"
- , "//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author3']"
- // ,"//arr[@name='groups']/lst[3]/int[@name='matches'][.='1']"
- , "//arr[@name='groups']/lst[3]/result[@numFound='1']"
- , "//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
);
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestJoin.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestJoin.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestJoin.java Mon Dec 21 11:39:57 2015
@@ -23,7 +23,10 @@ import org.noggit.ObjectBuilder;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -36,6 +39,8 @@ import java.util.Set;
public class TestJoin extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeTests() throws Exception {
System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java Mon Dec 21 11:39:57 2015
@@ -17,6 +17,7 @@
package org.apache.solr;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -30,6 +31,8 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is like TestRandomFaceting, except it does a copyField on each
@@ -39,6 +42,8 @@ import org.junit.Test;
@Slow
public class TestRandomDVFaceting extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeTests() throws Exception {
initCore("solrconfig-basic.xml","schema-docValuesFaceting.xml");
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomFaceting.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomFaceting.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/TestRandomFaceting.java Mon Dec 21 11:39:57 2015
@@ -24,12 +24,17 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.*;
@Slow
public class TestRandomFaceting extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static final String FOO_STRING_FIELD = "foo_s1";
public static final String SMALL_STRING_FIELD = "small_s1";
public static final String SMALL_INT_FIELD = "small_i";
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java Mon Dec 21 11:39:57 2015
@@ -17,17 +17,15 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
-import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.util.Version;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory;
import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.util.Version;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -199,7 +197,7 @@ public class TestWordDelimiterFilterFact
@Test
public void testCustomTypes() throws Exception {
String testText = "I borrowed $5,400.00 at 25% interest-rate";
- ResourceLoader loader = new SolrResourceLoader("solr/collection1");
+ ResourceLoader loader = new SolrResourceLoader(TEST_PATH().resolve("collection1"));
Map<String,String> args = new HashMap<>();
args.put("luceneMatchVersion", Version.LATEST.toString());
args.put("generateWordParts", "1");
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java Mon Dec 21 11:39:57 2015
@@ -17,6 +17,10 @@ package org.apache.solr.client.solrj.emb
* limitations under the License.
*/
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
@@ -25,10 +29,6 @@ import org.apache.solr.core.NodeConfig;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.Test;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
public class TestEmbeddedSolrServerConstructors extends SolrTestCaseJ4 {
@Test
@@ -43,7 +43,7 @@ public class TestEmbeddedSolrServerConst
public void testNodeConfigConstructor() throws Exception {
Path path = createTempDir();
- SolrResourceLoader loader = new SolrResourceLoader(path.toString());
+ SolrResourceLoader loader = new SolrResourceLoader(path);
NodeConfig config = new NodeConfig.NodeConfigBuilder("testnode", loader)
.setConfigSetBaseDirectory(Paths.get(TEST_HOME()).resolve("configsets").toString())
.build();
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java Mon Dec 21 11:39:57 2015
@@ -24,11 +24,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.ActionThrottle.NanoTimeSource;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ActionThrottleTest extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory.getLogger(ActionThrottleTest.class);
static class TestNanoTimeSource implements NanoTimeSource {
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java Mon Dec 21 11:39:57 2015
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
import org.junit.Test;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -50,7 +51,7 @@ import java.util.List;
@Slow
public class AliasIntegrationTest extends AbstractFullDistribZkTestBase {
- private static final Logger logger = LoggerFactory.getLogger(AliasIntegrationTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public AliasIntegrationTest() {
super();
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AssignTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AssignTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/AssignTest.java Mon Dec 21 11:39:57 2015
@@ -34,12 +34,8 @@ import org.apache.solr.common.cloud.ZkSt
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class AssignTest extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory.getLogger(AssignTest.class);
-
@Override
@Before