minor: Show running Dart queries first. (#19237)

This patch adjusts the ordering of current-dart-panel in the web console
to match the current tasks panel: RUNNING is first, ACCEPTED is next,
then all the completed states follow. Within each category, queries
are sorted by timestamp, newest first: RUNNING and ACCEPTED by start
time, and completed queries by finish time.

This patch also renames the interface method "getRunningQueries" to
"getQueries", because it can return completed queries too.

Author: gianm

multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java

@@ -32,15 +32,15 @@
 public interface DartSqlClient
 {
   /**
-   * Get information about all currently-running queries on this server.
+   * Get information about all currently-running, and possibly also recently-completed, queries on this server.
    *
    * @param selfOnly        true if only queries from this server should be returned; false if queries from all servers
    *                        should be returned
    * @param includeComplete true if completed queries should be included in the response
    *
    * @see SqlResource#doGetRunningQueries(String, String, HttpServletRequest) the server side
    */
-  ListenableFuture<GetQueriesResponse> getRunningQueries(boolean selfOnly, boolean includeComplete);
+  ListenableFuture<GetQueriesResponse> getQueries(boolean selfOnly, boolean includeComplete);
 
   /**
    * Get query report for a particular SQL query ID on this server.

multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImpl.java

@@ -49,7 +49,7 @@ public DartSqlClientImpl(final ServiceClient client, final ObjectMapper jsonMapp
   }
 
   @Override
-  public ListenableFuture<GetQueriesResponse> getRunningQueries(final boolean selfOnly, final boolean includeComplete)
+  public ListenableFuture<GetQueriesResponse> getQueries(final boolean selfOnly, final boolean includeComplete)
   {
     try {
       URIBuilder builder = new URIBuilder("/queries");

multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlEngine.java

@@ -82,7 +82,6 @@ public class DartSqlEngine implements SqlEngine
 {
   public static final String NAME = "msq-dart";
   private static final Logger log = new Logger(DartSqlEngine.class);
-
   private final DartControllerContextFactory controllerContextFactory;
   private final DartControllerRegistry controllerRegistry;
   private final DartControllerConfig controllerConfig;
@@ -256,7 +255,7 @@ public SqlStatementFactory getSqlStatementFactory()
   }
 
   @Override
-  public GetQueriesResponse getRunningQueries(
+  public GetQueriesResponse getQueries(
       boolean selfOnly,
       boolean includeComplete,
       AuthenticationResult authenticationResult,
@@ -276,7 +275,7 @@ public GetQueriesResponse getRunningQueries(
           Futures.successfulAsList(
               Iterables.transform(
                   sqlClients.getAllClients(),
-                  client -> client.getRunningQueries(true, includeComplete)
+                  client -> client.getQueries(true, includeComplete)
               )
           ),
           true

multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java

@@ -384,7 +384,7 @@ public void test_getRunningQueries_global_superUser()
         StandardQueryState.RUNNING,
         null
     );
-    Mockito.when(dartSqlClient.getRunningQueries(true, false))
+    Mockito.when(dartSqlClient.getQueries(true, false))
            .thenReturn(Futures.immediateFuture(new GetQueriesResponse(Collections.singletonList(remoteQueryInfo))));
 
     // With selfOnly = null, the endpoint returns both queries.
@@ -415,7 +415,7 @@ public void test_getRunningQueries_global_remoteError_superUser()
     final ControllerHolder localHolder = setUpMockRunningQuery(REGULAR_USER_NAME);
 
     // Remote call fails.
-    Mockito.when(dartSqlClient.getRunningQueries(true, false))
+    Mockito.when(dartSqlClient.getQueries(true, false))
            .thenReturn(Futures.immediateFailedFuture(new IOException("something went wrong")));
 
     // We only see local queries, because the remote call failed. (The entire call doesn't fail; we see what we
@@ -453,7 +453,7 @@ public void test_getRunningQueries_global_regularUser()
         StandardQueryState.RUNNING,
         null
     );
-    Mockito.when(dartSqlClient.getRunningQueries(true, false))
+    Mockito.when(dartSqlClient.getQueries(true, false))
            .thenReturn(Futures.immediateFuture(new GetQueriesResponse(Collections.singletonList(remoteQueryInfo))));
 
     // The endpoint returns only the query issued by REGULAR_USER_NAME.
@@ -491,7 +491,7 @@ public void test_getRunningQueries_global_differentRegularUser()
         StandardQueryState.RUNNING,
         null
     );
-    Mockito.when(dartSqlClient.getRunningQueries(true, false))
+    Mockito.when(dartSqlClient.getQueries(true, false))
            .thenReturn(Futures.immediateFuture(new GetQueriesResponse(Collections.singletonList(remoteQueryInfo))));
 
     // The endpoint returns only the query issued by DIFFERENT_REGULAR_USER_NAME.

multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImplTest.java

@@ -87,7 +87,7 @@ public void test_getMessages_all() throws Exception
         jsonMapper.writeValueAsBytes(getQueriesResponse)
     );
 
-    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getRunningQueries(false, false);
+    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getQueries(false, false);
     Assertions.assertEquals(getQueriesResponse, result.get());
   }
 
@@ -117,7 +117,7 @@ public void test_getMessages_selfOnly() throws Exception
         jsonMapper.writeValueAsBytes(getQueriesResponse)
     );
 
-    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getRunningQueries(true, false);
+    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getQueries(true, false);
     Assertions.assertEquals(getQueriesResponse, result.get());
   }
 
@@ -147,7 +147,7 @@ public void test_getMessages_includeComplete() throws Exception
         jsonMapper.writeValueAsBytes(getQueriesResponse)
     );
 
-    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getRunningQueries(false, true);
+    final ListenableFuture<GetQueriesResponse> result = dartSqlClient.getQueries(false, true);
     Assertions.assertEquals(getQueriesResponse, result.get());
   }
 }

sql/src/main/java/org/apache/druid/sql/calcite/run/SqlEngine.java

@@ -144,7 +144,7 @@ default void initContextMap(Map<String, Object> contextMap)
    * @param stateReadAuthorization authorization for the STATE READ resource. If this is authorized, implementations
    *                               should allow all queries to be visible
    */
-  default GetQueriesResponse getRunningQueries(
+  default GetQueriesResponse getQueries(
       boolean selfOnly,
       boolean includeComplete,
       AuthenticationResult authenticationResult,

sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java

@@ -1282,7 +1282,7 @@ public Enumerable<Object[]> scan(
       // Get queries from all engines
       final List<QueryInfo> allQueries = new ArrayList<>();
       for (final SqlEngine sqlEngine : sqlEngineRegistryProvider.get().getAllEngines()) {
-        final GetQueriesResponse response = sqlEngine.getRunningQueries(
+        final GetQueriesResponse response = sqlEngine.getQueries(
             false, // selfOnly false to get queries from all servers
             true, // includeComplete true to include all queries
             authenticationResult,

sql/src/main/java/org/apache/druid/sql/http/SqlResource.java

@@ -168,7 +168,7 @@ public Response doGetRunningQueries(
     // Get running queries from all engines that support it.
     for (SqlEngine sqlEngine : engines) {
       queries.addAll(
-          sqlEngine.getRunningQueries(
+          sqlEngine.getQueries(
               selfOnly != null,
               includeComplete != null,
               authenticationResult,

sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java

@@ -1665,7 +1665,7 @@ public void testQueriesTable()
     // Create mock SqlEngine that returns test queries
     final SqlEngine mockEngine = EasyMock.createMock(SqlEngine.class);
     EasyMock.expect(mockEngine.name()).andReturn("native").anyTimes();
-    EasyMock.expect(mockEngine.getRunningQueries(
+    EasyMock.expect(mockEngine.getQueries(
         EasyMock.eq(false),
         EasyMock.eq(true),
         EasyMock.anyObject(),

web-console/src/druid-models/dart/dart-query-entry.ts

@@ -25,4 +25,30 @@ export interface DartQueryEntry {
   identity: string;
   startTime: string;
   state: 'ACCEPTED' | 'RUNNING' | 'CANCELED' | 'SUCCESS' | 'FAILED';
+  durationMs?: number;
+}
+
+const STATE_RANK: Record<string, number> = {
+  RUNNING: 2,
+  ACCEPTED: 1,
+};
+
+export function compareForDisplay(a: DartQueryEntry, b: DartQueryEntry): number {
+  const stateA = STATE_RANK[a.state] ?? 0;
+  const stateB = STATE_RANK[b.state] ?? 0;
+
+  // Primary: RUNNING > ACCEPTED > others
+  if (stateA !== stateB) {
+    return stateB - stateA;
+  }
+
+  if (stateA > 0) {
+    // RUNNING or ACCEPTED: descending startTime (newest first)
+    return b.startTime.localeCompare(a.startTime);
+  } else {
+    // Finished: descending finish time (startTime + durationMs)
+    const finishA = new Date(a.startTime).valueOf() + (a.durationMs ?? 0);
+    const finishB = new Date(b.startTime).valueOf() + (b.durationMs ?? 0);
+    return finishB - finishA;
+  }
 }