From e89773e19a85cdce0121f16bb2105602b0023ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 4 Jul 2026 01:08:18 +0200 Subject: [PATCH 1/3] Avoid forwarding unrelated request parameters to Calcite from the /sql handler --- changelog/unreleased/calcite-sql-params.yml | 7 +++++++ .../apache/solr/handler/sql/SQLHandler.java | 15 +++++++++------ .../solr/handler/sql/TestSQLHandler.java | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 changelog/unreleased/calcite-sql-params.yml diff --git a/changelog/unreleased/calcite-sql-params.yml b/changelog/unreleased/calcite-sql-params.yml new file mode 100644 index 000000000000..3f35c0a2a9fa --- /dev/null +++ b/changelog/unreleased/calcite-sql-params.yml @@ -0,0 +1,7 @@ +title: Avoid forwarding unrelated request parameters to Calcite from the /sql handler +type: changed +authors: + - name: Jan Høydahl +links: + - name: PRXXXX + url: https://github.com/apache/solr/pull/XXXX diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java index 1f3cfe6b05d7..51847676e3fb 100644 --- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java +++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java @@ -22,10 +22,10 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.apache.calcite.config.Lex; import org.apache.solr.client.solrj.io.Tuple; import org.apache.solr.client.solrj.io.comp.StreamComparator; @@ -56,6 +56,8 @@ public class SQLHandler extends RequestHandlerBase static final String sqlNonCloudErrorMsg = "/sql handler only works in Solr Cloud mode"; + static final Set CONNECTION_PARAMS = Set.of("aggregationMode", "numWorkers"); + private boolean isCloud = false; @Override @@ -103,11 +105,12 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw String url = CalciteSolrDriver.CONNECT_STRING_PREFIX; Properties properties = new Properties(); - // Add all query parameters - Iterator parameterNamesIterator = params.getParameterNamesIterator(); - while (parameterNamesIterator.hasNext()) { - String param = parameterNamesIterator.next(); - properties.setProperty(param, params.get(param)); + // Forward only the parameters the handler supports as connection configuration. + for (String param : CONNECTION_PARAMS) { + String value = params.get(param); + if (value != null) { + properties.setProperty(param, value); + } } // Set these last to ensure that they are set properly diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java index 94e997998ea1..131476c3031e 100644 --- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java +++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java @@ -452,6 +452,24 @@ public void testBasicSelect() throws Exception { tuples = getTuples(sParams, baseUrl); assertEquals(0, tuples.size()); + + // Verify that we only forward parameters we care about + sParams = + params( + CommonParams.QT, + "/sql", + "typeSystem", + "does.not.Exist", + "stmt", + "select id, field_i, str_s from collection1 where text_t='XXXX' order by field_i desc limit 1"); + + tuples = getTuples(sParams, baseUrl); + + assertEquals(1, tuples.size()); + tuple = tuples.get(0); + assertEquals(8, tuple.getLong("id").longValue()); + assertEquals(60, tuple.getLong("field_i").longValue()); + assertEquals("c", tuple.get("str_s")); } @Test From ee97aaf224d7404fd38885d5a9a79dbe0d37638a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 4 Jul 2026 01:25:40 +0200 Subject: [PATCH 2/3] Put PR number in changelog --- changelog/unreleased/calcite-sql-params.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog/unreleased/calcite-sql-params.yml b/changelog/unreleased/calcite-sql-params.yml index 3f35c0a2a9fa..1635159c1567 100644 --- a/changelog/unreleased/calcite-sql-params.yml +++ b/changelog/unreleased/calcite-sql-params.yml @@ -3,5 +3,5 @@ type: changed authors: - name: Jan Høydahl links: - - name: PRXXXX - url: https://github.com/apache/solr/pull/XXXX + - name: PR#4607 + url: https://github.com/apache/solr/pull/4607 From 58127870a790dd86f69caf0afbc316feec7d1df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 6 Jul 2026 22:30:44 +0200 Subject: [PATCH 3/3] Remove dead code.defaultWorkerCollection, workerZkhost, workerCollection --- .../sql/src/java/org/apache/solr/handler/sql/SQLHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java index 51847676e3fb..2295dc6269a4 100644 --- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java +++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SQLHandler.java @@ -52,7 +52,6 @@ public class SQLHandler extends RequestHandlerBase private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static String defaultZkhost = null; - private static String defaultWorkerCollection = null; static final String sqlNonCloudErrorMsg = "/sql handler only works in Solr Cloud mode"; @@ -66,7 +65,6 @@ public void inform(SolrCore core) { if (coreContainer.isZooKeeperAware()) { defaultZkhost = coreContainer.getZkController().getZkServerAddress(); - defaultWorkerCollection = core.getCoreDescriptor().getCollectionName(); isCloud = true; } @@ -87,8 +85,6 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw String sql = params.get("stmt"); // Set defaults for parameters params.set("numWorkers", params.getInt("numWorkers", 1)); - params.set("workerCollection", params.get("workerCollection", defaultWorkerCollection)); - params.set("workerZkhost", params.get("workerZkhost", defaultZkhost)); params.set("aggregationMode", params.get("aggregationMode", "facet")); TupleStream tupleStream = null;