Remove inheritance of ListIndicesCommand completely

peppy · peppy · commit 147b80123677 · 2025-03-10T13:51:55.000+09:00
It was ugly.
diff --git a/osu.ElasticIndexer/Commands/Index/CloseIndexCommand.cs b/osu.ElasticIndexer/Commands/Index/CloseIndexCommand.cs
@@ -6,21 +6,22 @@
 using System.Threading;
 using McMaster.Extensions.CommandLineUtils;
 using osu.Server.QueueProcessor;
+using StackExchange.Redis;
 
 namespace osu.ElasticIndexer.Commands.Index
 {
     [Command("close", Description = "Closes unused indices.")]
-    public class CloseIndexCommand : ListIndicesCommand
+    public class CloseIndexCommand
     {
         [Argument(0, "name", "The index to close. All unused indices are closed if not specified.")]
         public string? Name { get; set; }
 
-        public override int OnExecute(CancellationToken token)
-        {
-            if (base.OnExecute(token) != 0)
-                return -1;
+        private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
+        private readonly OsuElasticClient elasticClient = new OsuElasticClient();
 
-            var indices = string.IsNullOrEmpty(Name) ? ElasticClient.GetIndices($"{AppSettings.AliasName}_*") : ElasticClient.GetIndex(Name);
+        public int OnExecute(CancellationToken token)
+        {
+            var indices = string.IsNullOrEmpty(Name) ? elasticClient.GetIndices($"{AppSettings.AliasName}_*") : elasticClient.GetIndex(Name);
 
             var closeableIndices = indices.Where(entry => entry.Value.Aliases.Count == 0);
 
@@ -47,17 +48,17 @@ public override int OnExecute(CancellationToken token)
 
             foreach (var entry in closeableIndices)
             {
-                if (entry.Key.Name == Redis.GetCurrentSchema())
+                if (entry.Key.Name == redis.GetCurrentSchema())
                 {
                     Console.WriteLine(ConsoleColor.Red, $"Index {entry.Key.Name} is set as current schema. Cannot close.");
                     return -1;
                 }
 
                 System.Console.WriteLine($"Removing {entry.Key.Name} from active schemas..");
-                Redis.RemoveActiveSchema(entry.Key.Name);
+                redis.RemoveActiveSchema(entry.Key.Name);
 
                 Console.WriteLine($"Closing {entry.Key.Name}...");
-                var response = ElasticClient.Indices.Close(entry.Key.Name);
+                var response = elasticClient.Indices.Close(entry.Key.Name);
 
                 if (!response.IsValid)
                 {
@@ -68,7 +69,7 @@ public override int OnExecute(CancellationToken token)
 
             Console.WriteLine("done.");
 
-            return 0;
+            return ListIndicesCommand.ListSchemas(redis, elasticClient);
         }
     }
 }
diff --git a/osu.ElasticIndexer/Commands/Index/DeleteIndexCommand.cs b/osu.ElasticIndexer/Commands/Index/DeleteIndexCommand.cs
@@ -5,22 +5,22 @@
 using System.Linq;
 using System.Threading;
 using McMaster.Extensions.CommandLineUtils;
+using osu.Server.QueueProcessor;
+using StackExchange.Redis;
 
 namespace osu.ElasticIndexer.Commands.Index
 {
     [Command("delete", Description = "Deletes closed indices.")]
-    public class DeleteIndexCommand : ListIndicesCommand
+    public class DeleteIndexCommand
     {
         [Argument(0, "name", "The index to delete. All closed indices are deleted if not specified.")]
         public string? Name { get; set; }
 
+        private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
         private readonly OsuElasticClient elasticClient = new OsuElasticClient();
 
-        public override int OnExecute(CancellationToken token)
+        public int OnExecute(CancellationToken token)
         {
-            if (base.OnExecute(token) != 0)
-                return -1;
-
             string? index = string.IsNullOrEmpty(Name) ? $"{AppSettings.AliasName}_*" : Name;
             var response = elasticClient.Cat.Indices(x => x.Index(index));
             var closed = response.Records.Where(record => record.Status == "close");
@@ -56,7 +56,7 @@ public override int OnExecute(CancellationToken token)
 
             Console.WriteLine("done.");
 
-            return 0;
+            return ListIndicesCommand.ListSchemas(redis, elasticClient);
         }
     }
 }
diff --git a/osu.ElasticIndexer/Commands/Index/ListIndicesCommand.cs b/osu.ElasticIndexer/Commands/Index/ListIndicesCommand.cs
@@ -12,16 +12,20 @@
 namespace osu.ElasticIndexer.Commands.Index
 {
     [Command("list", Description = "Lists indices.")]
-    public class ListIndicesCommand
+    public sealed class ListIndicesCommand
     {
-        protected readonly OsuElasticClient ElasticClient = new OsuElasticClient();
+        private readonly OsuElasticClient elasticClient = new OsuElasticClient();
+        private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
 
-        protected readonly ConnectionMultiplexer Redis = RedisAccess.GetConnection();
+        public int OnExecute(CancellationToken token)
+        {
+            return ListSchemas(redis, elasticClient);
+        }
 
-        public virtual int OnExecute(CancellationToken token)
+        public static int ListSchemas(ConnectionMultiplexer redis, OsuElasticClient elastic)
         {
-            string?[] activeSchemas = Redis.GetActiveSchemas();
-            string currentSchema = Redis.GetCurrentSchema();
+            string?[] activeSchemas = redis.GetActiveSchemas();
+            string currentSchema = redis.GetCurrentSchema();
 
             Console.WriteLine("# Redis tracking");
             Console.WriteLine();
@@ -30,8 +34,8 @@ public virtual int OnExecute(CancellationToken token)
             Console.WriteLine($"Current schema: {currentSchema}");
             Console.WriteLine();
 
-            var indices = ElasticClient.GetIndices($"{AppSettings.AliasName}_*");
-            var records = ElasticClient.Cat.Indices(descriptor => descriptor.Index(Indices.All)).Records;
+            var indices = elastic.GetIndices($"{AppSettings.AliasName}_*");
+            var records = elastic.Cat.Indices(descriptor => descriptor.Index(Indices.All)).Records;
 
             Console.WriteLine($"# Elasticsearch indices ({indices.Count})");
             Console.WriteLine();
diff --git a/osu.ElasticIndexer/Commands/Index/NukeAllIndicesCommand.cs b/osu.ElasticIndexer/Commands/Index/NukeAllIndicesCommand.cs
@@ -4,18 +4,23 @@
 using System.Threading;
 using McMaster.Extensions.CommandLineUtils;
 using osu.Server.QueueProcessor;
+using StackExchange.Redis;
 
 namespace osu.ElasticIndexer.Commands.Index;
 
 [Command("nuke", Description = "Resets everything with fire.")]
-public class NukeAllIndicesCommand : ListIndicesCommand
+public class NukeAllIndicesCommand
 {
-    public override int OnExecute(CancellationToken token)
+    private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
+    private readonly OsuElasticClient elasticClient = new OsuElasticClient();
+
+    public int OnExecute(CancellationToken token)
     {
         string prefix = $"{AppSettings.AliasName}_*";
 
         // Don't exit on error as we're likely trying to fix an error.
-        base.OnExecute(token);
+        if (ListIndicesCommand.ListSchemas(redis, elasticClient) != 0)
+            return -1;
 
         Console.WriteLine();
         Console.WriteLine($"PREPARING TO NUKE ALL ELASTICSEARCH INDICES WITH PREFIX {prefix} WITH FIRE!");
@@ -26,24 +31,24 @@ public override int OnExecute(CancellationToken token)
             return -1;
 
         System.Console.WriteLine("Unsetting current schema..");
-        Redis.ClearCurrentSchema();
+        redis.ClearCurrentSchema();
 
         System.Console.WriteLine("Removing all active schemas..");
 
-        foreach (string? schema in Redis.GetActiveSchemas())
+        foreach (string? schema in redis.GetActiveSchemas())
         {
             if (schema != null)
-                Redis.RemoveActiveSchema(schema);
+                redis.RemoveActiveSchema(schema);
         }
 
         System.Console.WriteLine("Removing all indices..");
 
-        var indices = ElasticClient.GetIndices(prefix);
+        var indices = elasticClient.GetIndices(prefix);
 
         foreach (var index in indices)
         {
             System.Console.WriteLine($"Deleting {index.Key}..");
-            ElasticClient.Indices.Delete(index.Key);
+            elasticClient.Indices.Delete(index.Key);
         }
 
         return 0;
diff --git a/osu.ElasticIndexer/Commands/Index/OpenIndexCommand.cs b/osu.ElasticIndexer/Commands/Index/OpenIndexCommand.cs
@@ -5,23 +5,24 @@
 using System.Threading;
 using McMaster.Extensions.CommandLineUtils;
 using osu.Server.QueueProcessor;
+using StackExchange.Redis;
 
 namespace osu.ElasticIndexer.Commands.Index
 {
     [Command("open", Description = "Opens an index.")]
-    public class OpenIndexCommand : ListIndicesCommand
+    public class OpenIndexCommand
     {
         [Argument(0, "name", "The index to open.")]
         [Required]
         public string Name { get; } = string.Empty;
 
-        public override int OnExecute(CancellationToken token)
-        {
-            if (base.OnExecute(token) != 0)
-                return -1;
+        private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
+        private readonly OsuElasticClient elasticClient = new OsuElasticClient();
 
+        public int OnExecute(CancellationToken token)
+        {
             Console.WriteLine($"Opening {Name}..");
-            var response = new OsuElasticClient().Indices.Open(Name);
+            var response = elasticClient.Indices.Open(Name);
 
             if (!response.IsValid)
             {
@@ -31,7 +32,8 @@ public override int OnExecute(CancellationToken token)
 
             Console.WriteLine($"Adding {Name} to active schemas..");
             RedisAccess.GetConnection().AddActiveSchema(Name);
-            return 0;
+
+            return ListIndicesCommand.ListSchemas(redis, elasticClient);
         }
     }
 }
diff --git a/osu.ElasticIndexer/Commands/Index/UpdateAliasCommand.cs b/osu.ElasticIndexer/Commands/Index/UpdateAliasCommand.cs
@@ -5,11 +5,12 @@
 using System.Threading;
 using McMaster.Extensions.CommandLineUtils;
 using osu.Server.QueueProcessor;
+using StackExchange.Redis;
 
 namespace osu.ElasticIndexer.Commands.Index
 {
     [Command("alias", Description = "Updates alias to the latest index of a given version.")]
-    public class UpdateAliasCommand : ListIndicesCommand
+    public class UpdateAliasCommand
     {
         [Option("--close", Description = "Closes the previously aliased index when switching.")]
         public bool Close { get; set; }
@@ -18,15 +19,18 @@ public class UpdateAliasCommand : ListIndicesCommand
         [Required]
         public string Schema { get; set; } = string.Empty;
 
-        public override int OnExecute(CancellationToken token)
+        private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();
+        private readonly OsuElasticClient elasticClient = new OsuElasticClient();
+
+        public int OnExecute(CancellationToken token)
         {
             if (string.IsNullOrWhiteSpace(Schema))
             {
                 Console.WriteLine("A schema version is required.");
                 return 1;
             }
 
-            var index = ElasticClient.GetIndexForSchema(Schema);
+            var index = elasticClient.GetIndexForSchema(Schema);
 
             if (index == null)
             {
@@ -37,14 +41,11 @@ public override int OnExecute(CancellationToken token)
             // TODO: should check if completed?
             string? indexName = index.Value.Key.Name;
 
-            ElasticClient.UpdateAlias(AppSettings.AliasName, indexName, Close);
-
-            Redis.SetCurrentSchema(indexName);
+            elasticClient.UpdateAlias(AppSettings.AliasName, indexName, Close);
 
-            if (base.OnExecute(token) != 0)
-                return -1;
+            redis.SetCurrentSchema(indexName);
 
-            return 0;
+            return ListIndicesCommand.ListSchemas(redis, elasticClient);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,22 @@`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using McMaster.Extensions.CommandLineUtils;`
`8`	`8`	`using osu.Server.QueueProcessor;`
	`9`	`+using StackExchange.Redis;`
`9`	`10`
`10`	`11`	`namespace osu.ElasticIndexer.Commands.Index`
`11`	`12`	`{`
`12`	`13`	`[Command("close", Description = "Closes unused indices.")]`
`13`		`- public class CloseIndexCommand : ListIndicesCommand`
	`14`	`+ public class CloseIndexCommand`
`14`	`15`	`{`
`15`	`16`	`[Argument(0, "name", "The index to close. All unused indices are closed if not specified.")]`
`16`	`17`	`public string? Name { get; set; }`
`17`	`18`
`18`		`- public override int OnExecute(CancellationToken token)`
`19`		`- {`
`20`		`- if (base.OnExecute(token) != 0)`
`21`		`- return -1;`
	`19`	`+ private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();`
	`20`	`+ private readonly OsuElasticClient elasticClient = new OsuElasticClient();`
`22`	`21`
`23`		`- var indices = string.IsNullOrEmpty(Name) ? ElasticClient.GetIndices($"{AppSettings.AliasName}_*") : ElasticClient.GetIndex(Name);`
	`22`	`+ public int OnExecute(CancellationToken token)`
	`23`	`+ {`
	`24`	`+ var indices = string.IsNullOrEmpty(Name) ? elasticClient.GetIndices($"{AppSettings.AliasName}_*") : elasticClient.GetIndex(Name);`
`24`	`25`
`25`	`26`	`var closeableIndices = indices.Where(entry => entry.Value.Aliases.Count == 0);`
`26`	`27`
`@@ -47,17 +48,17 @@ public override int OnExecute(CancellationToken token)`
`47`	`48`
`48`	`49`	`foreach (var entry in closeableIndices)`
`49`	`50`	`{`
`50`		`- if (entry.Key.Name == Redis.GetCurrentSchema())`
	`51`	`+ if (entry.Key.Name == redis.GetCurrentSchema())`
`51`	`52`	`{`
`52`	`53`	`Console.WriteLine(ConsoleColor.Red, $"Index {entry.Key.Name} is set as current schema. Cannot close.");`
`53`	`54`	`return -1;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`System.Console.WriteLine($"Removing {entry.Key.Name} from active schemas..");`
`57`		`- Redis.RemoveActiveSchema(entry.Key.Name);`
	`58`	`+ redis.RemoveActiveSchema(entry.Key.Name);`
`58`	`59`
`59`	`60`	`Console.WriteLine($"Closing {entry.Key.Name}...");`
`60`		`- var response = ElasticClient.Indices.Close(entry.Key.Name);`
	`61`	`+ var response = elasticClient.Indices.Close(entry.Key.Name);`
`61`	`62`
`62`	`63`	`if (!response.IsValid)`
`63`	`64`	`{`
`@@ -68,7 +69,7 @@ public override int OnExecute(CancellationToken token)`
`68`	`69`
`69`	`70`	`Console.WriteLine("done.");`
`70`	`71`
`71`		`- return 0;`
	`72`	`+ return ListIndicesCommand.ListSchemas(redis, elasticClient);`
`72`	`73`	`}`
`73`	`74`	`}`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,22 +5,22 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using McMaster.Extensions.CommandLineUtils;`
	`8`	`+using osu.Server.QueueProcessor;`
	`9`	`+using StackExchange.Redis;`
`8`	`10`
`9`	`11`	`namespace osu.ElasticIndexer.Commands.Index`
`10`	`12`	`{`
`11`	`13`	`[Command("delete", Description = "Deletes closed indices.")]`
`12`		`- public class DeleteIndexCommand : ListIndicesCommand`
	`14`	`+ public class DeleteIndexCommand`
`13`	`15`	`{`
`14`	`16`	`[Argument(0, "name", "The index to delete. All closed indices are deleted if not specified.")]`
`15`	`17`	`public string? Name { get; set; }`
`16`	`18`
	`19`	`+ private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();`
`17`	`20`	`private readonly OsuElasticClient elasticClient = new OsuElasticClient();`
`18`	`21`
`19`		`- public override int OnExecute(CancellationToken token)`
	`22`	`+ public int OnExecute(CancellationToken token)`
`20`	`23`	`{`
`21`		`- if (base.OnExecute(token) != 0)`
`22`		`- return -1;`
`23`		`-`
`24`	`24`	`string? index = string.IsNullOrEmpty(Name) ? $"{AppSettings.AliasName}_*" : Name;`
`25`	`25`	`var response = elasticClient.Cat.Indices(x => x.Index(index));`
`26`	`26`	`var closed = response.Records.Where(record => record.Status == "close");`
`@@ -56,7 +56,7 @@ public override int OnExecute(CancellationToken token)`
`56`	`56`
`57`	`57`	`Console.WriteLine("done.");`
`58`	`58`
`59`		`- return 0;`
	`59`	`+ return ListIndicesCommand.ListSchemas(redis, elasticClient);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,12 @@`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using McMaster.Extensions.CommandLineUtils;`
`7`	`7`	`using osu.Server.QueueProcessor;`
	`8`	`+using StackExchange.Redis;`
`8`	`9`
`9`	`10`	`namespace osu.ElasticIndexer.Commands.Index`
`10`	`11`	`{`
`11`	`12`	`[Command("alias", Description = "Updates alias to the latest index of a given version.")]`
`12`		`- public class UpdateAliasCommand : ListIndicesCommand`
	`13`	`+ public class UpdateAliasCommand`
`13`	`14`	`{`
`14`	`15`	`[Option("--close", Description = "Closes the previously aliased index when switching.")]`
`15`	`16`	`public bool Close { get; set; }`
`@@ -18,15 +19,18 @@ public class UpdateAliasCommand : ListIndicesCommand`
`18`	`19`	`[Required]`
`19`	`20`	`public string Schema { get; set; } = string.Empty;`
`20`	`21`
`21`		`- public override int OnExecute(CancellationToken token)`
	`22`	`+ private readonly ConnectionMultiplexer redis = RedisAccess.GetConnection();`
	`23`	`+ private readonly OsuElasticClient elasticClient = new OsuElasticClient();`
	`24`	`+`
	`25`	`+ public int OnExecute(CancellationToken token)`
`22`	`26`	`{`
`23`	`27`	`if (string.IsNullOrWhiteSpace(Schema))`
`24`	`28`	`{`
`25`	`29`	`Console.WriteLine("A schema version is required.");`
`26`	`30`	`return 1;`
`27`	`31`	`}`
`28`	`32`
`29`		`- var index = ElasticClient.GetIndexForSchema(Schema);`
	`33`	`+ var index = elasticClient.GetIndexForSchema(Schema);`
`30`	`34`
`31`	`35`	`if (index == null)`
`32`	`36`	`{`
`@@ -37,14 +41,11 @@ public override int OnExecute(CancellationToken token)`
`37`	`41`	`// TODO: should check if completed?`
`38`	`42`	`string? indexName = index.Value.Key.Name;`
`39`	`43`
`40`		`- ElasticClient.UpdateAlias(AppSettings.AliasName, indexName, Close);`
`41`		`-`
`42`		`- Redis.SetCurrentSchema(indexName);`
	`44`	`+ elasticClient.UpdateAlias(AppSettings.AliasName, indexName, Close);`
`43`	`45`
`44`		`- if (base.OnExecute(token) != 0)`
`45`		`- return -1;`
	`46`	`+ redis.SetCurrentSchema(indexName);`
`46`	`47`
`47`		`- return 0;`
	`48`	`+ return ListIndicesCommand.ListSchemas(redis, elasticClient);`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`