fix: queue client && inmemory repository

This commit is contained in:
2024-03-11 23:15:10 +07:00
parent 198452d357
commit d72d069309
3 changed files with 51 additions and 35 deletions

View File

@@ -1,4 +1,3 @@
using System.Collections.Concurrent;
using System.Data;
using InServiceQue.Core.Models;
using InServiceQue.Core.Repositories;
@@ -7,9 +6,9 @@ namespace InServiceQue.InMemory;
public class TaskRepositoryInMemory: ITaskRepository
{
//todo: concurrent access here
private static object _lockObject = new();
private static int _currentShard;
private static ConcurrentDictionary<string, ConcurrentQueue<QueueTask>> _quesByType = new();
private static Dictionary<string, Queue<QueueTask>> _quesByType = new();
public void Dispose()
{
// TODO release managed resources here
@@ -17,22 +16,22 @@ public class TaskRepositoryInMemory: ITaskRepository
public void Insert(QueueTask task)
{
if (_quesByType.ContainsKey(task.TaskType))
lock (_lockObject)
{
_quesByType.AddOrUpdate(task.TaskType,
(t) => new ConcurrentQueue<QueueTask>(new[] { task }),
(t, queue) =>
{
queue.Enqueue(task);
return queue;
}
);
if (_quesByType.ContainsKey(task.TaskType))
{
_quesByType[task.TaskType].Enqueue(task);
}
else
{
_quesByType.Add(task.TaskType, new Queue<QueueTask>(new []{task}));
}
}
}
public async Task InsertAsync(QueueTask task)
{
Insert(task);
await Task.CompletedTask;
}
@@ -84,26 +83,27 @@ public class TaskRepositoryInMemory: ITaskRepository
public QueueTask? GetNextTaskRolling()
{
QueueTask? task = null;
var topicsCount = _quesByType.Count;
for (int i = 0; i < topicsCount; i++)
lock (_lockObject)
{
//todo: concurrent access
if (i == _currentShard)
var topicsCount = _quesByType.Count;
for (int i = 0; i < topicsCount; i++)
{
var keyValuePair = _quesByType.ToArray()[i];
var que = keyValuePair.Value;
que.TryDequeue(out task);
if (que.IsEmpty)
if (i == _currentShard)
{
_quesByType.TryRemove(keyValuePair);
}
var keyValuePair = _quesByType.ToArray()[i];
var que = keyValuePair.Value;
task = que.Dequeue();
break;
if (!que.Any())
{
_quesByType.Remove(keyValuePair.Key);
}
break;
}
}
_currentShard = _currentShard == topicsCount - 1 ? 0 : _currentShard + 1;
}
//todo: concurrent access
_currentShard = _currentShard == topicsCount - 1 ? 0 : _currentShard + 1;
return task;
}
@@ -116,11 +116,15 @@ public class TaskRepositoryInMemory: ITaskRepository
return await Task.FromResult(GetNextTaskRolling());
QueueTask? task = null;
if (_quesByType.TryGetValue(taskType, out var que))
lock (_lockObject)
{
que.TryDequeue(out task);
if (_quesByType.TryGetValue(taskType, out var que))
{
que.TryDequeue(out task);
}
}
return await Task.FromResult(task);
}