From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 1 Apr 2022 18:47:39 +0000 (-0400)
Subject: 18943: Adjust keyset_list_all for efficient decending order
X-Git-Tag: 2.5.0~229^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f988449749c047bbf100e94dd2bb9285b08fa3c1

18943: Adjust keyset_list_all for efficient decending order

Default is ascending (created_at asc, uuid asc) but if acending=False
to use the index properly the query needs to be
(created_at desc, uuid desc)

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/sdk/python/arvados/util.py b/sdk/python/arvados/util.py
index be8a03fc31..c383d529e8 100644
--- a/sdk/python/arvados/util.py
+++ b/sdk/python/arvados/util.py
@@ -392,7 +392,8 @@ def keyset_list_all(fn, order_key="created_at", num_retries=0, ascending=True, *
     pagesize = 1000
     kwargs["limit"] = pagesize
     kwargs["count"] = 'none'
-    kwargs["order"] = ["%s %s" % (order_key, "asc" if ascending else "desc"), "uuid asc"]
+    asc = "asc" if ascending else "desc"
+    kwargs["order"] = ["%s %s" % (order_key, asc), "uuid %s" % asc]
     other_filters = kwargs.get("filters", [])
 
     if "select" in kwargs and "uuid" not in kwargs["select"]:
@@ -436,7 +437,7 @@ def keyset_list_all(fn, order_key="created_at", num_retries=0, ascending=True, *
         if firstitem[order_key] == lastitem[order_key]:
             # Got a page where every item has the same order key.
             # Switch to using uuid for paging.
-            nextpage = [[order_key, "=", lastitem[order_key]], ["uuid", ">", lastitem["uuid"]]]
+            nextpage = [[order_key, "=", lastitem[order_key]], ["uuid", ">" if ascending else "<", lastitem["uuid"]]]
             prev_page_all_same_order_key = True
         else:
             # Start from the last order key seen, but skip the last