From 1c83aa61d7e8a7bc64f7ea0799bae7eca00f3ec8 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 4 Mar 2022 13:10:35 -0800 Subject: [PATCH] Fix error displayed when insights files can't be found and fix server-report insights in dev build (#18635) * Fix error * fix queries --- extensions/server-report/package.json | 22 +++++++++---------- .../{src => }/sql/all_db_space_used.sql | 0 .../{src => }/sql/allocationContention.sql | 0 .../{src => }/sql/backup_detail.sql | 0 .../{src => }/sql/backup_insight.sql | 0 .../{src => }/sql/backup_size_trend.sql | 0 .../server-report/{src => }/sql/cpumetric.sql | 0 .../server-report/{src => }/sql/db_size.sql | 0 .../{src => }/sql/memorybydb.sql | 0 .../{src => }/sql/metadataContention.sql | 0 .../{src => }/sql/startEvent.sql | 0 .../server-report/{src => }/sql/stopEvent.sql | 0 .../{src => }/sql/typeofContentions.sql | 0 .../{src => }/sql/wait_resources.sql | 0 .../sql/waits_detail_paul_randal.sql | 0 .../{src => }/sql/waits_paul_randal.sql | 0 .../services/insights/common/insightsUtils.ts | 2 +- 17 files changed, 12 insertions(+), 12 deletions(-) rename extensions/server-report/{src => }/sql/all_db_space_used.sql (100%) rename extensions/server-report/{src => }/sql/allocationContention.sql (100%) rename extensions/server-report/{src => }/sql/backup_detail.sql (100%) rename extensions/server-report/{src => }/sql/backup_insight.sql (100%) rename extensions/server-report/{src => }/sql/backup_size_trend.sql (100%) rename extensions/server-report/{src => }/sql/cpumetric.sql (100%) rename extensions/server-report/{src => }/sql/db_size.sql (100%) rename extensions/server-report/{src => }/sql/memorybydb.sql (100%) rename extensions/server-report/{src => }/sql/metadataContention.sql (100%) rename extensions/server-report/{src => }/sql/startEvent.sql (100%) rename extensions/server-report/{src => }/sql/stopEvent.sql (100%) rename extensions/server-report/{src => }/sql/typeofContentions.sql (100%) rename extensions/server-report/{src => }/sql/wait_resources.sql (100%) rename extensions/server-report/{src => }/sql/waits_detail_paul_randal.sql (100%) rename extensions/server-report/{src => }/sql/waits_paul_randal.sql (100%) diff --git a/extensions/server-report/package.json b/extensions/server-report/package.json index 9fd7d19f5b..15ed126156 100644 --- a/extensions/server-report/package.json +++ b/extensions/server-report/package.json @@ -125,7 +125,7 @@ "columnsAsLabels": true } }, - "queryFile": "./dist/sql/all_db_space_used.sql" + "queryFile": "./sql/all_db_space_used.sql" } }, { @@ -140,7 +140,7 @@ "columnsAsLabels": false } }, - "queryFile": "./dist/sql/cpumetric.sql" + "queryFile": "./sql/cpumetric.sql" } }, { @@ -156,7 +156,7 @@ "columnsAsLabels": false } }, - "queryFile": "./dist/sql/backup_size_trend.sql" + "queryFile": "./sql/backup_size_trend.sql" } }, { @@ -171,9 +171,9 @@ "columnsAsLabels": true } }, - "queryFile": "./dist/sql/waits_paul_randal.sql", + "queryFile": "./sql/waits_paul_randal.sql", "details": { - "queryFile": "./dist/sql/waits_detail_paul_randal.sql", + "queryFile": "./sql/waits_detail_paul_randal.sql", "label": { "column": "WaitType", "state": [] @@ -194,9 +194,9 @@ "columnsAsLabels": true } }, - "queryFile": "./dist/sql/wait_resources.sql", + "queryFile": "./sql/wait_resources.sql", "details": { - "queryFile": "./dist/sql/wait_resources.sql", + "queryFile": "./sql/wait_resources.sql", "label": { "column": "WaitType", "state": [] @@ -217,7 +217,7 @@ "columnsAsLabels": true } }, - "queryFile": "./dist/sql/memorybydb.sql" + "queryFile": "./sql/memorybydb.sql" } }, { @@ -231,7 +231,7 @@ "legendPosition": "none" } }, - "queryFile": "./dist/sql/typeofContentions.sql", + "queryFile": "./sql/typeofContentions.sql", "autoRefreshInterval": 0.05 } }, @@ -247,7 +247,7 @@ "xAxisLabel": "Object Ids for System Tables" } }, - "queryFile": "./dist/sql/metadataContention.sql", + "queryFile": "./sql/metadataContention.sql", "autoRefreshInterval": 0.05 } }, @@ -263,7 +263,7 @@ "xAxisLabel": "Page Types" } }, - "queryFile": "./dist/sql/allocationContention.sql", + "queryFile": "./sql/allocationContention.sql", "autoRefreshInterval": 0.05 } } diff --git a/extensions/server-report/src/sql/all_db_space_used.sql b/extensions/server-report/sql/all_db_space_used.sql similarity index 100% rename from extensions/server-report/src/sql/all_db_space_used.sql rename to extensions/server-report/sql/all_db_space_used.sql diff --git a/extensions/server-report/src/sql/allocationContention.sql b/extensions/server-report/sql/allocationContention.sql similarity index 100% rename from extensions/server-report/src/sql/allocationContention.sql rename to extensions/server-report/sql/allocationContention.sql diff --git a/extensions/server-report/src/sql/backup_detail.sql b/extensions/server-report/sql/backup_detail.sql similarity index 100% rename from extensions/server-report/src/sql/backup_detail.sql rename to extensions/server-report/sql/backup_detail.sql diff --git a/extensions/server-report/src/sql/backup_insight.sql b/extensions/server-report/sql/backup_insight.sql similarity index 100% rename from extensions/server-report/src/sql/backup_insight.sql rename to extensions/server-report/sql/backup_insight.sql diff --git a/extensions/server-report/src/sql/backup_size_trend.sql b/extensions/server-report/sql/backup_size_trend.sql similarity index 100% rename from extensions/server-report/src/sql/backup_size_trend.sql rename to extensions/server-report/sql/backup_size_trend.sql diff --git a/extensions/server-report/src/sql/cpumetric.sql b/extensions/server-report/sql/cpumetric.sql similarity index 100% rename from extensions/server-report/src/sql/cpumetric.sql rename to extensions/server-report/sql/cpumetric.sql diff --git a/extensions/server-report/src/sql/db_size.sql b/extensions/server-report/sql/db_size.sql similarity index 100% rename from extensions/server-report/src/sql/db_size.sql rename to extensions/server-report/sql/db_size.sql diff --git a/extensions/server-report/src/sql/memorybydb.sql b/extensions/server-report/sql/memorybydb.sql similarity index 100% rename from extensions/server-report/src/sql/memorybydb.sql rename to extensions/server-report/sql/memorybydb.sql diff --git a/extensions/server-report/src/sql/metadataContention.sql b/extensions/server-report/sql/metadataContention.sql similarity index 100% rename from extensions/server-report/src/sql/metadataContention.sql rename to extensions/server-report/sql/metadataContention.sql diff --git a/extensions/server-report/src/sql/startEvent.sql b/extensions/server-report/sql/startEvent.sql similarity index 100% rename from extensions/server-report/src/sql/startEvent.sql rename to extensions/server-report/sql/startEvent.sql diff --git a/extensions/server-report/src/sql/stopEvent.sql b/extensions/server-report/sql/stopEvent.sql similarity index 100% rename from extensions/server-report/src/sql/stopEvent.sql rename to extensions/server-report/sql/stopEvent.sql diff --git a/extensions/server-report/src/sql/typeofContentions.sql b/extensions/server-report/sql/typeofContentions.sql similarity index 100% rename from extensions/server-report/src/sql/typeofContentions.sql rename to extensions/server-report/sql/typeofContentions.sql diff --git a/extensions/server-report/src/sql/wait_resources.sql b/extensions/server-report/sql/wait_resources.sql similarity index 100% rename from extensions/server-report/src/sql/wait_resources.sql rename to extensions/server-report/sql/wait_resources.sql diff --git a/extensions/server-report/src/sql/waits_detail_paul_randal.sql b/extensions/server-report/sql/waits_detail_paul_randal.sql similarity index 100% rename from extensions/server-report/src/sql/waits_detail_paul_randal.sql rename to extensions/server-report/sql/waits_detail_paul_randal.sql diff --git a/extensions/server-report/src/sql/waits_paul_randal.sql b/extensions/server-report/sql/waits_paul_randal.sql similarity index 100% rename from extensions/server-report/src/sql/waits_paul_randal.sql rename to extensions/server-report/sql/waits_paul_randal.sql diff --git a/src/sql/workbench/services/insights/common/insightsUtils.ts b/src/sql/workbench/services/insights/common/insightsUtils.ts index 4e9ad95cf2..6587e0d75a 100644 --- a/src/sql/workbench/services/insights/common/insightsUtils.ts +++ b/src/sql/workbench/services/insights/common/insightsUtils.ts @@ -56,5 +56,5 @@ export async function resolveQueryFilePath(services: ServicesAccessor, filePath? } } - throw Error(localize('insightsDidNotFindResolvedFile', "Could not find query file at any of the following paths :\n {0}", resolvedFileUriPromises.join('\n'))); + throw Error(localize('insightsDidNotFindResolvedFile', "Could not find query file at any of the following paths :\n {0}", resolvedFileUris.map(uri => uri.fsPath).join('\n'))); }