(solr) branch main updated: SOLR-17925: Remove obsolete QueryCommand.timeAllowed replaced by QueryLimits. (#3718)

[ab]

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new b810b71b90b SOLR-17925: Remove obsolete QueryCommand.timeAllowed 
replaced by QueryLimits. (#3718)
b810b71b90b is described below

commit b810b71b90bbbfeed528466f0f413fc143ee4533
Author: Andrzej Białecki <a...@apache.org>
AuthorDate: Mon Oct 6 16:34:36 2025 +0200

    SOLR-17925: Remove obsolete QueryCommand.timeAllowed replaced by 
QueryLimits. (#3718)
---
 solr/CHANGES.txt                                               |  2 ++
 .../java/org/apache/solr/handler/component/QueryComponent.java |  4 ----
 solr/core/src/java/org/apache/solr/search/QueryCommand.java    | 10 ----------
 .../src/java/org/apache/solr/search/SolrIndexSearcher.java     |  5 -----
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d1ccfc79adb..8a04af0532d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -183,6 +183,8 @@ Deprecation Removals
 
 * SOLR-17932: Remove transient Solr cores capability. (Eric Pugh, David Smiley)
 
+* SOLR-17925: Remove obsolete QueryCommand.timeAllowed replaced by 
QueryLimits. (Andrzej Bialecki)
+
 Dependency Upgrades
 ---------------------
 
diff --git 
a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java 
b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 9deb2f9f4d0..cf174f21217 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -378,12 +378,8 @@ public class QueryComponent extends SearchComponent {
 
     final boolean multiThreaded = params.getBool(CommonParams.MULTI_THREADED, 
false);
 
-    // -1 as flag if not set.
-    long timeAllowed = params.getLong(CommonParams.TIME_ALLOWED, -1L);
-
     QueryCommand cmd = rb.createQueryCommand();
     cmd.setMultiThreaded(multiThreaded);
-    cmd.setTimeAllowed(timeAllowed);
     cmd.setMinExactCount(getMinExactCount(params));
     cmd.setDistribStatsDisabled(rb.isDistribStatsDisabled());
 
diff --git a/solr/core/src/java/org/apache/solr/search/QueryCommand.java 
b/solr/core/src/java/org/apache/solr/search/QueryCommand.java
index 7875ba663a8..81857a7b568 100755
--- a/solr/core/src/java/org/apache/solr/search/QueryCommand.java
+++ b/solr/core/src/java/org/apache/solr/search/QueryCommand.java
@@ -38,7 +38,6 @@ public class QueryCommand {
   private int supersetMaxDoc;
   private int flags;
   private boolean multiThreaded = false;
-  private long timeAllowed = -1;
   private int minExactCount = Integer.MAX_VALUE;
   private CursorMark cursorMark;
   private boolean distribStatsDisabled;
@@ -164,15 +163,6 @@ public class QueryCommand {
     return this;
   }
 
-  public long getTimeAllowed() {
-    return timeAllowed;
-  }
-
-  public QueryCommand setTimeAllowed(long timeAllowed) {
-    this.timeAllowed = timeAllowed;
-    return this;
-  }
-
   public int getMinExactCount() {
     return minExactCount;
   }
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java 
b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 5498d9202a8..44dd0eec613 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -306,11 +306,6 @@ public class SolrIndexSearcher extends IndexSearcher 
implements Closeable, SolrI
       collector = new EarlyTerminatingCollector(collector, 
cmd.getMaxHitsAllowed());
     }
 
-    /*    final long timeAllowed = cmd.getTimeAllowed();
-    if (timeAllowed > 0) {
-      setTimeout(new QueryTimeoutImpl(timeAllowed));
-    }*/
-
     if (postFilter != null) {
       postFilter.setLastDelegate(collector);
       collector = postFilter;