fix

apache · Jun 6, 2022 · 83d5d7d · 83d5d7d
1 parent e15b463
commit 83d5d7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/BatchRestApi.java b/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/BatchRestApi.java
@@ -64,7 +64,7 @@ public GetBatchesResponse listBatches(
       params.put("createTime", createTime);
     }
     if (null != endTime && endTime >= 0) {
-      params.put("endTime", createTime);
+      params.put("endTime", endTime);
     }
     params.put("from", from);
     params.put("size", size);

diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/statestore/jdbc/JDBCStateStore.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/statestore/jdbc/JDBCStateStore.scala
@@ -209,6 +209,7 @@ class JDBCStateStore(conf: KyuubiConf) extends StateStore with Logging {
       params += createTime
     }
     if (endTime > 0) {
+      whereConditions += " end_time > 0 "
       whereConditions += " end_time <= ? "
       params += endTime
     }

diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/rest/client/BatchRestApiSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/rest/client/BatchRestApiSuite.scala
@@ -133,6 +133,9 @@ class BatchRestApiSuite extends RestClientTestHelper {
     var listBatchesResp = batchRestApi.listBatches("SPARK", null, null, null, null, 0, Int.MaxValue)
     assert(listBatchesResp.getTotal > 0)
 
+    listBatchesResp = batchRestApi.listBatches("SPARK", null, null, null, 1000, 0, Int.MaxValue)
+    assert(listBatchesResp.getTotal === 0)
+
     // list batches with non-existing user
     listBatchesResp =
       batchRestApi.listBatches("SPARK", "non_existing_user", null, 0, 0, 0, Int.MaxValue)