fixes

Author: KirillKurdyukov

slo/src/AdoNet/SloTableContext.cs

@@ -109,7 +109,7 @@ PRIMARY KEY (Guid, Id)
     }
 
     protected override async Task<(int, StatusCode, object?)> Select(
-        dynamic select,
+        (Guid Guid, int Id) select,
         int readTimeout,
         Counter? errorsTotal = null
     )
@@ -146,10 +146,10 @@ PRIMARY KEY (Guid, Id)
         return (attempts, ((YdbException)policyResult.FinalException)?.Code ?? StatusCode.Success, policyResult.Result);
     }
 
-    protected override async Task<int> SelectCount(string sql)
+    protected override async Task<int> SelectCount()
     {
         await using var ydbConnection = await client.OpenConnectionAsync();
 
-        return (int)(await new YdbCommand(ydbConnection) { CommandText = sql }.ExecuteScalarAsync())!;
+        return (int)(await new YdbCommand(ydbConnection) { CommandText = $"SELECT MAX(Id) FROM {SloTable.Name}" }.ExecuteScalarAsync())!;
     }
 }

slo/src/EF/Program.cs

@@ -18,7 +18,6 @@ await Cli.Run((mode, config) =>
         CliMode.Run => new SloTableContext(new PooledDbContextFactory<TableDbContext>(
             new DbContextOptionsBuilder<TableDbContext>()
                 .UseYdb(config.ConnectionString)
-                .UseLoggerFactory(ISloContext.Factory)
                 .Options)),
         _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null)
     };

slo/src/EF/SloTableContext.cs

@@ -32,7 +32,7 @@ int operationTimeout
     }
 
     protected override async Task<(int, StatusCode, object?)> Select(
-        dynamic select,
+        (Guid Guid, int Id) select,
         int readTimeout,
         Counter? errorsTotal = null
     )
@@ -43,10 +43,10 @@ int operationTimeout
         return (0, StatusCode.Success, null);
     }
 
-    protected override async Task<int> SelectCount(string sql)
+    protected override async Task<int> SelectCount()
     {
         await using var dbContext = await client.CreateDbContextAsync();
 
-        return await dbContext.Database.SqlQueryRaw<int>($"SELECT COUNT(*) FROM {SloTable.Name}").SingleAsync();
+        return await dbContext.SloEntities.CountAsync();
     }
 }

slo/src/Internal/SloTableContext.cs

@@ -91,7 +91,7 @@ public async Task Run(RunConfig runConfig)
             intervalMilliseconds: runConfig.ReportPeriod);
         prometheus.Start();
 
-        _maxId = await SelectCount($"SELECT MAX(id) as max_id FROM `{SloTable.Name}`;");
+        _maxId = await SelectCount() + 1;
 
         Logger.LogInformation("Init row count: {MaxId}", _maxId);
 
@@ -110,7 +110,7 @@ public async Task Run(RunConfig runConfig)
         var writeTask = ShootingTask(writeLimiter, "write", Save);
         var readTask = ShootingTask(readLimiter, "read", Select);
 
-        Logger.LogInformation("Started write / read shooting..");
+        Logger.LogInformation("Started write / read shooting...");
 
         try
         {
@@ -210,25 +210,32 @@ Task ShootingTask(RateLimiter rateLimitPolicy, string operationType,
 
                     _ = Task.Run(async () =>
                     {
-                        pendingOperations.Inc();
-                        var sw = Stopwatch.StartNew();
-                        var (attempts, statusCode) = await action(runConfig, errorsTotal);
-                        sw.Stop();
-
-                        retryAttempts.Set(attempts);
-                        operationsTotal.Inc();
-                        pendingOperations.Dec();
-
-                        if (statusCode != StatusCode.Success)
+                        try
                         {
-                            errorsTotal.WithLabels(statusCode.StatusName()).Inc();
-                            operationsFailureTotal.Inc();
-                            operationLatencySeconds.WithLabels("err").Observe(sw.Elapsed.TotalSeconds);
+                            pendingOperations.Inc();
+                            var sw = Stopwatch.StartNew();
+                            var (attempts, statusCode) = await action(runConfig, errorsTotal);
+                            sw.Stop();
+
+                            retryAttempts.Set(attempts);
+                            operationsTotal.Inc();
+                            pendingOperations.Dec();
+
+                            if (statusCode != StatusCode.Success)
+                            {
+                                errorsTotal.WithLabels(statusCode.StatusName()).Inc();
+                                operationsFailureTotal.Inc();
+                                operationLatencySeconds.WithLabels("err").Observe(sw.Elapsed.TotalSeconds);
+                            }
+                            else
+                            {
+                                operationsSuccessTotal.Inc();
+                                operationLatencySeconds.WithLabels("success").Observe(sw.Elapsed.TotalSeconds);
+                            }
                         }
-                        else
+                        catch (Exception e)
                         {
-                            operationsSuccessTotal.Inc();
-                            operationLatencySeconds.WithLabels("success").Observe(sw.Elapsed.TotalSeconds);
+                            Console.WriteLine(e);
                         }
                     }, cancellationTokenSource.Token);
                 }
@@ -242,10 +249,10 @@ Task ShootingTask(RateLimiter rateLimitPolicy, string operationType,
     protected abstract Task<(int, StatusCode)> Save(SloTable sloTable, int writeTimeout,
         Counter? errorsTotal = null);
 
-    protected abstract Task<(int, StatusCode, object?)> Select(dynamic select, int readTimeout,
+    protected abstract Task<(int, StatusCode, object?)> Select((Guid Guid, int Id) select, int readTimeout,
         Counter? errorsTotal = null);
 
-    protected abstract Task<int> SelectCount(string sql);
+    protected abstract Task<int> SelectCount();
 
     private Task<(int, StatusCode)> Save(Config config, Counter? errorsTotal = null)
     {
@@ -271,7 +278,7 @@ Task ShootingTask(RateLimiter rateLimitPolicy, string operationType,
     {
         var id = Random.Shared.Next(_maxId);
         var (attempts, code, _) =
-            await Select(new { Guid = GuidFromInt(id), Id = id }, config.ReadTimeout, errorsTotal);
+            await Select(new ValueTuple<Guid, int>(GuidFromInt(id), id), config.ReadTimeout, errorsTotal);
 
         return (attempts, code);
     }