Some clean ups, and updates for merges.

Author: epugh

gradle/testing/randomization/policies/solr-tests.policy

@@ -36,9 +36,8 @@ grant {
   permission java.io.FilePermission "/path/to/solr/home/lib", "read";
 
   // Needed by org.apache.solr.handler.component.UBIComponentTest
-  permission java.io.FilePermission "${common-solr.dir}/core/build/resources/test/solr/userfiles/ubi_queries.jsonl", "write";
-  permission java.io.FilePermission "/tmp/src/solr/solr/core/build/resources/test/solr/userfiles${/}-", "write";
-  permission java.io.FilePermission "/tmp/src/solr/solr/core/build/resources/test/solr/userfiles", "write";
+  permission java.io.FilePermission "${common-solr.dir}/core/build/resources/test/solr/userfiles", "read,write";
+  permission java.io.FilePermission "${common-solr.dir}/core/build/resources/test/solr/userfiles${/}-", "read,write,delete";
 
   permission java.nio.file.LinkPermission "hard";
 

solr/core/src/java/org/apache/solr/handler/component/UBIComponent.java

@@ -80,7 +80,7 @@
  *
  * <p>You provide a streaming expression that is parsed and loaded by the component to stream query
  * data to a target of your choice. If you do not, then the default expression of
- * 'logging(ubi_queries.jsonl,ubiQuery())"' is used which logs data to
+ * 'logging(ubi_queries.jsonl,ubiQuery())' is used which logs data to
  * $SOLR_HOME/userfiles/ubi_queries.jsonl file.
  *
  * <p>You must source your streaming events using the 'ubiQuery()' streaming expression to retrieve
@@ -94,12 +94,9 @@
  *
  * <pre class="prettyprint">
  * &lt;searchComponent name="ubi" class="solr.UBIComponent"/&gt;
- *
  * &lt;requestHandler name="/select" class="solr.SearchHandler"&gt;
  *   &lt;lst name="defaults"&gt;
- *
  *     ...
- *
  *   &lt;/lst&gt;
  *   &lt;arr name="components"&gt;
  *     &lt;str&gt;ubi&lt;/str&gt;
@@ -270,11 +267,11 @@ public int distributedProcess(ResponseBuilder rb) throws IOException {
 
     // Wait until STAGE_GET_FIELDS when rb.resultIds contains the merged document IDs
     // from all shards, representing the final result set returned to the user
-    if (rb.stage < ResponseBuilder.STAGE_GET_FIELDS) {
+    if (rb.getStage() < ResponseBuilder.STAGE_GET_FIELDS) {
       return ResponseBuilder.STAGE_GET_FIELDS;
     }
 
-    if (rb.stage == ResponseBuilder.STAGE_GET_FIELDS) {
+    if (rb.getStage() == ResponseBuilder.STAGE_GET_FIELDS) {
       // In distributed mode, rb.resultIds.keySet() contains the unique key values
       // from all shards, merged and sorted by the coordinator
       storeUbiDetails(
@@ -330,13 +327,13 @@ private static UBIQuery getUbiQuery(ResponseBuilder rb) {
     if (ubiQuery.getApplication() == null) {
       ubiQuery.setApplication(
           rb.isDistrib
-              ? rb.req.getCloudDescriptor().getCollectionName()
+              ? rb.req.getCore().getCoreDescriptor().getCollectionName()
               : searcher.getCore().getName());
     }
 
     String queryAttributes = params.get(QUERY_ATTRIBUTES);
 
-    if (queryAttributes != null && queryAttributes.toString().startsWith("{")) {
+    if (queryAttributes != null && queryAttributes.startsWith("{")) {
       // Look up the original nested JSON format, typically passed in
       // via the JSON formatted query.
       @SuppressWarnings("rawtypes")
@@ -490,15 +487,15 @@ public String getDescription() {
   /**
    * Handles all the data required for tracking a query using User Behavior Insights.
    *
-   * <p>Compatible with the
-   * https://github.com/o19s/ubi/blob/main/schema/1.2.0/query.request.schema.json.
+   * <p>Compatible with the <a
+   * href="https://github.com/o19s/ubi/blob/main/schema/1.2.0/query.request.schema.json">...</a>.
    */
   public static class UBIQuery {
 
     private String application;
     private String queryId;
     private String userQuery;
-    private Date timestamp;
+    private final Date timestamp;
 
     @SuppressWarnings("rawtypes")
     private Map queryAttributes;
@@ -530,10 +527,6 @@ public String getQueryId() {
       return queryId;
     }
 
-    public void setQueryId(String queryId) {
-      this.queryId = queryId;
-    }
-
     public String getUserQuery() {
       return userQuery;
     }
@@ -542,11 +535,6 @@ public void setUserQuery(String userQuery) {
       this.userQuery = userQuery;
     }
 
-    @SuppressWarnings("rawtypes")
-    public Map getQueryAttributes() {
-      return queryAttributes;
-    }
-
     @SuppressWarnings("rawtypes")
     public void setQueryAttributes(Map queryAttributes) {
       this.queryAttributes = queryAttributes;
@@ -562,7 +550,7 @@ public void setDocIds(String docIds) {
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     public Map toMap() {
-      @SuppressWarnings({"rawtypes", "unchecked"})
+      @SuppressWarnings({"rawtypes"})
       Map map = new HashMap();
       map.put(QUERY_ID, this.queryId);
       map.put(
@@ -596,8 +584,8 @@ public Map toMap() {
    * and returns it.
    *
    * <p>I suspect that if I had the right magic with a LetStream or a GetStream, I could somehow
-   * just use that to say "pluck the 'ubi-query' object out of the StreamContext and call .toTuple
-   * or make a map of it and that would be my tuple'.
+   * just use that to "pluck" the 'ubi-query' object out of the StreamContext and call .toTuple or
+   * make a map of it and that would be my tuple.
    */
   public static class UBIQueryStream extends TupleStream implements Expressible {
 

solr/core/src/test/org/apache/solr/handler/component/UBIComponentDistrQueriesTest.java

@@ -22,11 +22,11 @@
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.cloud.AbstractDistribZkTestBase;
+import org.apache.solr.cloud.BasicDistributedZkTest;
 import org.apache.solr.cloud.SolrCloudTestCase;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.MapSolrParams;
+import org.apache.solr.common.util.NamedList;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -59,7 +59,7 @@ public static void setupCluster() throws Exception {
 
     cluster.waitForActiveCollection(collection, 2, 2);
 
-    AbstractDistribZkTestBase.waitForRecoveriesToFinish(
+    BasicDistributedZkTest.waitForRecoveriesToFinish(
         collection, cluster.getZkStateReader(), false, true, TIMEOUT);
     if (useAlias) {
       CollectionAdminRequest.createAlias(COLLECTIONORALIAS, collection)
@@ -77,7 +77,7 @@ public static void setupCluster() throws Exception {
 
     cluster.waitForActiveCollection("ubi_queries", 1, 1);
 
-    AbstractDistribZkTestBase.waitForRecoveriesToFinish(
+    BasicDistributedZkTest.waitForRecoveriesToFinish(
         "ubi_queries", cluster.getZkStateReader(), false, true, TIMEOUT);
   }
 
@@ -106,7 +106,9 @@ public void testUBIQueryStream() throws Exception {
                 new MapSolrParams(Map.of("q", "aa", "df", "subject", "rows", "2", "ubi", "true")));
 
     // Verify UBI response was added
-    String qid = (String) ((SimpleMap<?>) queryResponse.getResponse().get("ubi")).get("query_id");
+    @SuppressWarnings("unchecked")
+    NamedList<Object> ubiResponse = (NamedList<Object>) queryResponse.getResponse().get("ubi");
+    String qid = (String) ubiResponse.get("query_id");
     assertNotNull("Query ID should be present", qid);
     assertTrue("Query ID should be a valid UUID", qid.length() > 10);
 
@@ -194,7 +196,9 @@ public void testUBIInDistributedMode_MultipleShards() throws Exception {
     // Verify we got results
     assertTrue("Should get results from distributed query", queryResponse.getResults().size() > 0);
 
-    String qid = (String) ((SimpleMap<?>) queryResponse.getResponse().get("ubi")).get("query_id");
+    @SuppressWarnings("unchecked")
+    NamedList<Object> ubiResponse = (NamedList<Object>) queryResponse.getResponse().get("ubi");
+    String qid = (String) ubiResponse.get("query_id");
     assertNotNull("Query ID should be present in distributed mode", qid);
 
     // Force commit and wait for record

solr/core/src/test/org/apache/solr/handler/component/UBIComponentStreamingQueriesTest.java

@@ -41,7 +41,7 @@
 import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.cloud.AbstractDistribZkTestBase;
+import org.apache.solr.cloud.BasicDistributedZkTest;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.embedded.JettySolrRunner;
@@ -76,7 +76,7 @@ public static void setupCluster() throws Exception {
 
     cluster.waitForActiveCollection(collection, 2, 2);
 
-    AbstractDistribZkTestBase.waitForRecoveriesToFinish(
+    BasicDistributedZkTest.waitForRecoveriesToFinish(
         collection, cluster.getZkStateReader(), false, true, TIMEOUT);
     if (useAlias) {
       CollectionAdminRequest.createAlias(COLLECTIONORALIAS, collection)