Carael/message removal performance fix (#54)

* Messages removal performance fix * Moved down upload file limit to 200
Carael · Mar 13, 2024 · 10c920d · 10c920d
1 parent a4220f4
commit 10c920d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/Core/ServiceBus/MessageService.cs b/src/Core/ServiceBus/MessageService.cs
@@ -3,6 +3,7 @@
 using CrossBusExplorer.ServiceBus.Contracts;
 using CrossBusExplorer.ServiceBus.Contracts.Types;
 using CrossBusExplorer.ServiceBus.Mappings;
+using Microsoft.Azure.Amqp.Serialization;
 using SubQueue = CrossBusExplorer.ServiceBus.Contracts.Types.SubQueue;
 namespace CrossBusExplorer.ServiceBus;
 
@@ -180,18 +181,32 @@ public async Task<Result> DeleteMessage(
 
         try
         {
-            await foreach (var message in receiver.ReceiveMessagesAsync(cancellationToken))
+            var messagesToUnlock = new List<ServiceBusReceivedMessage>();
+
+            await foreach (ServiceBusReceivedMessage message in receiver.ReceiveMessagesAsync(
+                cancellationToken))
             {
+                if (message.SequenceNumber > sequenceNumber)
+                {
+                    messagesToUnlock.Add(message);
+                    break;
+                }
+
                 if (message.SequenceNumber == sequenceNumber)
                 {
                     await receiver.CompleteMessageAsync(message, cancellationToken);
 
                     messageCompleted = true;
                     break;
                 }
+                messagesToUnlock.Add(message);
+            }
 
+            foreach (ServiceBusReceivedMessage message in messagesToUnlock)
+            {
                 await receiver.AbandonMessageAsync(message, null, cancellationToken);
             }
+
         }
         catch (TaskCanceledException)
         {

diff --git a/src/Ui/Website/Shared/Messages/MessagesUploadDialog.razor b/src/Ui/Website/Shared/Messages/MessagesUploadDialog.razor
@@ -6,7 +6,7 @@
     <MudText Typo="Typo.h6">
       Upload messages from file
     </MudText>
-    <MudText>Max 1000 at once</MudText>
+    <MudText>Max 200 at once</MudText>
   </TitleContent>
   <DialogContent>
     <MudPaper Elevation="3">
@@ -29,7 +29,7 @@
     </MudPaper>
     <MudPaper Elevation="3">
       <MudField Variant="Variant.Outlined" Label="Select files">
-        <MudFileUpload T="IReadOnlyList<IBrowserFile>" FilesChanged="UploadFilesAsync" MaximumFileCount="1000">
+        <MudFileUpload T="IReadOnlyList<IBrowserFile>" FilesChanged="UploadFilesAsync" MaximumFileCount="200">
           <ButtonTemplate>
             <MudButton HtmlTag="label"
                        Variant="Variant.Filled"

diff --git a/src/Ui/Website/ViewModels/MessagesViewModel.cs b/src/Ui/Website/ViewModels/MessagesViewModel.cs
@@ -222,7 +222,6 @@ public async Task Delete(Message message, SubQueue subQueue)
                 }
                 else
                 {
-                    _snackbar.Add("Message successfully removed", Severity.Success);
                     Messages.Remove(message);
                 }
             };
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     else
                     {
-                        _snackbar.Add("Message successfully removed", Severity.Success);
                         Messages.Remove(message);
                     }
                 };
@@ Expand Down @@