加入终止查询的方法

Author: maikebing

src/EFCore.Taos.Core/Maikebing.EntityFrameworkCore.Taos.csproj

@@ -25,13 +25,13 @@
     <Compile Include="..\Shared\*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>

src/Example/Example.csproj

@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="ConsoleTableExt" Version="3.1.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>

src/Maikebing.Data.Taos/Driver/TDengineDriver.cs

@@ -485,6 +485,9 @@ public static string Error(IntPtr conn)
         [DllImport("taos", EntryPoint = "taos_query", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr Query(IntPtr taos, string sqlstr);
 
+        [DllImport("taos", EntryPoint = "taos_stop_query", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void StopQuery(IntPtr taos);
+
         [DllImport("taos", EntryPoint = "taos_affected_rows", CallingConvention = CallingConvention.Cdecl)]
         public static extern int AffectRows(IntPtr res);
 

src/Maikebing.Data.Taos/TaosCommand.cs

@@ -357,8 +357,9 @@ public override void Prepare()
                     _endcommandtext = _commandText;
                 }
                 var code = Task.Run(() => TDengine.Query(_taos, _endcommandtext));
-              bool isok=  code.Wait(TimeSpan.FromSeconds(CommandTimeout));
-                if (isok &&  TDengine.ErrorNo(code.Result)==0)
+                bool isok = code.Wait(TimeSpan.FromSeconds(CommandTimeout));
+                TDengine.StopQuery(_taos);
+                if (isok && TDengine.ErrorNo(code.Result) == 0)
                 {
                     List<TDengineMeta> metas = TDengine.FetchFields(code.Result);
                     for (int j = 0; j < metas.Count; j++)

src/Maikebing.HealthChecks.Taos/Maikebing.HealthChecks.Taos.csproj

@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.7" />
   </ItemGroup>
 
   <ItemGroup>