MySqlConnection 1 + Dapper 2

CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.0 (2021/05/07)
+* CHANGED: upgraded MySqlConnector to v1
+* CHANGED: upgraded Dapper to v2
+
 ## 0.0.20 (2021/04/27)
 * CHANGED: keep completed and failed jobs (for a period of time)
 * ADDED: pruning archived (completed and failed) jobs

Common.targets

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Version>0.0.20</Version>
-    <AssemblyVersion>0.0.20</AssemblyVersion>
-    <FileVersion>0.0.20</FileVersion>
+    <Version>0.1.0</Version>
+    <AssemblyVersion>0.1.0</AssemblyVersion>
+    <FileVersion>0.1.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Χρόνος -->

paket.dependencies

@@ -12,12 +12,12 @@ nuget System.Interactive
 nuget K4os.Async.Batch
 nuget K4os.Quarterback
 
-nuget MySqlConnector 0.56.0
+nuget MySqlConnector ~> 1
 nuget Npgsql ~> 4
 nuget Microsoft.Data.Sqlite ~> 3
 nuget System.Data.SqlClient ~> 4
 
-nuget Dapper ~> 1
+nuget Dapper ~> 2
 nuget Polly ~> 7
 nuget Newtonsoft.Json ~> 10
 nuget MediatR ~> 8

src/K4os.Shared/Extensions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedType.Global

src/K4os.Xpovoc.Core/Db/DbJobScheduler.cs

@@ -10,8 +10,6 @@ namespace K4os.Xpovoc.Core.Db
 {
 	public class DbJobScheduler: IJobScheduler
 	{
-		private static readonly TimeSpan VeryLongTime = TimeSpan.FromDays(5*365);
-
 		private readonly ILoggerFactory _loggerFactory;
 		private readonly IDateTimeSource _dateTimeSource;
 		private readonly IDbJobStorage _jobStorage;

src/K4os.Xpovoc.Core/Sql/AnySqlMigrator.cs

@@ -7,7 +7,7 @@ namespace K4os.Xpovoc.Core.Sql
 {
 	public abstract class AnySqlMigrator
 	{
-		private string _productId;
+		private readonly string _productId;
 		private readonly IDbConnection _connection;
 		private readonly Migration[] _migrations;
 
@@ -50,12 +50,10 @@ private void ApplyMigration(IDbConnection connection, string id, string script)
 		{
 			// NOTE: Some operations cannot be executed in transactions (create table?)
 			// we will need some mechanism to handle that if we need it
-			using (var transaction = connection.BeginTransaction())
-			{
-				ExecuteScript(connection, transaction, script);
-				MarkMigrationDone(connection, transaction, id);
-				transaction.Commit();
-			}
+			using var transaction = connection.BeginTransaction();
+			ExecuteScript(connection, transaction, script);
+			MarkMigrationDone(connection, transaction, id);
+			transaction.Commit();
 		}
 
 		protected abstract void ExecuteScript(

src/K4os.Xpovoc.Core/Sql/DefaultJobSerializer.cs

@@ -13,21 +13,17 @@ protected virtual BinaryFormatter CreateFormatter() =>
 		public string Serialize(object job)
 		{
 			var formatter = CreateFormatter();
-			using (var stream = new MemoryStream())
-			{
-				formatter.Serialize(stream, job);
-				stream.Flush();
-				return Convert.ToBase64String(stream.ToArray());
-			}
+			using var stream = new MemoryStream();
+			formatter.Serialize(stream, job);
+			stream.Flush();
+			return Convert.ToBase64String(stream.ToArray());
 		}
 
 		public object Deserialize(string payload)
 		{
 			var formatter = CreateFormatter();
-			using (var stream = new MemoryStream(Convert.FromBase64String(payload)))
-			{
-				return formatter.Deserialize(stream);
-			}
+			using var stream = new MemoryStream(Convert.FromBase64String(payload));
+			return formatter.Deserialize(stream);
 		}
 	}
 }

src/K4os.Xpovoc.Db.Test/Integrations/MsSqlStorageTest.cs

@@ -1,9 +1,7 @@
 using System.Data.SqlClient;
-using System.Threading.Tasks;
 using Dapper;
 using K4os.Xpovoc.Core.Db;
 using K4os.Xpovoc.MsSql;
-using Xunit;
 
 namespace K4os.Xpovoc.Db.Test.Integrations
 {

src/K4os.Xpovoc.Db.Test/Integrations/MySqlStorageTest.cs

@@ -1,9 +1,7 @@
-using System.Threading.Tasks;
 using Dapper;
 using K4os.Xpovoc.Core.Db;
 using K4os.Xpovoc.MySql;
-using MySql.Data.MySqlClient;
-using Xunit;
+using MySqlConnector;
 
 namespace K4os.Xpovoc.Db.Test.Integrations
 {

src/K4os.Xpovoc.Db.Test/Integrations/PgSqlStorageTest.cs

@@ -1,9 +1,7 @@
-using System.Threading.Tasks;
 using Dapper;
 using K4os.Xpovoc.Core.Db;
 using K4os.Xpovoc.PgSql;
 using Npgsql;
-using Xunit;
 
 namespace K4os.Xpovoc.Db.Test.Integrations
 {

src/K4os.Xpovoc.MySql/MySqlExecutionPolicy.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using Polly;
 
 namespace K4os.Xpovoc.MySql

src/K4os.Xpovoc.MySql/MySqlJobStorage.cs

@@ -7,7 +7,7 @@
 using K4os.Xpovoc.Abstractions;
 using K4os.Xpovoc.Core.Sql;
 using K4os.Xpovoc.MySql.Resources;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 namespace K4os.Xpovoc.MySql
 {

src/Playground/Program.cs

@@ -123,15 +123,15 @@ private static async Task Execute(
 			var scheduler = new DbJobScheduler(null, mysqlStorage, handler, schedulerConfig);
 			// var scheduler = new RxJobScheduler(loggerFactory, handler, Scheduler.Default);
 
-			var producer = Task.CompletedTask;
-			var producerSpeed = Task.CompletedTask;
-			// var producer = Task.Run(() => Producer(token, scheduler), token);
-			// var producerSpeed = Task.Run(
-			// 	() => Measure(
-			// 		token,
-			// 		loggerFactory,
-			// 		"Produced",
-			// 		() => Volatile.Read(ref _producedCount)));
+			// var producer = Task.CompletedTask;
+			// var producerSpeed = Task.CompletedTask;
+			var producer = Task.Run(() => Producer(token, scheduler), token);
+			var producerSpeed = Task.Run(
+				() => Measure(
+					token,
+					loggerFactory,
+					"Produced",
+					() => Volatile.Read(ref _producedCount)));
 
 			var consumedSpeed = Task.Run(
 				() => Measure(