Apache Solr open-source search software
SOLR-16971 RealTimeGet with Composite router throws NPE (#1914)
Alex D330abd4be3cb
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 138ca224e11..f2e323839c9 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -190,6 +190,8 @@ Bug Fixes* SOLR-16973: fix REMOTE_JMX_OPTS to delayed expansion (Tiziano Degaetano via Colvin Cowie)+* SOLR-16971: RealTimeGet with Composite router throws NPE (Alex Deparvu)+Dependency Upgrades---------------------diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.javaindex b845e050ae3..56aebd8e9d2 100644--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java@@ -1051,7 +1051,10 @@ public class RealTimeGetComponent extends SearchComponent {for (String id : reqIds.allIds) {Slice slice =coll.getRouter()- .getTargetSlice(params.get(ShardParams._ROUTE_, id), null, null, params, coll);+ .getTargetSlice(id, null, params.get(ShardParams._ROUTE_), params, coll);+ if (slice == null) {+ continue;+ }List<String> idsForShard = sliceToId.get(slice.getName());if (idsForShard == null) {diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex 6a9bf85a22c..0d5e05ded27 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -272,6 +272,40 @@ public class FullSolrCloudDistribCmdsTest extends SolrCloudTestCase {}}+ public void testRTGCompositeRouterWithRouterField() throws Exception {+ final CloudSolrClient cloudClient = cluster.getSolrClient();+ final String testCollectionName =+ "composite_collection_with_routerfield_" + NAME_COUNTER.getAndIncrement();+ assertEquals(+ RequestStatusState.COMPLETED,+ CollectionAdminRequest.createCollection(testCollectionName, "_default", 2, 2)+ .setRouterName("compositeId")+ .setRouterField("routefield_s")+ .setShards("shard1,shard2")+ .processAndWait(cloudClient, DEFAULT_TIMEOUT));+ ZkStateReader.from(cloudClient)+ .waitForState(+ testCollectionName,+ DEFAULT_TIMEOUT,+ TimeUnit.SECONDS,+ (n, c1) -> DocCollection.isFullyActive(n, c1, 2, 2));++ // Add a few documents with diff routes+ cloudClient.add(testCollectionName, sdoc("id", "1", "routefield_s", "europe"));+ cloudClient.add(testCollectionName, sdoc("id", "3", "routefield_s", "europe"));+ cloudClient.add(testCollectionName, sdoc("id", "5", "routefield_s", "africa"));+ cloudClient.add(testCollectionName, sdoc("id", "7", "routefield_s", "africa"));+ cloudClient.commit(testCollectionName);++ var docsNoRoute = cloudClient.getById(testCollectionName, List.of("3"));+ assertEquals(0, docsNoRoute.getNumFound());++ var params = new ModifiableSolrParams();+ params.set("_route_", "europe");+ var docsWRoute = cloudClient.getById(testCollectionName, List.of("3"), params);+ assertEquals(1, docsWRoute.getNumFound());+ }+public void testDeleteByIdCompositeRouterWithRouterField() throws Exception {final CloudSolrClient cloudClient = cluster.getSolrClient();final String testCollectionName =