From 1124ccc4ee02e60980af19d525d5203dd6719a1d Mon Sep 17 00:00:00 2001
From: kushagra-apptware <81357546+kushagra-apptware@users.noreply.github.com>
Date: Tue, 19 Dec 2023 17:29:37 +0530
Subject: [PATCH 1/2] fix(ui/users): searching for users on Users page shows
 incorrect roles (#9474)

---
 datahub-web-react/src/app/identity/user/UserList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/identity/user/UserList.tsx b/datahub-web-react/src/app/identity/user/UserList.tsx
index dce3aa2c68a8dc..8e2bc21f0693f7 100644
--- a/datahub-web-react/src/app/identity/user/UserList.tsx
+++ b/datahub-web-react/src/app/identity/user/UserList.tsx
@@ -77,7 +77,7 @@ export const UserList = () => {
                 query: (query?.length && query) || undefined,
             },
         },
-        fetchPolicy: (query?.length || 0) > 0 ? 'no-cache' : 'cache-first',
+        fetchPolicy: 'no-cache',
     });
 
     const totalUsers = usersData?.listUsers?.total || 0;

From 94a1603676b6a0fb9e2129b416caf39b100f6d0f Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Tue, 19 Dec 2023 16:30:21 +0100
Subject: [PATCH 2/2] fix(ingest/redshift: Fixing operation query to not return
 duplicate operations (#9481)

---
 .../ingestion/source/redshift/usage.py        | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
index 409027a8805a0d..e40406b994c9b2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
@@ -85,15 +85,18 @@
       sq.endtime AS endtime,
       'insert' AS operation_type
     FROM
-      stl_insert si
+      (select userid, query, sum(rows) as rows, tbl
+        from stl_insert si
+        where si.rows > 0
+        AND si.starttime >= '{start_time}'
+        AND si.starttime < '{end_time}'
+        group by userid, query, tbl
+      ) as si
       JOIN svv_table_info sti ON si.tbl = sti.table_id
       JOIN stl_query sq ON si.query = sq.query
       JOIN svl_user_info sui ON sq.userid = sui.usesysid
     WHERE
-      si.starttime >= '{start_time}'
-      AND si.starttime < '{end_time}'
-      AND si.rows > 0
-      AND sq.aborted = 0)
+      sq.aborted = 0)
 UNION
   (SELECT
       DISTINCT sd.userid AS userid,
@@ -109,15 +112,18 @@
       sq.endtime AS endtime,
       'delete' AS operation_type
     FROM
-      stl_delete sd
+      (select userid, query, sum(rows) as rows, tbl
+        from stl_delete sd
+        where sd.rows > 0
+        AND sd.starttime >= '{start_time}'
+        AND sd.starttime < '{end_time}'
+        group by userid, query, tbl
+      ) as sd
       JOIN svv_table_info sti ON sd.tbl = sti.table_id
       JOIN stl_query sq ON sd.query = sq.query
       JOIN svl_user_info sui ON sq.userid = sui.usesysid
     WHERE
-      sd.starttime >= '{start_time}'
-      AND sd.starttime < '{end_time}'
-      AND sd.rows > 0
-      AND sq.aborted = 0)
+      sq.aborted = 0)
 ORDER BY
   endtime DESC
 """.strip()