PR#2320: hub: allow glob matching for listTags

Merges #2320
https://pagure.io/koji/pull-request/2320

Fixes: #2086
https://pagure.io/koji/issue/2086
list-tags glob is slow

cli/koji_cli/commands.py

@@ -4118,7 +4118,17 @@ def anon_handle_list_tags(goptions, session, args):
         if not buildinfo:
             parser.error(_("Invalid build %s" % options.build))
 
-    tags = session.listTags(buildinfo.get('id', None), pkginfo.get('id', None))
+    if not args:
+        # list everything if no pattern is supplied
+        args = [None]
+
+    tags = []
+    with session.multicall() as m:
+        for arg in args:
+            tags.append(m.listTags(build=buildinfo.get('id', None),
+                                   package=pkginfo.get('id', None),
+                                   pattern=arg))
+    tags = list(itertools.chain(*[t.result for t in tags]))
     tags.sort(key=lambda x: x['name'])
     # if options.verbose:
     #    fmt = "%(name)s [%(id)i] %(perm)s %(locked)s %(arches)s"
@@ -4127,12 +4137,6 @@ def anon_handle_list_tags(goptions, session, args):
     else:
         fmt = "%(name)s"
     for tag in tags:
-        if args:
-            for pattern in args:
-                if fnmatch.fnmatch(tag['name'], pattern):
-                    break
-            else:
-                continue
         if options.unlocked:
             if tag['locked'] or tag['perm']:
                 continue

hub/kojihub.py

@@ -1231,27 +1231,26 @@ def readPackageList(tagID=None, userID=None, pkgID=None, event=None, inherit=Fal
     return packages
 
 
-def list_tags(build=None, package=None, perms=True, queryOpts=None):
-    """List tags.  If build is specified, only return tags associated with the
-    given build.  If package is specified, only return tags associated with the
-    specified package.  If neither is specified, return all tags.  Build can be
-    either an integer ID or a string N-V-R.  Package can be either an integer ID
-    or a string name.  Only one of build and package may be specified.  Returns
-    a list of maps.  Each map contains keys:
-      - id
-      - name
-      - arches
-      - locked
+def list_tags(build=None, package=None, perms=True, pattern=None, queryOpts=None):
+    """List tags according to filters
 
-    If package is specified, each map will also contain:
-      - owner_id
-      - owner_name
-      - blocked
-      - extra_arches
+    :param int|str build: If build is specified, only return tags associated with
+                          the given build.  Build can be either an integer ID or
+                          a string N-V-R.
+    :param int|str package: If package is specified, only return tags associated with the
+                            specified package. Package can be either an integer ID or a
+                            string name.
 
-    If perms is True, each map will also contain:
-      - perm_id
-      - perm
+                            In this case resulting map will have additional keys:
+                              - owner_id
+                              - owner_name
+                              - blocked
+                              - extra_arches
+    :param bool perms: If perms is True, perm_id and perm is added to resulting maps.
+    :param pattern: If glob pattern is specified, only return tags matching that pattern.
+
+    :returns list of dicts: Each map contains id, name, arches and locked keys and
+                            additional keys as specified via package or perms options.
     """
     if build is not None and package is not None:
         raise koji.GenericError('only one of build and package may be specified')
@@ -1292,6 +1291,11 @@ def list_tags(build=None, package=None, perms=True, queryOpts=None):
                      "   tag_package_owners.active IS TRUE")
         joins.append('users ON tag_package_owners.owner = users.id')
         packageID = packageinfo['id']
+    if pattern is not None:
+        # copied from _prepareSearchTerms / glob
+        pattern = pattern.replace(
+            '\\', '\\\\').replace('_', r'\_').replace('?', '_').replace('*', '%')
+        clauses.append('tag.name ILIKE %(pattern)s')
 
     query = QueryProcessor(columns=fields, aliases=aliases, tables=tables,
                            joins=joins, clauses=clauses, values=locals(),