register provider, metrics, registration and store api to di

Author: s3w3nofficial

libs/host/GarnetApplicationBuilder.cs

@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Garnet.cluster;
+using Garnet.common;
 using Garnet.server;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -101,16 +103,38 @@ internal GarnetApplicationBuilder(GarnetApplicationOptions options, GarnetServer
             return storeFactory.CreateObjectStore();
         });
 
-        /*
+        hostApplicationBuilder.Services.AddSingleton<IGarnetServer, GarnetServerTcp>();
+
+        hostApplicationBuilder.Services.AddSingleton(sp =>
+        {
+            var options = sp.GetRequiredService<IOptions<GarnetServerOptions>>();
+            var opts = options.Value;
+
+            return new SubscribeBroker<SpanByte, SpanByte, IKeySerializer<SpanByte>>(
+                new SpanByteKeySerializer(), null, opts.PubSubPageSizeBytes(), opts.SubscriberRefreshFrequencyMs, true);
+        });
+
         hostApplicationBuilder.Services.AddSingleton<StoreWrapper>(sp =>
         {
             var storeWrapperFactory = sp.GetRequiredService<StoreWrapperFactory>();
 
-            return storeWrapperFactory.Create();
+            var version = GetVersion();
+
+            return storeWrapperFactory.Create(version);
         });
-        */
 
-        hostApplicationBuilder.Services.AddTransient<IGarnetServer, GarnetServerTcp>();
+        hostApplicationBuilder.Services.AddSingleton<GarnetProviderFactory>();
+
+        hostApplicationBuilder.Services.AddSingleton<GarnetProvider>(sp =>
+        {
+            var garnetProviderFactory = sp.GetRequiredService<GarnetProviderFactory>();
+
+            return garnetProviderFactory.Create();
+        });
+        
+        hostApplicationBuilder.Services.AddSingleton<MetricsApi>();
+        hostApplicationBuilder.Services.AddSingleton<RegisterApi>();
+        hostApplicationBuilder.Services.AddSingleton<StoreApi>();
 
         hostApplicationBuilder.Services.AddTransient<GarnetServer>();
 
@@ -171,4 +195,11 @@ public IMetricsBuilder Metrics
 
     public IServiceCollection Services
         => hostApplicationBuilder.Services;
+    
+    
+    static string GetVersion()
+    {
+        var Version = Assembly.GetExecutingAssembly().GetName().Version;
+        return $"{Version.Major}.{Version.Minor}.{Version.Build}";
+    }
 }

libs/host/GarnetProviderFactory.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+using Garnet.common;
+using Garnet.server;
+using Microsoft.Extensions.Options;
+using Tsavorite.core;
+
+namespace Garnet;
+
+public class GarnetProviderFactory
+{
+    readonly GarnetServerOptions options;
+    readonly SubscribeBroker<SpanByte, SpanByte, IKeySerializer<SpanByte>> subscribeBroker;
+    readonly StoreWrapper storeWrapper;
+    
+    public GarnetProviderFactory(
+        IOptions<GarnetServerOptions> options,
+        SubscribeBroker<SpanByte, SpanByte, IKeySerializer<SpanByte>> subscribeBroker,
+        StoreWrapper storeWrapper)
+    {
+        this.options = options.Value;
+        this.subscribeBroker = subscribeBroker;
+        this.storeWrapper = storeWrapper;
+    }
+
+    public GarnetProvider Create()
+    {
+        if (options.DisablePubSub)
+        {
+            return new GarnetProvider(storeWrapper, null);
+        }
+        
+        return new GarnetProvider(storeWrapper, subscribeBroker);
+    }
+}

libs/host/GarnetServer.cs

@@ -84,28 +84,35 @@ static string GetVersion()
         /// </summary>
         public StoreApi Store;
 
-        readonly StoreWrapperFactory storeWrapperFactory;
-
         /// <summary>
         /// Create Garnet Server instance using GarnetServerOptions instance; use Start to start the server.
         /// </summary>
         /// <param name="options">Server options</param>
         /// <param name="logger">Logger</param>
         /// <param name="loggerFactory">Logger factory</param>
         /// <param name="server">The IGarnetServer to use. If none is provided, will use a GarnetServerTcp.</param>
