order count query, task updates

gencebay · gencebay · commit 7865e95628b9 · 2018-04-13T18:01:23.000+03:00
diff --git a/src/DataTransform.Api.Hosting/Controllers/TransformController.cs b/src/DataTransform.Api.Hosting/Controllers/TransformController.cs
@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+using NetCoreStack.WebSockets;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,10 +15,12 @@ namespace DataTransform.Api.Hosting.Controllers
     public class TransformController : Controller
     {
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IConnectionManager _connectionManager;
 
-        public TransformController(IHostingEnvironment hostingEnvironment)
+        public TransformController(IHostingEnvironment hostingEnvironment, IConnectionManager connectionManager)
         {
             _hostingEnvironment = hostingEnvironment;
+            _connectionManager = connectionManager;
         }
 
         [HttpGet(nameof(FileTree))]
@@ -38,13 +42,20 @@ public IActionResult FileTree()
         }
         
         [HttpGet(nameof(GetContent))]
-        public IActionResult GetContent([FromQuery] string filename)
+        public async Task<IActionResult> GetContent([FromQuery] string filename)
         {
             var filePath = Path.Combine(_hostingEnvironment.WebRootPath, "configs", filename);
             if (System.IO.File.Exists(filePath))
             {
-                var content = System.IO.File.ReadAllText(filePath);
-                return Json(new { data = content });
+                try
+                {
+                    var content = System.IO.File.ReadAllText(filePath);
+                    return Json(new { data = content });
+                }
+                catch (Exception ex)
+                {
+                    await _connectionManager.WsErrorLog(ex);
+                }
             }
 
             return NotFound();            
diff --git a/src/DataTransform.Api.Hosting/Core/DbTransformTask.cs b/src/DataTransform.Api.Hosting/Core/DbTransformTask.cs
@@ -53,7 +53,9 @@ private async Task<int> TokenizeLoopAsync(DbTransformContext context)
 
                 await _connectionManager.WsLogAsync($"SQL Table: {context.TableName} counts: {context.Count} record(s) processing...");
 
-                var predicateSql = $"SELECT TOP {take} {context.FieldPattern} FROM {context.TableName} WHERE {identityColumnName} > {indexId}";
+                var predicateSql = $"SELECT TOP {take} {context.FieldPattern} FROM {context.TableName} " +
+                    $"WHERE {identityColumnName} > {indexId} ORDER BY {identityColumnName} ASC";
+
                 List<dynamic> sqlItems = new List<dynamic>();
                 using (var connection = _sourceSqlDatabase.CreateConnection())
                 {
diff --git a/src/DataTransform.Api.Hosting/Extensions/TransformQueryExtensions.cs b/src/DataTransform.Api.Hosting/Extensions/TransformQueryExtensions.cs
@@ -21,7 +21,7 @@ public static string CreateSqlScript(this TransformDescriptor descriptor, out st
 
         public static string CreateCountScript(this TransformDescriptor descriptor)
         {
-            return string.Format("SELECT COUNT(*) FROM {0}", descriptor.TableName);
+            return string.Format("SELECT COUNT(*) FROM {0} WHERE {1} > 0", descriptor.TableName, descriptor.IdentityColumnName);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ private async Task<int> TokenizeLoopAsync(DbTransformContext context)`
`53`	`53`
`54`	`54`	`await _connectionManager.WsLogAsync($"SQL Table: {context.TableName} counts: {context.Count} record(s) processing...");`
`55`	`55`
`56`		`- var predicateSql = $"SELECT TOP {take} {context.FieldPattern} FROM {context.TableName} WHERE {identityColumnName} > {indexId}";`
	`56`	`+ var predicateSql = $"SELECT TOP {take} {context.FieldPattern} FROM {context.TableName} " +`
	`57`	`+ $"WHERE {identityColumnName} > {indexId} ORDER BY {identityColumnName} ASC";`
	`58`	`+`
`57`	`59`	`List<dynamic> sqlItems = new List<dynamic>();`
`58`	`60`	`using (var connection = _sourceSqlDatabase.CreateConnection())`
`59`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static string CreateSqlScript(this TransformDescriptor descriptor, out st`
`21`	`21`
`22`	`22`	`public static string CreateCountScript(this TransformDescriptor descriptor)`
`23`	`23`	`{`
`24`		`- return string.Format("SELECT COUNT(*) FROM {0}", descriptor.TableName);`
	`24`	`+ return string.Format("SELECT COUNT(*) FROM {0} WHERE {1} > 0", descriptor.TableName, descriptor.IdentityColumnName);`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`