add index (#373)

update version
gottscj · Nov 12, 2023 · e614471 · e614471
1 parent 8426ebc
commit e614471
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 33 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,9 @@
 
 ## Change log
 
+### v1.9.14
+- Add index needed for improved performance of MongoMonitoringApi.GetQueues
+
 ### v1.9.13
 - Improve performance of MongoMonitoringApi.GetQueues()
 

diff --git a/src/Hangfire.Mongo.Sample.ASPNetCore/Hangfire.Mongo.Sample.ASPNetCore.csproj b/src/Hangfire.Mongo.Sample.ASPNetCore/Hangfire.Mongo.Sample.ASPNetCore.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Description />
-    <Version>1.9.13</Version>
+    <Version>1.9.14</Version>
     <Description>MongoDB storage implementation for Hangfire (background job system for ASP.NET applications).</Description>
     <Copyright>Copyright © 2014-2019 Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Copyright>
     <Authors>Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Authors>

diff --git a/src/Hangfire.Mongo.Sample.CosmosDB/Hangfire.Mongo.Sample.CosmosDB.csproj b/src/Hangfire.Mongo.Sample.CosmosDB/Hangfire.Mongo.Sample.CosmosDB.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Description />
-    <Version>1.9.13</Version>
+    <Version>1.9.14</Version>
     <Description>MongoDB storage implementation for Hangfire (background job system for ASP.NET applications).</Description>
     <Copyright>Copyright © 2014-2019 Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Copyright>
     <Authors>Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Authors>

diff --git a/src/Hangfire.Mongo.Sample.NETCore/Hangfire.Mongo.Sample.NETCore.csproj b/src/Hangfire.Mongo.Sample.NETCore/Hangfire.Mongo.Sample.NETCore.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>Hangfire.Mongo.Sample.NETCore</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>Hangfire.Mongo.Sample.NETCore</PackageId>
-    <Version>1.9.13</Version>
+    <Version>1.9.14</Version>
     <Description>MongoDB storage implementation for Hangfire (background job system for ASP.NET applications).</Description>
     <Copyright>Copyright © 2014-2019 Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Copyright>
     <Authors>Sergey Zwezdin, Martin Lobger, Jonas Gottschau</Authors>

diff --git a/src/Hangfire.Mongo.Tests/Migration/Hangfire-Mongo-Schema-021.zip b/src/Hangfire.Mongo.Tests/Migration/Hangfire-Mongo-Schema-021.zip
diff --git a/src/Hangfire.Mongo.Tests/Migration/Mongo/MongoDatabaseFiller.cs b/src/Hangfire.Mongo.Tests/Migration/Mongo/MongoDatabaseFiller.cs
@@ -41,6 +41,7 @@ public void Clean_Database_Filled()
                     MigrationStrategy = new DropMongoMigrationStrategy(),
                     BackupStrategy = new NoneMongoBackupStrategy()
                 },
+                CheckQueuedJobsStrategy = CheckQueuedJobsStrategy.TailNotificationsCollection,
                 QueuePollInterval = TimeSpan.FromMilliseconds(500)
             };
             var serverOptions = new BackgroundJobServerOptions
