Merge pull request #833 from signal18/utils

Update metadata table, add time lock ms and table catalog
signal18 · Sep 5, 2024 · 4495117 · 4495117
2 parents 67f5327 + 57a6f68
commit 4495117
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/share/dashboard/app/dashboard.html b/share/dashboard/app/dashboard.html
@@ -73,7 +73,7 @@
                 <md-tab ng-if="selectedServer && !selectedQuery" ng-click="onTabClicked('ServiceOpenSVC')" md-select-id="ServiceOpenSVC" md-on-select="onTabSelected" label="Service OpenSVC">
                     <div ng-if="selectedTab=='ServiceOpenSVC'" ng-include src="'static/tab-server-serviceopensvc.html'"></div>
                 </md-tab>
-                <md-tab ng-if="selectedServer && !selectedQuery && selectedCluster.apiUsers[user].grants['db-show-logs']==true" ng-click="onTabClicked('MetaDataLocks')" md-select-id="MetaDataLocks" md-on-select="onTabSelected" label="Metatata Locks">
+                <md-tab ng-if="selectedServer && !selectedQuery && selectedCluster.apiUsers[user].grants['db-show-logs']==true" ng-click="onTabClicked('MetaDataLocks')" md-select-id="MetaDataLocks" md-on-select="onTabSelected" label="Metadata Locks">
                     <div ng-if="selectedTab=='MetaDataLocks'" ng-include src="'static/tab-server-meta-data-locks.html'"></div>
                 </md-tab>
                 <md-tab ng-if="selectedServer && !selectedQuery && selectedCluster.apiUsers[user].grants['db-show-logs']==true" ng-click="onTabClicked('QueryResponseTime')" md-select-id="QueryResponseTime" md-on-select="onTabSelected" label="Response Time">

diff --git a/share/dashboard/app/dashboard.js b/share/dashboard/app/dashboard.js
@@ -918,27 +918,37 @@ app.controller('DashboardController', function (
             align: 'left',
             valign: 'bottom',
             sortable: true,
-            width: "15%"
           }, {
             field: 'lockMode.String',
-            title: 'Schema',
+            title: 'Lock Mode',
             align: 'left',
             valign: 'bottom',
             sortable: true,
-            width: "20%"
           }, {
             field: 'lockDuration.String',
             title: 'Duration',
             align: 'left',
             valign: 'bottom',
             sortable: true,
+          }, {
+            field: 'lockTimeMs.Int64',
+            title: 'Lock Time (ms)',
+            align: 'left',
+            valign: 'bottom',
+            sortable: true,
             width: "15%"
           }, {
             field: 'lockType.String',
             title: 'Lock Type',
             align: 'left',
             valign: 'bottom',
             sortable: true
+          }, {
+            field: 'lockCatalog.String',
+            title: 'Catalog',
+            align: 'left',
+            valign: 'bottom',
+            sortable: true
           }, {
             field: 'lockSchema.String',
             title: 'Schema',

diff --git a/utils/dbhelper/dbhelper.go b/utils/dbhelper/dbhelper.go
@@ -56,7 +56,9 @@ type MetaDataLock struct {
 	Thread_id     uint64         `json:"threadId" db:"THREAD_ID"`
 	Lock_mode     sql.NullString `json:"lockMode" db:"LOCK_MODE"`
 	Lock_duration sql.NullString `json:"lockDuration" db:"LOCK_DURATION"`
+	Lock_time_ms  sql.NullInt64  `json:"lockTimeMs" db:"LOCK_TIME_MS"`
 	Lock_type     sql.NullString `json:"lockType" db:"LOCK_TYPE"`
+	Lock_catalog  sql.NullString `json:"lockCatalog" db:"TABLE_CATALOG"`
 	Lock_schema   sql.NullString `json:"lockSchema" db:"TABLE_SCHEMA"`
 	Lock_name     sql.NullString `json:"lockName" db:"TABLE_NAME"`
 }