ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

3702 Changed CancelQuery to use ExecuteControlCommand instead of ExecuteQuery in KustoDataSource. Fixed runtime error in NodePathGenerator for loading TreeNodeDefinition.xml (#1069)

Browse Source
This commit is contained in:
Justin M
2020-09-08 14:05:45 -07:00
committed by GitHub
parent cd1e4f5ec5
commit f0ec7e14d4
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
View File

@@ -239,14 +239,8 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
private void CancelQuery(string clientRequestId) private void CancelQuery(string clientRequestId)
{ {
var query = ".cancel query " + clientRequestId; var query = $".cancel query \"{clientRequestId}\"";
CancellationTokenSource source = new CancellationTokenSource(); ExecuteControlCommand(query);
CancellationToken token = source.Token;
using (var reader = ExecuteQuery(query, token))
{
// No-op
}
} }
/// <inheritdoc/> /// <inheritdoc/>

2
src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/DataSourceModel/NodePathGenerator.cs
View File

@@ -24,7 +24,7 @@ namespace Microsoft.Kusto.ServiceLayer.ObjectExplorer.DataSourceModel
} }
var assembly = typeof(ObjectExplorerService).Assembly; var assembly = typeof(ObjectExplorerService).Assembly;
var resource = assembly.GetManifestResourceStream("Microsoft.Kusto.ServiceLayer.ObjectExplorer.SmoModel.TreeNodeDefinition.xml"); var resource = assembly.GetManifestResourceStream("Microsoft.Kusto.ServiceLayer.ObjectExplorer.DataSourceModel.TreeNodeDefinition.xml");
var serializer = new XmlSerializer(typeof(ServerExplorerTree)); var serializer = new XmlSerializer(typeof(ServerExplorerTree));
NodeTypeDictionary = new Dictionary<string, HashSet<Node>>(); NodeTypeDictionary = new Dictionary<string, HashSet<Node>>();
using (var reader = new StreamReader(resource)) using (var reader = new StreamReader(resource))