@@ -94,7 +95,8 @@ public void Clean_Database_Filled()
             {
                 var allowedEmptyCollections = new List<string>
                 {
-                    "hangfire.migrationLock"
+                    "hangfire.migrationLock",
+                    "hangfire.notifications"
                 };
 
                 if (MongoMigrationManager.RequiredSchemaVersion >= MongoSchema.Version09 &&

diff --git a/src/Hangfire.Mongo.Tests/Migration/Version20MigrationStepFacts.cs b/src/Hangfire.Mongo.Tests/Migration/Version20MigrationStepFacts.cs
@@ -15,13 +15,11 @@ namespace Hangfire.Mongo.Tests.Migration
     public class Version20MigrationStepFacts
     {
         private readonly IMongoDatabase _database;
-        private readonly Random _random;
         private readonly IMongoMigrationStep _migration;
         public Version20MigrationStepFacts(MongoDbFixture fixture)
         {
             var dbContext = fixture.CreateDbContext();
             _database = dbContext.Database;
-            _random = new Random();
             _migration = new RemoveJobQueueDto();
         }
 

diff --git a/src/Hangfire.Mongo/Hangfire.Mongo.csproj b/src/Hangfire.Mongo/Hangfire.Mongo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <VersionPrefix>1.9.13</VersionPrefix>
+        <VersionPrefix>1.9.14</VersionPrefix>
         <TargetFramework>netstandard2.0</TargetFramework>
         <NoWarn>$(NoWarn);CS0618</NoWarn>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -22,7 +22,7 @@
         <Description>MongoDB storage implementation for Hangfire (background job system for ASP.NET applications).</Description>
         <PackageTags>Hangfire AspNet OWIN MongoDB CosmosDB Long-Running Background Fire-And-Forget Delayed Recurring Tasks Jobs Scheduler Threading Queues</PackageTags>
         <PackageReleaseNotes>1.9.13
-            - Improve performance of MongoMonitoringApi.GetQueues()
+            - Add index needed for improved performance of MongoMonitoringApi.GetQueues
         </PackageReleaseNotes>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <!--<PackageLicenseUrl>https://raw.githubusercontent.com/sergun/Hangfire.Mongo/master/LICENSE</PackageLicenseUrl>-->

diff --git a/src/Hangfire.Mongo/Migration/MongoSchemaExtensions.cs b/src/Hangfire.Mongo/Migration/MongoSchemaExtensions.cs
@@ -124,33 +124,10 @@ public static IList<string> CollectionNames(this MongoSchema schema, string pref
                         prefix + ".server"
                     };
                 case MongoSchema.Version17:
-                    return new[]
-                    {
-                        prefix + ".jobGraph",
-                        prefix + ".locks",
-                        prefix + ".schema",
-                        prefix + ".server",
-                        prefix + ".notifications"
-                    };
                 case MongoSchema.Version18:
-                    return new[]
-                    {
-                        prefix + ".jobGraph",
-                        prefix + ".locks",
-                        prefix + ".schema",
-                        prefix + ".server",
-                        prefix + ".notifications"
-                    };
                 case MongoSchema.Version19:
-                    return new[]
-                    {
-                        prefix + ".jobGraph",
-                        prefix + ".locks",
-                        prefix + ".schema",
-                        prefix + ".server",
-                        prefix + ".notifications"
-                    };
                 case MongoSchema.Version20:
+                case MongoSchema.Version21:
                     return new[]
                     {
                         prefix + ".jobGraph",

diff --git a/src/Hangfire.Mongo/Migration/Steps/Version22/00_AddQueueIndex.cs b/src/Hangfire.Mongo/Migration/Steps/Version22/00_AddQueueIndex.cs
@@ -0,0 +1,21 @@
+using MongoDB.Bson;
+using MongoDB.Driver;
+
+namespace Hangfire.Mongo.Migration.Steps.Version22;
+
+internal class AddQueueIndex : IndexMigration, IMongoMigrationStep
+{
+    public MongoSchema TargetSchema => MongoSchema.Version22;
+    public long Sequence => 0;
+    public bool Execute(IMongoDatabase database, MongoStorageOptions storageOptions, IMongoMigrationContext migrationContext)
+    {
+        var jobGraph = database.GetCollection<BsonDocument>($"{storageOptions.Prefix}.jobGraph");
+
+        // "{ _t: 1, Queue: 1 }"
+        var index = Builders<BsonDocument>.IndexKeys.Ascending("_t").Ascending("Queue");
+        var options = new CreateIndexOptions { Name = "T_Queue" };
+
+        jobGraph.Indexes.CreateOne(index, options);
+        return true;
+    }
+}
diff --git a/src/Hangfire.Mongo/MongoSchema.cs b/src/Hangfire.Mongo/MongoSchema.cs
@@ -99,7 +99,12 @@ public enum MongoSchema
         /// <summary>
         /// Schema Version 21
         /// </summary>
-        Version21 = 21
+        Version21 = 21,
+
+        /// <summary>
+        /// Schema Version 22
+        /// </summary>
+        Version22 = 22
     }
 
 }