Avoid forwarding unrelated request parameters to Calcite from the /sql handler#4607
Open
janhoy wants to merge 4 commits into
Open
Avoid forwarding unrelated request parameters to Calcite from the /sql handler#4607janhoy wants to merge 4 commits into
janhoy wants to merge 4 commits into
Conversation
github-actions
Bot
added
the
documentation
dsmiley
reviewed
Jul 7, 2026
Comment on lines
+461
to
+462
| "someOtherParam", | ||
| "someValue", |
Contributor
There was a problem hiding this comment.
your assertions don't check that "someOtherParam" wasn't passed
epugh
approved these changes
Jul 7, 2026
Contributor
There was a problem hiding this comment.
nice to see this expanding to cover more (and covering new properties!)
| static final String ALLOWED_CONNECTION_PARAMS_PROP = "solr.sql.connection.params.allowed"; | ||
|
|
||
| /** Calcite configuration parameters forwarded as connection properties. */ | ||
| static final Set<String> DEFAULT_CONNECTION_PARAMS = |
Contributor
There was a problem hiding this comment.
assuming these are the right ones! Wow...
| String sql = params.get("stmt"); | ||
| // Set defaults for parameters | ||
| params.set("numWorkers", params.getInt("numWorkers", 1)); | ||
| params.set("workerCollection", params.get("workerCollection", defaultWorkerCollection)); |
Contributor
There was a problem hiding this comment.
were there any tests that could be removed when these params were removed??? I didn't look...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
/sqlhandler needlessly forwarded unrelated request parameters to Calcite, which was brittle. Now always accept numWorkers and aggregationMode which are the ones Solr care about. Forward to Calcite all params listed in the new syspropsolr.sql.connection.params.allowed, defaulting to a set of the 11 most useful calcite params.Also there was some dead code in
SQLHandler. Removing handling of propertiesworkerCollection,workerZkhost, and the correspondingdefaultWorkerCollection.