From 0cebf28f2d2b606ed1359f6d6ded821eb3201412 Mon Sep 17 00:00:00 2001
From: Valerii Sidorenko <balepas@nebius.com>
Date: Fri, 9 Feb 2024 13:00:16 +0000
Subject: [PATCH 1/2] feat: add Duration column to TopQueries

Closes #609
---
 .../Diagnostics/TopQueries/getTopQueriesColumns.tsx    | 10 ++++++++++
 .../reducers/executeTopQueries/executeTopQueries.ts    |  3 ++-
 src/utils/diagnostics.ts                               |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx b/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
index 64b8386c8d..6b102766a3 100644
--- a/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
+++ b/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
@@ -24,6 +24,7 @@ const TOP_QUERIES_COLUMNS_IDS = {
     UserSID: 'UserSID',
     OneLineQueryText: 'OneLineQueryText',
     QueryHash: 'QueryHash',
+    Duration: 'Duration',
 };
 
 const cpuTimeUsColumn: Column<KeyValueRow> = {
@@ -86,6 +87,14 @@ const queryHashColumn: Column<KeyValueRow> = {
     sortable: false,
 };
 
+const durationColumn: Column<KeyValueRow> = {
+    name: TOP_QUERIES_COLUMNS_IDS.Duration,
+    header: 'Duration, ms',
+    render: ({row}) => formatNumber(row.Duration),
+    sortAccessor: (row) => Number(row.Duration),
+    align: DataTable.RIGHT,
+};
+
 export const getTopQueriesColumns = (): Column<KeyValueRow>[] => {
     return [
         cpuTimeUsColumn,
@@ -94,6 +103,7 @@ export const getTopQueriesColumns = (): Column<KeyValueRow>[] => {
         readRowsColumn,
         readBytesColumn,
         userSIDColumn,
+        durationColumn,
     ];
 };
 
diff --git a/src/store/reducers/executeTopQueries/executeTopQueries.ts b/src/store/reducers/executeTopQueries/executeTopQueries.ts
index c948a2f089..9fb9731672 100644
--- a/src/store/reducers/executeTopQueries/executeTopQueries.ts
+++ b/src/store/reducers/executeTopQueries/executeTopQueries.ts
@@ -29,7 +29,8 @@ SELECT
     EndTime,
     ReadRows,
     ReadBytes,
-    UserSID
+    UserSID,
+    Duration
 FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
 WHERE ${filterConditions || 'true'}
 `;
diff --git a/src/utils/diagnostics.ts b/src/utils/diagnostics.ts
index 44e854ce80..7c8a2d1e4d 100644
--- a/src/utils/diagnostics.ts
+++ b/src/utils/diagnostics.ts
@@ -12,6 +12,7 @@ const TOP_QUERIES_SORT_VALUES = {
     ReadRows: 'ReadRows',
     ReadBytes: 'ReadBytes',
     UserSID: 'UserSID',
+    Duration: 'Duration',
 } as const;
 
 type TopShardsSortValue = ValueOf<typeof TOP_SHARDS_SORT_VALUES>;

From 6ee7d2c534db9b336ca7215dc9a7429843730d9d Mon Sep 17 00:00:00 2001
From: Valerii Sidorenko <balepas@nebius.com>
Date: Tue, 13 Feb 2024 23:32:50 +0100
Subject: [PATCH 2/2] fix: move the duration column next to end time column

---
 .../Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx b/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
index 6b102766a3..fe62ba81f2 100644
--- a/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
+++ b/src/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.tsx
@@ -100,10 +100,10 @@ export const getTopQueriesColumns = (): Column<KeyValueRow>[] => {
         cpuTimeUsColumn,
         queryTextColumn,
         endTimeColumn,
+        durationColumn,
         readRowsColumn,
         readBytesColumn,
         userSIDColumn,
-        durationColumn,
     ];
 };