You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/01/19 14:25:30 UTC
svn commit: r1652995 [3/3] - in /lucene/dev/trunk/solr: ./
contrib/clustering/src/test-files/clustering/solr/
contrib/dataimporthandler/src/test-files/dih/solr/
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
contrib/morphlines-c...
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Mon Jan 19 13:25:29 2015
@@ -19,8 +19,8 @@ package org.apache.solr.update;
import org.apache.lucene.index.LogDocMergePolicy;
import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -36,6 +36,7 @@ import org.apache.solr.common.util.Named
import org.apache.solr.core.ConfigSolr;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoresLocator;
+import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.search.SolrIndexSearcher;
@@ -52,6 +53,7 @@ import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -70,7 +72,7 @@ public class SolrCmdDistributorTest exte
private UpdateShardHandler updateShardHandler;
public SolrCmdDistributorTest() throws ParserConfigurationException, IOException, SAXException {
- updateShardHandler = new UpdateShardHandler(new ConfigSolr() {
+ updateShardHandler = new UpdateShardHandler(new ConfigSolr(null, null) {
@Override
public CoresLocator getCoresLocator() {
@@ -78,14 +80,15 @@ public class SolrCmdDistributorTest exte
}
@Override
- protected String getShardHandlerFactoryConfigPath() {
+ public PluginInfo getShardHandlerFactoryPluginInfo() {
return null;
}
@Override
- public boolean isPersistent() {
- return false;
- }});
+ protected String getProperty(CfgProp key) {
+ return null;
+ }
+ });
fixShardCount = true;
shardCount = 4;
@@ -105,6 +108,10 @@ public class SolrCmdDistributorTest exte
// we don't get helpful override behavior due to the method being static
@Override
protected void createServers(int numShards) throws Exception {
+
+ System.setProperty("configSetBaseDir", TEST_HOME());
+ System.setProperty("coreRootDirectory", testDir.toPath().resolve("control").toString());
+ writeCoreProperties(testDir.toPath().resolve("control/cores"), DEFAULT_TEST_CORENAME);
controlJetty = createJetty(new File(getSolrHome()), testDir + "/control/data", null, getSolrConfigFile(), getSchemaFile());
controlClient = createNewSolrClient(controlJetty.getLocalPort());
@@ -113,6 +120,10 @@ public class SolrCmdDistributorTest exte
StringBuilder sb = new StringBuilder();
for (int i = 0; i < numShards; i++) {
if (sb.length() > 0) sb.append(',');
+ String shardname = "shard" + i;
+ Path coresPath = testDir.toPath().resolve(shardname).resolve("cores");
+ writeCoreProperties(coresPath, DEFAULT_TEST_CORENAME);
+ System.setProperty("coreRootDirectory", testDir.toPath().resolve(shardname).toString());
JettySolrRunner j = createJetty(new File(getSolrHome()),
testDir + "/shard" + i + "/data", null, getSolrConfigFile(),
getSchemaFile());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockConfigSolr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockConfigSolr.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockConfigSolr.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockConfigSolr.java Mon Jan 19 13:25:29 2015
@@ -19,25 +19,30 @@ package org.apache.solr.util;
import org.apache.solr.core.ConfigSolr;
import org.apache.solr.core.CoresLocator;
+import org.apache.solr.core.PluginInfo;
/**
*
*/
public class MockConfigSolr extends ConfigSolr {
+ public MockConfigSolr() {
+ super(null, null);
+ }
+
@Override
public CoresLocator getCoresLocator() {
return null;
}
@Override
- protected String getShardHandlerFactoryConfigPath() {
+ public PluginInfo getShardHandlerFactoryPluginInfo() {
return null;
}
@Override
- public boolean isPersistent() {
- return false;
+ protected String getProperty(CfgProp key) {
+ return null;
}
}
Added: lucene/dev/trunk/solr/example/example-DIH/solr/db/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/core.properties?rev=1652995&view=auto
==============================================================================
(empty)
Added: lucene/dev/trunk/solr/example/example-DIH/solr/mail/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/core.properties?rev=1652995&view=auto
==============================================================================
(empty)
Added: lucene/dev/trunk/solr/example/example-DIH/solr/rss/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/core.properties?rev=1652995&view=auto
==============================================================================
(empty)
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr.xml?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr.xml Mon Jan 19 13:25:29 2015
@@ -1,10 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<solr sharedLib="lib" persistent="true">
- <cores adminPath="/admin/cores" hostPort="${jetty.port:8983}" hostContext="${hostContext:solr}">
- <core default="true" instanceDir="db" name="db"/>
- <core default="false" instanceDir="rss" name="rss"/>
- <core default="false" instanceDir="mail" name="mail"/>
- <core default="false" instanceDir="tika" name="tika"/>
- <core default="false" instanceDir="solr" name="solr"/>
- </cores>
-</solr>
+<solr></solr>
Added: lucene/dev/trunk/solr/example/example-DIH/solr/solr/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/core.properties?rev=1652995&view=auto
==============================================================================
(empty)
Added: lucene/dev/trunk/solr/example/example-DIH/solr/tika/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/core.properties?rev=1652995&view=auto
==============================================================================
(empty)
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml Mon Jan 19 13:25:29 2015
@@ -0,0 +1,71 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<schema name="example core ${l10n:}" version="1.1">
+ <types>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="text-FR" class="solr.TextField" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords-fr.txt"/>
+ <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords-fr.txt"/>
+ <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="text-EN" class="solr.TextField" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords-en.txt"/>
+ <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords-en.txt"/>
+ <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ </types>
+
+ <fields>
+ <!-- general -->
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="type" type="string" indexed="true" stored="true" multiValued="false"/>
+ <field name="name" type="string" indexed="true" stored="true" multiValued="false"/>
+ <field name="${ctlField:}" type="text-${l10n:EN}" indexed="true" stored="true" multiValued="true"/>
+ <field name="_version_" type="long" indexed="true" stored="true"/>
+ </fields>
+
+ <!-- field to use to determine and enforce document uniqueness. -->
+ <uniqueKey>id</uniqueKey>
+
+ <!-- field for the QueryParser to use when an explicit fieldname is absent -->
+ <defaultSearchField>name</defaultSearchField>
+
+ <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
+ <solrQueryParser defaultOperator="OR"/>
+</schema>
+
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml Mon Jan 19 13:25:29 2015
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
+-->
+<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+ <indexConfig>
+ <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+ </indexConfig>
+ <dataDir>${tempDir}/data/${l10n:}-${version:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <updateLog>
+ <str name="dir">${solr.data.dir:}</str>
+ </updateLog>
+ </updateHandler>
+
+ <requestDispatcher handleSelect="true" >
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ </requestDispatcher>
+
+ <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/update" class="solr.UpdateRequestHandler" />
+ <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
+
+ <!-- config for the admin interface -->
+ <admin>
+ <defaultQuery>solr</defaultQuery>
+ </admin>
+
+</config>
+
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-en.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-en.txt?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-en.txt (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-en.txt Mon Jan 19 13:25:29 2015
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+stopena
+stopenb
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-fr.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-fr.txt?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-fr.txt (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/stopwords-fr.txt Mon Jan 19 13:25:29 2015
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+stopfra
+stopfrb
Modified: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/multicore/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/multicore/solr.xml?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/multicore/solr.xml (original)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/multicore/solr.xml Mon Jan 19 13:25:29 2015
@@ -16,25 +16,7 @@
limitations under the License.
-->
-<!--
- All (relative) paths are relative to the installation path
-
- persistent: Save changes made via the API to this file
- sharedLib: path to a lib directory that will be shared across all cores
--->
-<solr persistent="false">
+<solr>
+
- <!--
- adminPath: RequestHandler path to manage cores.
- If 'null' (or absent), cores will not be manageable via request handler
- -->
- <cores adminPath="/admin/cores" host="${host:}" hostPort="${jetty.port:8983}" hostContext="${hostContext:solr}">
- <core name="core0" instanceDir="core0" />
- <core name="core1" instanceDir="core1" />
-
- <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
- <str name="urlScheme">${urlScheme:}</str>
- </shardHandlerFactory>
- </cores>
-
</solr>
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/collection1/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/collection1/core.properties?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/collection1/core.properties (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/collection1/core.properties Mon Jan 19 13:25:29 2015
@@ -0,0 +1 @@
+configSet=shared
\ No newline at end of file
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core0/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core0/core.properties?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core0/core.properties (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core0/core.properties Mon Jan 19 13:25:29 2015
@@ -0,0 +1,8 @@
+name=core0
+dataDir=${dataDir1}
+collection=${collection:acollection}
+version=3.5
+l10n=EN
+ctlField=core0
+comment=This is a sample with a sys prop ${sysprop:default}
+configSet=shared
\ No newline at end of file
Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core1/core.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core1/core.properties?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core1/core.properties (added)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/core1/core.properties Mon Jan 19 13:25:29 2015
@@ -0,0 +1,6 @@
+dataDir=${dataDir2}
+version=2.4
+l10n=FR
+ctlField=core1
+comment=Ceci est un exemple
+configSet=shared
\ No newline at end of file
Modified: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/solr.xml?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/solr.xml (original)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/solr.xml Mon Jan 19 13:25:29 2015
@@ -16,20 +16,45 @@
limitations under the License.
-->
+<solr>
+
+ <str name="shareSchema">${shareSchema:false}</str>
+ <str name="configSetBaseDir">${configSetBaseDir:../configsets}</str>
+ <str name="coreRootDirectory">${coreRootDirectory:.}</str>
+
+ <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+ <str name="urlScheme">${urlScheme:}</str>
+ <int name="socketTimeout">${socketTimeout:90000}</int>
+ <int name="connTimeout">${connTimeout:15000}</int>
+ </shardHandlerFactory>
+
+ <solrcloud>
+ <str name="host">127.0.0.1</str>
+ <int name="hostPort">${hostPort:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ <int name="leaderVoteWait">0</int>
+ <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
+ <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
+ </solrcloud>
+
+</solr>
+
<!--
All (relative) paths are relative to the installation path
persistent: Save changes made via the API to this file
sharedLib: path to a lib directory that will be shared across all cores
--->
+
<solr persistent="false">
<property name="version" value="1.3"/>
<property name="lang" value="english, french"/>
- <!--
+
adminPath: RequestHandler path to manage cores.
If 'null' (or absent), cores will not be manageable via REST
- -->
+
<cores adminPath="/admin/cores" defaultCoreName="core0" host="127.0.0.1" hostPort="${hostPort:8983}" hostContext="${hostContext:solr}" zkClientTimeout="8000" genericCoreNodeNames="${genericCoreNodeNames:true}" configSetBaseDir="${configSetBase:configsets}">
<core name="collection1" instanceDir="." />
<core name="core0" instanceDir="${theInstanceDir:./}" dataDir="${dataDir1}" collection="${collection:acollection}">
@@ -46,3 +71,4 @@
</core>
</cores>
</solr>
+-->
Modified: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml (original)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml Mon Jan 19 13:25:29 2015
@@ -16,24 +16,52 @@
limitations under the License.
-->
+
<!--
All (relative) paths are relative to the installation path
-
- persistent: Save changes made via the API to this file
- sharedLib: path to a lib directory that will be shared across all cores
-->
+<solr>
+
+ <str name="shareSchema">${shareSchema:false}</str>
+ <str name="configSetBaseDir">${configSetBaseDir:configsets}</str>
+ <str name="coreRootDirectory">${coreRootDirectory:.}</str>
+
+ <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+ <str name="urlScheme">${urlScheme:}</str>
+ <int name="socketTimeout">${socketTimeout:90000}</int>
+ <int name="connTimeout">${connTimeout:15000}</int>
+ </shardHandlerFactory>
+
+ <solrcloud>
+ <str name="host">127.0.0.1</str>
+ <int name="hostPort">${hostPort:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ <int name="leaderVoteWait">0</int>
+ <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
+ <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
+ </solrcloud>
+
+</solr>
+
+
+ <!--
+ All (relative) paths are relative to the installation path
+
+ persistent: Save changes made via the API to this file
+ sharedLib: path to a lib directory that will be shared across all cores
+
<solr persistent="false">
- <!--
- adminPath: RequestHandler path to manage cores.
- If 'null' (or absent), cores will not be manageable via request handler
- -->
+
+
<cores adminPath="/admin/cores" defaultCoreName="collection1" host="127.0.0.1" hostPort="${hostPort:8983}"
hostContext="${hostContext:solr}" zkClientTimeout="${solr.zkclienttimeout:30000}" shareSchema="${shareSchema:false}"
genericCoreNodeNames="${genericCoreNodeNames:true}" leaderVoteWait="0"
distribUpdateConnTimeout="${distribUpdateConnTimeout:45000}" distribUpdateSoTimeout="${distribUpdateSoTimeout:340000}">
<core name="collection1" instanceDir="collection1" shard="${shard:}" collection="${collection:collection1}" />
- <!--config="${solrconfig:solrconfig.xml}" schema="${schema:schema.xml}"/-->
+
<shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
<str name="urlScheme">${urlScheme:}</str>
<int name="socketTimeout">${socketTimeout:90000}</int>
@@ -41,3 +69,4 @@
</shardHandlerFactory>
</cores>
</solr>
+-->
\ No newline at end of file
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java Mon Jan 19 13:25:29 2015
@@ -17,15 +17,8 @@
package org.apache.solr.client.solrj;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.lucene.util.IOUtils;
@@ -46,7 +39,13 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* Test for LBHttpSolrClient
@@ -268,7 +267,7 @@ public class TestLBHttpSolrClient extend
}
public String getUrl() {
- return buildUrl(port, "/solr");
+ return buildUrl(port, "/solr/collection1");
}
public String getSchemaFile() {
@@ -303,6 +302,7 @@ public class TestLBHttpSolrClient extend
FileUtils.copyFile(SolrTestCaseJ4.getFile(getSolrConfigFile()), f);
f = new File(confDir, "schema.xml");
FileUtils.copyFile(SolrTestCaseJ4.getFile(getSchemaFile()), f);
+ Files.createFile(homeDir.toPath().resolve("collection1/core.properties"));
}
public void tearDown() throws Exception {
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Mon Jan 19 13:25:29 2015
@@ -19,16 +19,14 @@ package org.apache.solr.client.solrj.emb
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.core.SolrXMLCoresLocator;
-import org.apache.solr.util.TestHarness;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -67,9 +65,6 @@ public class TestSolrProperties extends
@Test
public void testProperties() throws Exception {
- SolrXMLCoresLocator.NonPersistingLocator locator
- = (SolrXMLCoresLocator.NonPersistingLocator) cores.getCoresLocator();
-
UpdateRequest up = new UpdateRequest();
up.setAction(ACTION.COMMIT, true, true);
up.deleteByQuery("*:*");
@@ -139,33 +134,6 @@ public class TestSolrProperties extends
long after = mcr.getStartTime(name).getTime();
assertTrue("should have more recent time: " + after + "," + before, after > before);
- TestHarness.validateXPath(locator.xml,
- "/solr/cores[@defaultCoreName='core0']",
- "/solr/cores[@host='127.0.0.1']",
- "/solr/cores[@hostPort='${hostPort:8983}']",
- "/solr/cores[@zkClientTimeout='8000']",
- "/solr/cores[@hostContext='${hostContext:solr}']",
- "/solr/cores[@genericCoreNodeNames='${genericCoreNodeNames:true}']"
- );
-
- CoreAdminRequest.renameCore(name, "renamed_core", coreadmin);
-
- TestHarness.validateXPath(locator.xml,
- "/solr/cores/core[@name='renamed_core']",
- "/solr/cores/core[@instanceDir='${theInstanceDir:./}']",
- "/solr/cores/core[@collection='${collection:acollection}']"
- );
-
- coreadmin = getRenamedSolrAdmin();
- File dataDir = new File(tempDir,"data3");
- File tlogDir = new File(tempDir,"tlog3");
-
- CoreAdminRequest.createCore("newCore", SOLR_HOME.getAbsolutePath(),
- coreadmin, null, null, dataDir.getAbsolutePath(),
- tlogDir.getAbsolutePath());
-
- TestHarness.validateXPath(locator.xml, "/solr/cores/core[@name='collection1' and @instanceDir='.']");
-
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java Mon Jan 19 13:25:29 2015
@@ -110,6 +110,7 @@ public class TestCoreAdmin extends Abstr
req.setInstanceDir(newCoreInstanceDir.getAbsolutePath() + File.separator + "newcore");
req.setDataDir(dataDir.getAbsolutePath());
req.setUlogDir(new File(dataDir, "ulog").getAbsolutePath());
+ req.setConfigSet("shared");
// These should be the inverse of defaults.
req.setIsLoadOnStartup(false);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Mon Jan 19 13:25:29 2015
@@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -53,6 +54,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Random;
import java.util.Set;
import java.util.SortedMap;
@@ -285,25 +287,33 @@ public abstract class BaseDistributedSea
}
protected JettySolrRunner createControlJetty() throws Exception {
+ writeCoreProperties(testDir.toPath().resolve("control/cores"), DEFAULT_TEST_CORENAME);
+ System.setProperty("coreRootDirectory", testDir.toPath().resolve("control").toString());
JettySolrRunner jetty = createJetty(new File(getSolrHome()), testDir + "/control/data", null, getSolrConfigFile(), getSchemaFile());
return jetty;
}
-
+
protected void createServers(int numShards) throws Exception {
- controlJetty = createControlJetty();
+ System.setProperty("configSetBaseDir", getSolrHome());
+
+ controlJetty = createControlJetty();
controlClient = createNewSolrClient(controlJetty.getLocalPort());
shardsArr = new String[numShards];
StringBuilder sb = new StringBuilder();
for (int i = 0; i < numShards; i++) {
if (sb.length() > 0) sb.append(',');
+ String shardname = "shard" + i;
+ Path coresPath = testDir.toPath().resolve(shardname).resolve("cores");
+ writeCoreProperties(coresPath, DEFAULT_TEST_CORENAME);
+ System.setProperty("coreRootDirectory", testDir.toPath().resolve(shardname).toString());
JettySolrRunner j = createJetty(new File(getSolrHome()),
testDir + "/shard" + i + "/data", null, getSolrConfigFile(),
getSchemaFile());
jettys.add(j);
clients.add(createNewSolrClient(j.getLocalPort()));
- String shardStr = buildUrl(j.getLocalPort());
+ String shardStr = buildUrl(j.getLocalPort()) + "/" + DEFAULT_TEST_CORENAME;
shardsArr[i] = shardStr;
sb.append(shardStr);
}
@@ -389,7 +399,7 @@ public abstract class BaseDistributedSea
protected SolrClient createNewSolrClient(int port) {
try {
// setup the client...
- HttpSolrClient client = new HttpSolrClient(buildUrl(port));
+ HttpSolrClient client = new HttpSolrClient(buildUrl(port) + "/" + DEFAULT_TEST_CORENAME);
client.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
client.setSoTimeout(90000);
client.setDefaultMaxConnectionsPerHost(100);
@@ -931,6 +941,20 @@ public abstract class BaseDistributedSea
if (solrxml != null) {
FileUtils.copyFile(new File(getSolrHome(), solrxml), new File(jettyHome, "solr.xml"));
}
+
+ Properties coreProperties = new Properties();
+ coreProperties.setProperty("name", "collection1");
+ coreProperties.setProperty("shard", "${shard:}");
+ coreProperties.setProperty("collection", "${collection:collection1}");
+ coreProperties.setProperty("config", "${solrconfig:solrconfig.xml}");
+ coreProperties.setProperty("schema", "${schema:schema.xml}");
+ coreProperties.setProperty("coreNodeName", "${coreNodeName:}");
+
+ writeCoreProperties(jettyHome.toPath().resolve("cores/collection1"), coreProperties, "collection1");
+
+ // <core name="collection1" instanceDir="collection1" shard="${shard:}"
+ // collection="${collection:collection1}" config="${solrconfig:solrconfig.xml}" schema="${schema:schema.xml}"
+ //coreNodeName="${coreNodeName:}"/>
}
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Mon Jan 19 13:25:29 2015
@@ -17,11 +17,6 @@ package org.apache.solr;
* limitations under the License.
*/
-import java.io.File;
-import java.io.OutputStreamWriter;
-import java.util.Properties;
-import java.util.SortedMap;
-
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrClient;
@@ -35,6 +30,12 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.OutputStreamWriter;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.SortedMap;
+
abstract public class SolrJettyTestBase extends SolrTestCaseJ4
{
@@ -57,6 +58,19 @@ abstract public class SolrJettyTestBase
// creates the data dir
initCore(null, null, solrHome);
+ Path coresDir = createTempDir().resolve("cores");
+
+ System.setProperty("coreRootDirectory", coresDir.toString());
+ System.setProperty("configSetBaseDir", solrHome);
+
+ Properties props = new Properties();
+ props.setProperty("name", DEFAULT_TEST_CORENAME);
+ props.setProperty("configSet", "collection1");
+ props.setProperty("config", "${solrconfig:solrconfig.xml}");
+ props.setProperty("schema", "${schema:schema.xml}");
+
+ writeCoreProperties(coresDir.resolve("core"), props, "RestTestBase");
+
ignoreException("maxWarmingSearchers");
context = context==null ? "/solr" : context;
@@ -120,7 +134,7 @@ abstract public class SolrJettyTestBase
throw new RuntimeException( ex );
}
} else {
- return new EmbeddedSolrServer( h.getCoreContainer(), "" );
+ return new EmbeddedSolrServer( h.getCoreContainer(), "collection1" );
}
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Mon Jan 19 13:25:29 2015
@@ -17,40 +17,9 @@
package org.apache.solr;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import javax.xml.xpath.XPathExpressionException;
-
+import com.carrotsearch.randomizedtesting.RandomizedContext;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.commons.codec.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -77,7 +46,6 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.XML;
import org.apache.solr.core.ConfigSolr;
-import org.apache.solr.core.ConfigSolrXmlOld;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrConfig;
@@ -109,9 +77,42 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
-import com.carrotsearch.randomizedtesting.RandomizedContext;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import javax.xml.xpath.XPathExpressionException;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* A junit4 Solr test harness that extends LuceneTestCaseJ4. To change which core is used when loading the schema and solrconfig.xml, simply
@@ -125,9 +126,32 @@ import com.carrotsearch.randomizedtestin
})
@SuppressSysoutChecks(bugUrl = "Solr dumps tons of logs to console.")
public abstract class SolrTestCaseJ4 extends LuceneTestCase {
- private static String coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
+
+ public static final String DEFAULT_TEST_CORENAME = "collection1";
+
+ private static String coreName = DEFAULT_TEST_CORENAME;
+
public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms
+ protected void writeCoreProperties(Path coreDirectory, String corename) throws IOException {
+ Properties props = new Properties();
+ props.setProperty("name", corename);
+ props.setProperty("configSet", "collection1");
+ props.setProperty("config", "${solrconfig:solrconfig.xml}");
+ props.setProperty("schema", "${schema:schema.xml}");
+
+ writeCoreProperties(coreDirectory, props, this.getTestName());
+ }
+
+ public static void writeCoreProperties(Path coreDirectory, Properties properties, String testname) throws IOException {
+ log.info("Writing core.properties file to {}", coreDirectory);
+ Files.createDirectories(coreDirectory);
+ try (Writer writer =
+ new OutputStreamWriter(Files.newOutputStream(coreDirectory.resolve("core.properties")), Charset.forName("UTF-8"))) {
+ properties.store(writer, testname);
+ }
+ }
+
/**
* Annotation for test classes that want to disable SSL
*/
@@ -188,7 +212,7 @@ public abstract class SolrTestCaseJ4 ext
endTrackingSearchers();
assertTrue("Some resources were not closed, shutdown, or released.", ObjectReleaseTracker.clearObjectTrackerAndCheckEmpty());
resetFactory();
- coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
+ coreName = DEFAULT_TEST_CORENAME;
} finally {
initCoreDataDir = null;
System.clearProperty("zookeeper.forceSync");
@@ -290,7 +314,7 @@ public abstract class SolrTestCaseJ4 ext
FileUtils.write(tmpFile, xmlStr, IOUtils.UTF_8);
SolrResourceLoader loader = new SolrResourceLoader(solrHome.getAbsolutePath());
- h = new TestHarness(loader, ConfigSolr.fromFile(loader, new File(solrHome, "solr.xml")));
+ h = new TestHarness(ConfigSolr.fromFile(loader, new File(solrHome, "solr.xml")));
lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
}
@@ -572,6 +596,19 @@ public abstract class SolrTestCaseJ4 ext
return h.getCoreContainer();
}
+ public static CoreContainer createCoreContainer(ConfigSolr config) {
+ testSolrHome = config.getSolrResourceLoader().getInstanceDir();
+ h = new TestHarness(config);
+ lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
+ return h.getCoreContainer();
+ }
+
+ public static CoreContainer createCoreContainer(String coreName, String dataDir, String solrConfig, String schema) {
+ CoreContainer cc = createCoreContainer(new TestHarness.TestConfigSolr(coreName, dataDir, solrConfig, schema));
+ h.coreName = coreName;
+ return cc;
+ }
+
public static CoreContainer createDefaultCoreContainer(String solrHome) {
testSolrHome = checkNotNull(solrHome);
h = new TestHarness("collection1", initCoreDataDir.getAbsolutePath(), "solrconfig.xml", "schema.xml");
@@ -1780,7 +1817,7 @@ public abstract class SolrTestCaseJ4 ext
copyMinConf(dstRoot, null);
}
- // Creates a minimal conf dir. Optionally adding in a core.properties file from the string passed in
+ // Creates a minimal conf dir, adding in a core.properties file from the string passed in
// the string to write to the core.properties file may be null in which case nothing is done with it.
// propertiesContent may be an empty string, which will actually work.
public static void copyMinConf(File dstRoot, String propertiesContent) throws IOException {
@@ -1789,6 +1826,7 @@ public abstract class SolrTestCaseJ4 ext
if (! dstRoot.exists()) {
assertTrue("Failed to make subdirectory ", dstRoot.mkdirs());
}
+ Files.createFile(dstRoot.toPath().resolve("core.properties"));
if (propertiesContent != null) {
FileUtils.writeStringToFile(new File(dstRoot, "core.properties"), propertiesContent, Charsets.UTF_8.toString());
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Mon Jan 19 13:25:29 2015
@@ -281,9 +281,10 @@ public abstract class AbstractFullDistri
try {
- File controlJettyDir = createTempDir().toFile();
+ File controlJettyDir = createTempDir("control").toFile();
setupJettySolrHome(controlJettyDir);
-
+
+ System.setProperty("coreRootDirectory", controlJettyDir.toPath().resolve("cores").toString());
controlJetty = createJetty(controlJettyDir, useJettyDataDir ? getDataDir(testDir
+ "/control/data") : null); // don't pass shard name... let it default to
// "shard1"
@@ -393,11 +394,12 @@ public abstract class AbstractFullDistri
if (sb.length() > 0) sb.append(',');
int cnt = this.jettyIntCntr.incrementAndGet();
- File jettyDir = createTempDir().toFile();
+ File jettyDir = createTempDir("shard-" + i).toFile();
jettyDir.mkdirs();
setupJettySolrHome(jettyDir);
log.info("create jetty " + i);
+ System.setProperty("coreRootDirectory", jettyDir.toPath().resolve("cores").toString());
JettySolrRunner j = createJetty(jettyDir, useJettyDataDir ? getDataDir(testDir + "/jetty"
+ cnt) : null, null, "solrconfig.xml", null);
jettys.add(j);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Mon Jan 19 13:25:29 2015
@@ -17,10 +17,6 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -31,6 +27,10 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Base test class for ZooKeeper tests.
*/
@@ -74,7 +74,7 @@ public abstract class AbstractZkTestCase
buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(), SOLRHOME,
"solrconfig.xml", "schema.xml");
-
+
initCore("solrconfig.xml", "schema.xml");
}
Added: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java?rev=1652995&view=auto
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java (added)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java Mon Jan 19 13:25:29 2015
@@ -0,0 +1,51 @@
+package org.apache.solr.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.CoreDescriptor;
+import org.apache.solr.core.CoresLocator;
+
+public abstract class ReadOnlyCoresLocator implements CoresLocator {
+
+ @Override
+ public void create(CoreContainer cc, CoreDescriptor... coreDescriptors) {
+ // no-op
+ }
+
+ @Override
+ public void persist(CoreContainer cc, CoreDescriptor... coreDescriptors) {
+ // no-op
+ }
+
+ @Override
+ public void delete(CoreContainer cc, CoreDescriptor... coreDescriptors) {
+ // no-op
+ }
+
+ @Override
+ public void rename(CoreContainer cc, CoreDescriptor oldCD, CoreDescriptor newCD) {
+ // no-op
+ }
+
+ @Override
+ public void swap(CoreContainer cc, CoreDescriptor cd1, CoreDescriptor cd2) {
+ // no-op
+ }
+
+}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java Mon Jan 19 13:25:29 2015
@@ -16,12 +16,6 @@ package org.apache.solr.util;
* limitations under the License.
*/
-import java.io.IOException;
-import java.util.Map;
-import java.util.SortedMap;
-
-import javax.xml.xpath.XPathExpressionException;
-
import org.apache.solr.JSONTestUtil;
import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.common.SolrException;
@@ -29,11 +23,15 @@ import org.apache.solr.common.params.Mul
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.servlet.SolrRequestParsers;
import org.eclipse.jetty.servlet.ServletHolder;
+import org.junit.AfterClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
-import org.junit.AfterClass;
+import javax.xml.xpath.XPathExpressionException;
+import java.io.IOException;
+import java.util.Map;
+import java.util.SortedMap;
abstract public class RestTestBase extends SolrJettyTestBase {
private static final Logger log = LoggerFactory.getLogger(RestTestBase.class);
@@ -56,7 +54,7 @@ abstract public class RestTestBase exten
restTestHarness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
- return jetty.getBaseUrl().toString();
+ return jetty.getBaseUrl().toString() + "/" + DEFAULT_TEST_CORENAME;
}
});
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java Mon Jan 19 13:25:29 2015
@@ -16,14 +16,6 @@ package org.apache.solr.util;
* limitations under the License.
*/
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
@@ -37,6 +29,13 @@ import org.apache.http.util.EntityUtils;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.params.ModifiableSolrParams;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
/**
* Facilitates testing Solr's REST API via a provided embedded Jetty
*/
@@ -52,6 +51,10 @@ public class RestTestHarness extends Bas
public String getBaseURL() {
return serverProvider.getBaseURL();
}
+
+ public String getAdminURL() {
+ return getBaseURL().replace("/collection1", "");
+ }
/**
* Validates an XML "query" response against an array of XPath test strings
@@ -97,6 +100,10 @@ public class RestTestHarness extends Bas
return getResponse(new HttpGet(getBaseURL() + request));
}
+ public String adminQuery(String request) throws Exception {
+ return getResponse(new HttpGet(getAdminURL() + request));
+ }
+
/**
* Processes a PUT request using a URL path (with no context path) + optional query params,
* e.g. "/schema/fields/newfield", PUTs the given content, and returns the response content.
@@ -152,17 +159,25 @@ public class RestTestHarness extends Bas
}
}
-
+ public String checkAdminResponseStatus(String xml, String code) throws Exception {
+ try {
+ String response = adminQuery(xml);
+ String valid = validateXPath(response, "//int[@name='status']="+code );
+ return (null == valid) ? null : response;
+ } catch (XPathExpressionException e) {
+ throw new RuntimeException("?!? static xpath has bug?", e);
+ }
+ }
/**
* Reloads the first core listed in the response to the core admin handler STATUS command
*/
@Override
public void reload() throws Exception {
String coreName = (String)evaluateXPath
- (query("/admin/cores?action=STATUS"),
+ (adminQuery("/admin/cores?action=STATUS"),
"//lst[@name='status']/lst[1]/str[@name='name']",
XPathConstants.STRING);
- String xml = checkResponseStatus("/admin/cores?action=RELOAD&core=" + coreName, "0");
+ String xml = checkAdminResponseStatus("/admin/cores?action=RELOAD&core=" + coreName, "0");
if (null != xml) {
throw new RuntimeException("RELOAD failed:\n" + xml);
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1652995&r1=1652994&r2=1652995&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Mon Jan 19 13:25:29 2015
@@ -17,13 +17,17 @@
package org.apache.solr.util;
+import com.google.common.collect.ImmutableList;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.NamedList.NamedListEntry;
import org.apache.solr.core.ConfigSolr;
-import org.apache.solr.core.ConfigSolrXmlOld;
import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.CoreDescriptor;
+import org.apache.solr.core.CoresLocator;
+import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
@@ -42,6 +46,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -57,7 +62,7 @@ import java.util.Map;
*
*/
public class TestHarness extends BaseTestHarness {
- String coreName;
+ public String coreName;
protected volatile CoreContainer container;
public UpdateRequestHandler updater;
@@ -78,11 +83,10 @@ public class TestHarness extends BaseTes
}
/**
- * Creates a SolrConfig object for the
- * {@link ConfigSolrXmlOld#DEFAULT_DEFAULT_CORE_NAME} core using {@link #createConfig(String,String,String)}
+ * Creates a SolrConfig object for the default test core using {@link #createConfig(String,String,String)}
*/
public static SolrConfig createConfig(String solrHome, String confFile) {
- return createConfig(solrHome, ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME, confFile);
+ return createConfig(solrHome, SolrTestCaseJ4.DEFAULT_TEST_CORENAME, confFile);
}
/**
@@ -116,7 +120,7 @@ public class TestHarness extends BaseTes
public TestHarness( String dataDirectory,
SolrConfig solrConfig,
IndexSchema indexSchema) {
- this(ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME, dataDirectory, solrConfig, indexSchema);
+ this(SolrTestCaseJ4.DEFAULT_TEST_CORENAME, dataDirectory, solrConfig, indexSchema);
}
/**
@@ -126,21 +130,9 @@ public class TestHarness extends BaseTes
* @param indexSchema schema resource name
*/
public TestHarness(String coreName, String dataDir, String solrConfig, String indexSchema) {
- try {
- if (coreName == null)
- coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
- this.coreName = coreName;
-
- SolrResourceLoader loader = new SolrResourceLoader(SolrResourceLoader.locateSolrHome());
- ConfigSolr config = getTestHarnessConfig(loader, coreName, dataDir, solrConfig, indexSchema);
- container = new CoreContainer(loader, config);
- container.load();
-
- updater = new UpdateRequestHandler();
- updater.init( null );
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ this(new TestConfigSolr(new SolrResourceLoader(SolrResourceLoader.locateSolrHome()),
+ coreName, dataDir, solrConfig, indexSchema));
+ this.coreName = (coreName == null) ? SolrTestCaseJ4.DEFAULT_TEST_CORENAME : coreName;
}
public TestHarness(String coreName, String dataDir, SolrConfig solrConfig, IndexSchema indexSchema) {
@@ -162,38 +154,81 @@ public class TestHarness extends BaseTes
* @param solrXml the text of a solrxml
*/
public TestHarness(SolrResourceLoader loader, String solrXml) {
- this(loader, ConfigSolr.fromString(loader, solrXml));
+ this(ConfigSolr.fromString(loader, solrXml));
}
/**
- * Create a TestHarness using a specific resource loader and config
- * @param loader the SolrResourceLoader to use
+ * Create a TestHarness using a specific config
* @param config the ConfigSolr to use
*/
- public TestHarness(SolrResourceLoader loader, ConfigSolr config) {
- container = new CoreContainer(loader, config);
+ public TestHarness(ConfigSolr config) {
+ container = new CoreContainer(config);
container.load();
updater = new UpdateRequestHandler();
updater.init(null);
}
- private static ConfigSolr getTestHarnessConfig(SolrResourceLoader loader, String coreName, String dataDir,
- String solrConfig, String schema) {
- String solrxml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
- + "<solr persistent=\"false\">\n"
- + " <cores adminPath=\"/admin/cores\" defaultCoreName=\""
- + ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME
- + "\""
- + " host=\"${host:}\" hostPort=\"${hostPort:}\" hostContext=\"${hostContext:}\""
- + " distribUpdateSoTimeout=\"30000\""
- + " zkClientTimeout=\"${zkClientTimeout:30000}\" distribUpdateConnTimeout=\"30000\""
- + ">\n"
- + " <core name=\"" + coreName + "\" config=\"" + solrConfig
- + "\" schema=\"" + schema + "\" dataDir=\"" + dataDir
- + "\" transient=\"false\" loadOnStartup=\"true\""
- + " shard=\"${shard:shard1}\" collection=\"${collection:collection1}\" instanceDir=\"" + coreName + "/\" />\n"
- + " </cores>\n" + "</solr>";
- return ConfigSolr.fromString(loader, solrxml);
+ public static class TestConfigSolr extends ConfigSolr {
+
+ final CoresLocator locator;
+
+ public TestConfigSolr(String coreName, String dataDir, String solrConfig, String schema) {
+ this(new SolrResourceLoader(SolrResourceLoader.locateSolrHome()), coreName, dataDir, solrConfig, schema);
+ }
+
+ public TestConfigSolr(SolrResourceLoader loader, String coreName, String dataDir, String solrConfig, String schema) {
+ super(loader);
+ locator = new TestCoresLocator(coreName, dataDir, solrConfig, schema);
+ }
+
+ @Override
+ public CoresLocator getCoresLocator() {
+ return locator;
+ }
+
+ @Override
+ public PluginInfo getShardHandlerFactoryPluginInfo() {
+ return null;
+ }
+
+ @Override
+ protected String getProperty(CfgProp key) {
+ switch (key) {
+ case SOLR_HOST: return System.getProperty("host");
+ case SOLR_HOSTPORT: return System.getProperty("hostPort", "");
+ case SOLR_HOSTCONTEXT: return System.getProperty("hostContext", "");
+ case SOLR_DISTRIBUPDATESOTIMEOUT: return "30000";
+ case SOLR_ZKCLIENTTIMEOUT: return System.getProperty("zkClientTimeout", "30000");
+ case SOLR_DISTRIBUPDATECONNTIMEOUT: return "30000";
+ case SOLR_SHARESCHEMA: return System.getProperty("shareSchema", "false");
+ }
+ return null;
+ }
+ }
+
+ public static class TestCoresLocator extends ReadOnlyCoresLocator {
+
+ final String coreName;
+ final String dataDir;
+ final String solrConfig;
+ final String schema;
+
+ public TestCoresLocator(String coreName, String dataDir, String solrConfig, String schema) {
+ this.coreName = coreName == null ? SolrTestCaseJ4.DEFAULT_TEST_CORENAME : coreName;
+ this.dataDir = dataDir;
+ this.schema = schema;
+ this.solrConfig = solrConfig;
+ }
+
+ @Override
+ public List<CoreDescriptor> discover(CoreContainer cc) {
+ return ImmutableList.of(new CoreDescriptor(cc, coreName, coreName,
+ CoreDescriptor.CORE_DATADIR, dataDir,
+ CoreDescriptor.CORE_CONFIG, solrConfig,
+ CoreDescriptor.CORE_SCHEMA, schema,
+ CoreDescriptor.CORE_COLLECTION, System.getProperty("collection", "collection1"),
+ CoreDescriptor.CORE_SHARD, System.getProperty("shard", "shard1")));
+ }
}
public CoreContainer getCoreContainer() {
@@ -289,7 +324,8 @@ public class TestHarness extends BaseTes
* @see LocalSolrQueryRequest
*/
public String query(String handler, SolrQueryRequest req) throws Exception {
- try (SolrCore core = getCoreInc()) {
+ try {
+ SolrCore core = req.getCore();
SolrQueryResponse rsp = new SolrQueryResponse();
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
core.execute(core.getRequestHandler(handler),req,rsp);