ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-19 17:23:55 -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

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

@@ -228,7 +228,7 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
{
cancellationToken.Register(() => CancelQuery(clientRequestProperties.ClientRequestId));
}
IDataReader origReader = KustoQueryProvider.ExecuteQuery(
KustoQueryUtils.IsClusterLevelQuery(query) ? "" : databaseName,
query,
@@ -239,14 +239,8 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
private void CancelQuery(string clientRequestId)
{
var query = ".cancel query " + clientRequestId;
CancellationTokenSource source = new CancellationTokenSource();
CancellationToken token = source.Token;
using (var reader = ExecuteQuery(query, token))
{
// No-op
}
var query = $".cancel query \"{clientRequestId}\"";
ExecuteControlCommand(query);
}
/// <inheritdoc/>