From 2e5c554fea0aea1dfeecb227777f03f18fb78cd4 Mon Sep 17 00:00:00 2001
From: yonik <yonik@apache.org>
Date: Fri, 9 Aug 2019 09:05:05 -0400
Subject: [PATCH] SOLR-13399: fix splitByPrefix default to be false

---
 .../org/apache/solr/cloud/api/collections/SplitShardCmd.java    | 2 +-
 .../java/org/apache/solr/handler/admin/CollectionsHandler.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
index 6c5921edbe0..f18b0b65fdb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
@@ -209,7 +209,7 @@ public class SplitShardCmd implements OverseerCollectionMessageHandler.Cmd {
       ShardHandler shardHandler = ocmh.shardHandlerFactory.getShardHandler(ocmh.overseer.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient());
 
 
-      if (message.getBool(CommonAdminParams.SPLIT_BY_PREFIX, true)) {
+      if (message.getBool(CommonAdminParams.SPLIT_BY_PREFIX, false)) {
         t = timings.sub("getRanges");
 
         ModifiableSolrParams params = new ModifiableSolrParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index c08805d5a84..1e31577c766 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -152,6 +152,7 @@ import static org.apache.solr.common.params.CommonAdminParams.NUM_SUB_SHARDS;
 import static org.apache.solr.common.params.CommonAdminParams.SPLIT_FUZZ;
 import static org.apache.solr.common.params.CommonAdminParams.SPLIT_METHOD;
 import static org.apache.solr.common.params.CommonAdminParams.WAIT_FOR_FINAL_STATE;
+import static org.apache.solr.common.params.CommonAdminParams.SPLIT_BY_PREFIX;
 import static org.apache.solr.common.params.CommonParams.NAME;
 import static org.apache.solr.common.params.CommonParams.TIMING;
 import static org.apache.solr.common.params.CommonParams.VALUE_LONG;
@@ -775,6 +776,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
           SPLIT_METHOD,
           NUM_SUB_SHARDS,
           SPLIT_FUZZ,
+          SPLIT_BY_PREFIX,
           FOLLOW_ALIASES);
       return copyPropertiesWithPrefix(req.getParams(), map, COLL_PROP_PREFIX);
     }),