Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8765: Fix CollectionAdminRequest.SplitShard to accept requests without the 'shard' parameter

This commit is contained in:
anshum 2016-03-10 13:59:37 -08:00
parent 209f5c2946
commit b0caca3b60
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
View File

@ -454,7 +454,7 @@ public class CollectionsHandler extends RequestHandlerBase {
String splitKey = req.getParams().get("split.key"); String splitKey = req.getParams().get("split.key");
if (splitKey == null && shard == null) { if (splitKey == null && shard == null) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Missing required parameter: shard"); throw new SolrException(ErrorCode.BAD_REQUEST, "At least one of shard, or split.key should be specified.");
} }
if (splitKey != null && shard != null) { if (splitKey != null && shard != null) {
throw new SolrException(ErrorCode.BAD_REQUEST, throw new SolrException(ErrorCode.BAD_REQUEST,

36
solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
View File

@ -616,27 +616,30 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
/** /**
* Returns a SolrRequest to split a shard in a collection * Returns a SolrRequest to split a shard in a collection
*/ */
public static SplitShard splitShard(String collection, String shard) { public static SplitShard splitShard(String collection) {
return new SplitShard(collection, shard); return new SplitShard(collection);
} }
// SPLITSHARD request // SPLITSHARD request
public static class SplitShard extends AsyncShardSpecificAdminRequest { public static class SplitShard extends AsyncCollectionAdminRequest {
protected String collection;
protected String ranges; protected String ranges;
protected String splitKey; protected String splitKey;
protected String shard;
private Properties properties; private Properties properties;
private SplitShard(String collection, String shard) { private SplitShard(String collection) {
super(CollectionAction.SPLITSHARD, collection, shard); super(CollectionAction.SPLITSHARD);
this.collection = collection;
} }
/** /**
* @deprecated Use {@link #splitShard(String, String)} * @deprecated Use {@link #splitShard(String)}
*/ */
@Deprecated @Deprecated
public SplitShard() { public SplitShard() {
super(CollectionAction.SPLITSHARD, null, null); super(CollectionAction.SPLITSHARD);
} }
public SplitShard setRanges(String ranges) { this.ranges = ranges; return this; } public SplitShard setRanges(String ranges) { this.ranges = ranges; return this; }
@ -660,15 +663,12 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
return this; return this;
} }
@Override
@Deprecated @Deprecated
public SplitShard setCollectionName(String collection) { public SplitShard setCollectionName(String collection) {
this.collection = collection; this.collection = collection;
return this; return this;
} }
@Override
@Deprecated
public SplitShard setShardName(String shard) { public SplitShard setShardName(String shard) {
this.shard = shard; this.shard = shard;
return this; return this;
@ -684,10 +684,20 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
@Override @Override
public SolrParams getParams() { public SolrParams getParams() {
ModifiableSolrParams params = (ModifiableSolrParams) super.getParams(); ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
params.set( "ranges", ranges);
if(splitKey != null) if(this.collection == null) {
params.set("split.key", this.splitKey); throw new IllegalArgumentException("You must set collection name for this request.");
}
params.set(CollectionAdminParams.COLLECTION, collection);
if (this.shard == null && this.splitKey == null) {
throw new IllegalArgumentException("You must set shardname OR splitkey for this request.");
}
params.set("shard", shard);
params.set("split.key", this.splitKey);
params.set( "ranges", ranges);
if(properties != null) { if(properties != null) {
addProperties(params, properties); addProperties(params, properties);

2
solr/solrj/src/java/org/apache/solr/common/params/CollectionAdminParams.java
View File

@ -21,4 +21,6 @@ public abstract class CollectionAdminParams {
/* Param used by DELETESTATUS call to clear all stored responses */ /* Param used by DELETESTATUS call to clear all stored responses */
public static final String FLUSH = "flush"; public static final String FLUSH = "flush";
public static final String COLLECTION = "collection";
} }