-        /// <param name="storeWrapperFactory"></param>
+        /// <param name="garnetProvider"></param>
+        /// <param name="metricsApi"></param>
+        /// <param name="registerApi"></param>
+        /// <param name="storeApi"></param>
         public GarnetServer(
             IOptions<GarnetServerOptions> options, 
             ILogger<GarnetServer> logger,
             ILoggerFactory loggerFactory, 
-            IGarnetServer server, 
-            StoreWrapperFactory storeWrapperFactory)
+            IGarnetServer server,
+            GarnetProvider garnetProvider,
+            MetricsApi metricsApi,
+            RegisterApi registerApi,
+            StoreApi storeApi)
         {
             this.server = server;
             this.opts = options.Value;
             this.logger = logger;
             this.loggerFactory = loggerFactory;
-            this.storeWrapperFactory = storeWrapperFactory;
+            this.Provider = garnetProvider;
+            this.Metrics = metricsApi;
+            this.Register = registerApi;
+            this.Store = storeApi;
 
             this.cleanupDir = false;
             this.InitializeServerUpdated();
@@ -174,23 +181,8 @@ private void InitializeServerUpdated()
             if (!setMax && !ThreadPool.SetMaxThreads(maxThreads, maxCPThreads))
                 throw new Exception($"Unable to call ThreadPool.SetMaxThreads with {maxThreads}, {maxCPThreads}");
 
-            if (!opts.DisablePubSub)
-                subscribeBroker = new SubscribeBroker<SpanByte, SpanByte, IKeySerializer<SpanByte>>(
-                    new SpanByteKeySerializer(), null, opts.PubSubPageSizeBytes(), opts.SubscriberRefreshFrequencyMs,
-                    true);
-
             logger?.LogTrace("TLS is {tlsEnabled}", opts.TlsOptions == null ? "disabled" : "enabled");
 
-            storeWrapper = storeWrapperFactory.Create(version, server);
-                
-            // Create session provider for Garnet
-            Provider = new GarnetProvider(storeWrapper, subscribeBroker);
-
-            // Create user facing API endpoints
-            Metrics = new MetricsApi(Provider);
-            Register = new RegisterApi(Provider);
-            Store = new StoreApi(storeWrapper);
-
             server.Register(WireFormat.ASCII, Provider);
         }
 

libs/host/StoreWrapperFactory.cs

@@ -29,6 +29,7 @@ public class StoreWrapperFactory
 
     readonly ILoggerFactory loggerFactory;
     readonly ILogger<StoreWrapperFactory> logger;
+    readonly IGarnetServer garnetServer;
     readonly StoreFactory storeFactory;
     readonly GarnetServerOptions options;
     readonly CustomCommandManager customCommandManager;
@@ -40,6 +41,7 @@ public class StoreWrapperFactory
     public StoreWrapperFactory(
         ILoggerFactory loggerFactory,
         ILogger<StoreWrapperFactory> logger,
+        IGarnetServer garnetServer,
         StoreFactory storeFactory, 
         IOptions<GarnetServerOptions> options,
         CustomCommandManager customCommandManager,
@@ -50,6 +52,7 @@ public StoreWrapperFactory(
     {
         this.loggerFactory = loggerFactory;
         this.logger = logger;
+        this.garnetServer = garnetServer;
         this.storeFactory = storeFactory;
         this.options = options.Value;
         this.customCommandManager = customCommandManager; 
@@ -59,9 +62,7 @@ public StoreWrapperFactory(
         this.appendOnlyFileWrapper = appendOnlyFileWrapper;
     }
 
-    public StoreWrapper Create(
-        string version,
-        IGarnetServer server)
+    public StoreWrapper Create(string version)
     {
         var store = mainStoreWrapper.store;
         var objectStore = objectStoreWrapper.objectStore;
@@ -88,7 +89,7 @@ public StoreWrapper Create(
         return new StoreWrapper(
             version, 
             redisProtocolVersion,
-            server, 
+            garnetServer, 
             store,
             objectStore,
             objectStoreSizeTracker,

libs/server/StoreWrapper.cs

@@ -27,7 +27,7 @@ namespace Garnet.server
     /// <summary>
     /// Wrapper for store and store-specific information
     /// </summary>   
-    public sealed class StoreWrapper : IDisposable
+    public sealed class StoreWrapper 
     {
         internal readonly string version;
         internal readonly string redisProtocolVersion;