Apache Solr open-source search software
SOLR-16656: rid parameter missing from query logs (#1364)
Alex35a9bed31dc1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 8192834d61f..ec3c22f0745 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -232,6 +232,8 @@ Bug Fixes* SOLR-16682: MoreLikeThis Component fails with SyntaxError: Cannot parse if document terms contains symbols from query parser syntax(Mikhail Khludnev)+* SOLR-16656: rid parameter missing from query logs (Alex Deparvu)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex d670ed954ad..636f5303849 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -272,18 +272,23 @@ public class SearchHandler extends RequestHandlerBasereturn result;}+ private boolean isDistrib(SolrQueryRequest req) {+ boolean isZkAware = req.getCoreContainer().isZooKeeperAware();+ boolean isDistrib = req.getParams().getBool(DISTRIB, isZkAware);+ if (!isDistrib) {+ // for back compat, a shards param with URLs like localhost:8983/solr will mean that this+ // search is distributed.+ final String shards = req.getParams().get(ShardParams.SHARDS);+ isDistrib = ((shards != null) && (shards.indexOf('/') > 0));+ }+ return isDistrib;+ }+public ShardHandler getAndPrepShardHandler(SolrQueryRequest req, ResponseBuilder rb) {ShardHandler shardHandler = null;CoreContainer cc = req.getCoreContainer();boolean isZkAware = cc.isZooKeeperAware();- rb.isDistrib = req.getParams().getBool(DISTRIB, isZkAware);- if (!rb.isDistrib) {- // for back compat, a shards param with URLs like localhost:8983/solr will mean that this- // search is distributed.- final String shards = req.getParams().get(ShardParams.SHARDS);- rb.isDistrib = ((shards != null) && (shards.indexOf('/') > 0));- }if (rb.isDistrib) {shardHandler = shardHandlerFactory.getShardHandler();@@ -338,6 +343,7 @@ public class SearchHandler extends RequestHandlerBaserb.requestInfo.setResponseBuilder(rb);}+ rb.isDistrib = isDistrib(req);tagRequestWithRequestId(rb);boolean dbg = req.getParams().getBool(CommonParams.DEBUG_QUERY, false);