You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/11/01 15:19:51 UTC
svn commit: r1537943 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/update/processor/
solr/core/src/test/org/apache/solr/cloud/
solr/core/src/test/org/apache/solr/search/
solr/core/src/test/org/apache/solr/u...
Author: markrmiller
Date: Fri Nov 1 14:19:51 2013
New Revision: 1537943
URL: http://svn.apache.org/r1537943
Log:
SOLR-5392: Add conf set name to solrj collection create methods
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1537943&r1=1537942&r2=1537943&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Fri Nov 1 14:19:51 2013
@@ -260,7 +260,7 @@ public class CollectionsAPIDistributedZk
}
response = CollectionAdminRequest.createCollection("solrj_implicit",
- "shardA,shardB", server);
+ "shardA,shardB", "conf1", server);
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
coresStatus = response.getCollectionCoresStatus();
@@ -285,7 +285,7 @@ public class CollectionsAPIDistributedZk
nodesStatus = response.getCollectionNodesStatus();
assertEquals(2, nodesStatus.size());
- response = CollectionAdminRequest.createCollection("conf1", 4, server);
+ response = CollectionAdminRequest.createCollection("conf1", 4, "conf1", server);
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java?rev=1537943&r1=1537942&r2=1537943&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java Fri Nov 1 14:19:51 2013
@@ -297,13 +297,14 @@ public class CollectionAdminRequest exte
return req.process( server );
}
public static CollectionAdminResponse createCollection( String name,
- Integer shards,
+ Integer shards, String conf,
SolrServer server ) throws SolrServerException, IOException
{
Create req = new Create();
req.setCollectionName(name);
req.setRouterName("compositeId");
req.setNumShards(shards);
+ req.setConfigName(conf);
return req.process( server );
}
@@ -327,13 +328,14 @@ public class CollectionAdminRequest exte
return req.process( server );
}
public static CollectionAdminResponse createCollection( String name,
- String shards,
+ String shards, String conf,
SolrServer server ) throws SolrServerException, IOException
{
Create req = new Create();
req.setCollectionName(name);
req.setRouterName("implicit");
req.setShards(shards);
+ req.setConfigName(conf);
return req.process( server );
}