You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/10/12 16:13:52 UTC
[solr] 02/02: SOLR-16433: Security Manager prevents Solr SQL from working (#1044)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 82f91bdf54793642e226bbd6e1eacb2a192fecc8
Author: Kevin Risden <ri...@users.noreply.github.com>
AuthorDate: Wed Oct 12 12:12:48 2022 -0400
SOLR-16433: Security Manager prevents Solr SQL from working (#1044)
---
solr/CHANGES.txt | 2 ++
solr/modules/sql/src/resources/saffron.properties | 2 ++
solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9d91653003a..df3b8c4e733 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -183,6 +183,8 @@ Bug Fixes
* SOLR-16457: solr.data.home should not be set to empty string in bin/solr (Kevin Risden)
+* SOLR-16433: Security Manager prevents Solr SQL from working (Kevin Risden)
+
Other Changes
---------------------
* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)
diff --git a/solr/modules/sql/src/resources/saffron.properties b/solr/modules/sql/src/resources/saffron.properties
new file mode 100644
index 00000000000..4a60b5d34e2
--- /dev/null
+++ b/solr/modules/sql/src/resources/saffron.properties
@@ -0,0 +1,2 @@
+# See SOLR-16433 and CALCITE-5298
+calcite.test.dataset=.
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
index a1230ab80b5..2218b815ade 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
@@ -56,7 +56,7 @@ public class DriverImpl implements Driver {
if (!props.containsKey("collection")) {
throw new SQLException(
- "The connection url has no connection properties. At a mininum the collection must be specified.");
+ "The connection url has no connection properties. At a minimum the collection must be specified.");
}
String collection = (String) props.remove("collection");