NativeAOT support for GarnetServer

libs/host/Configuration/ConfigProviders.cs

@@ -3,8 +3,6 @@
 
 using System;
 using System.IO;
-using System.Text;
-using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
@@ -108,19 +106,18 @@ public bool TryImportOptions(string path, IStreamProvider streamProvider, Option
 
         public bool TryExportOptions(string path, IStreamProvider streamProvider, Options options, ILogger logger)
         {
-            string jsonSettings;
+            byte[] jsonSettings;
             try
             {
-                jsonSettings = JsonSerializer.Serialize(options, new JsonSerializerOptions { WriteIndented = true });
+                jsonSettings = JsonSerializer.SerializeToUtf8Bytes(options, OptionsSerializerContext.Default.OptionsType);
             }
             catch (NotSupportedException e)
             {
                 logger?.LogError(e, $"An error occurred while serializing config file (Path: {path}).");
                 return false;
             }
 
-            var data = Encoding.ASCII.GetBytes(jsonSettings);
-            streamProvider.Write(path, data);
+            streamProvider.Write(path, jsonSettings);
 
             return true;
         }

libs/host/Configuration/Options.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -438,6 +439,7 @@ internal sealed class Options
         /// <param name="invalidOptions">List of invalid options</param>
         /// <param name="logger">Logger</param>
         /// <returns>True if all property values are valid</returns>
+        [RequiresUnreferencedCode("Calls System.ComponentModel.DataAnnotations.ValidationContext.ValidationContext(Object)")]
         public bool IsValid(out List<string> invalidOptions, ILogger logger)
         {
             invalidOptions = new List<string>();

libs/host/Configuration/OptionsSerializerContext.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+using System.Text.Json.Serialization;
+
+namespace Garnet
+{
+    /// <summary>
+    /// Json serializer context for Garnet configuration
+    /// </summary>
+    [JsonSerializable(typeof(Options), TypeInfoPropertyName = "OptionsType")]
+    [JsonSourceGenerationOptions(WriteIndented = true)]
+    internal partial class OptionsSerializerContext : JsonSerializerContext;
+}

libs/host/Configuration/Redis/RedisOptions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Garnet
 {
@@ -90,6 +91,7 @@ internal class RedisOptions
     /// This is required in order to determine order of precedence when setting options from multiple sources
     /// </summary>
     /// <typeparam name="T">The underlying type of the option</typeparam>
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
     internal class Option<T>
     {
         public T Value { get; set; }

libs/host/Garnet.host.csproj

@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<IsAotCompatible>true</IsAotCompatible>
 		<Platforms>AnyCPU</Platforms>
 		<LangVersion>latest</LangVersion>
 		<SignAssembly>true</SignAssembly>

libs/host/GarnetServer.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using Garnet.cluster;
@@ -64,6 +65,7 @@
         /// </summary>
         /// <param name="commandLineArgs">Command line arguments</param>
         /// <param name="loggerFactory">Logger factory</param>
+        [RequiresUnreferencedCode("Calls Garnet.Options.IsValid(out List<String>, ILogger)")]
         public GarnetServer(string[] commandLineArgs, ILoggerFactory loggerFactory = null)
         {
             Trace.Listeners.Add(new ConsoleTraceListener());
@@ -94,7 +96,7 @@
 
             // If no logger factory is given, set up main logger factory based on parsed configuration values,
             // otherwise use given logger factory.
             this.loggerFactory = loggerFactory ?? LoggerFactory.Create(builder =>
             {
                 if (!serverSettings.DisableConsoleLogger.GetValueOrDefault())
                 {

libs/host/ServerSettingsManager.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -33,6 +34,7 @@ internal static class ServerSettingsManager
         /// <param name="options">Options object containing parsed configuration settings</param>
         /// <param name="invalidOptions">List of Options properties that did not pass validation</param>
         /// <returns>True if parsing succeeded</returns>
+        [RequiresUnreferencedCode("Calls Garnet.Options.IsValid(out List<String>, ILogger)")]
         internal static bool TryParseCommandLineArguments(string[] args, out Options options, out List<string> invalidOptions, ILogger logger = null)
         {
             if (logger == null)

libs/server/ACL/CommandCategory.cs

@@ -29,6 +29,11 @@ public enum Flag : uint
             Admin = 1 << 0
         };
 
+        /// <summary>
+        /// Highest bit flag value
+        /// </summary> 
+        internal static readonly Flag HighestFlag = Enum.GetValues<Flag>().Max();
+
         /// <summary>
         /// Map of category names to bit flag
         /// </summary>

libs/server/ACL/User.cs

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading;
 
@@ -189,7 +187,7 @@ public string DescribeUser()
             }
 
             // Categories
-            var highestFlag = Enum.GetValues(typeof(CommandCategory.Flag)).Cast<int>().Max();
+            var highestFlag = (int)CommandCategory.HighestFlag;
 
             for (int i = 0; i <= highestFlag; i++)
             {

libs/server/Custom/CustomCommandRegistration.cs

@@ -2,8 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Immutable;
 
 namespace Garnet.server.Custom
 {
@@ -84,32 +83,12 @@ internal abstract class RegisterCustomCommandProviderBase : IRegisterCustomComma
         /// <summary>
         /// All supported custom command types 
         /// </summary>
-        public static Lazy<Type[]> SupportedCustomCommandBaseTypesLazy = new(() =>
-        {
-            var supportedTypes = new HashSet<Type>();
-            foreach (var type in typeof(RegisterCustomCommandProviderBase).Assembly.GetTypes().Where(t =>
-                         typeof(RegisterCustomCommandProviderBase).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract))
-            {
-                var baseType = type.BaseType;
-                while (baseType != null && baseType != typeof(RegisterCustomCommandProviderBase))
-                {
-                    if (baseType.IsGenericType && baseType.GetGenericTypeDefinition() ==
-                        typeof(RegisterCustomCommandProviderBase<,>))
-                    {
-                        var customCmdType = baseType.GetGenericArguments().FirstOrDefault();
-                        if (customCmdType != null)
-                        {
-                            supportedTypes.Add(customCmdType);
-                            break;
-                        }
-                    }
-
-                    baseType = baseType.BaseType;
-                }
-            }
-
-            return supportedTypes.ToArray();
-        });
+        public static readonly ImmutableArray<Type> SupportedCustomCommandBaseTypes = ImmutableArray.Create(
+        [
+            typeof(CustomRawStringFunctions),
+            typeof(CustomObjectFactory),
+            typeof(CustomTransactionProcedure)
+        ]);
 
         public abstract void Register(CustomCommandManager customCommandManager);
     }

libs/server/Garnet.server.csproj

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsAotCompatible>true</IsAotCompatible>
     <Platforms>AnyCPU</Platforms>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>

libs/server/Metrics/Info/GarnetInfoMetrics.cs

@@ -11,7 +11,7 @@ namespace Garnet.server
 {
     class GarnetInfoMetrics
     {
-        public static readonly InfoMetricsType[] defaultInfo = Enum.GetValues(typeof(InfoMetricsType)).Cast<InfoMetricsType>()
+        public static readonly InfoMetricsType[] defaultInfo = Enum.GetValues<InfoMetricsType>()
             .Where(e => e switch
                 {
                     InfoMetricsType.STOREHASHTABLE => false,

libs/server/Metrics/Latency/GarnetLatencyMetrics.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using Garnet.common;
 using HdrHistogram;
 
@@ -15,11 +14,10 @@ namespace Garnet.server
     /// </summary>
     internal class GarnetLatencyMetrics
     {
-        public static readonly LatencyMetricsType[] defaultLatencyTypes =
-            Enum.GetValues(typeof(LatencyMetricsType)).Cast<LatencyMetricsType>().ToArray();
+        public static readonly LatencyMetricsType[] defaultLatencyTypes = Enum.GetValues<LatencyMetricsType>();
 
         // Whether each latency type in LatencyMetricsType enum is in ticks or is a directly reported value
-        static readonly bool[] defaultLatencyTypesTicks = new bool[6] { true, true, true, false, false, true };
+        static readonly bool[] defaultLatencyTypesTicks = [true, true, true, false, false, true];
 
         public LatencyMetricsEntry[] metrics;
 

libs/server/Metrics/Latency/GarnetLatencyMetricsSession.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using Garnet.common;
 
@@ -14,8 +13,7 @@ namespace Garnet.server
     internal class GarnetLatencyMetricsSession
     {
         readonly GarnetServerMonitor monitor;
-        static readonly LatencyMetricsType[] defaultLatencyTypes =
-            Enum.GetValues(typeof(LatencyMetricsType)).Cast<LatencyMetricsType>().ToArray();
+        static readonly LatencyMetricsType[] defaultLatencyTypes = Enum.GetValues<LatencyMetricsType>();
         int Version => (int)(monitor.monitor_iterations % 2);
         public int PriorVersion => 1 - Version;
         public LatencyMetricsEntrySession[] metrics;

libs/server/Resp/ArrayCommands.cs

@@ -263,18 +263,18 @@
             }
 
             // Get types from loaded assemblies
             var loadedTypes = loadedAssemblies.SelectMany(a => a.GetTypes()).Where(t =>
                 classInstances.ContainsKey(t.Name)).ToArray();
 
             // Check that all types implement one of the supported custom command base classes
-            var supportedCustomCommandTypes = RegisterCustomCommandProviderBase.SupportedCustomCommandBaseTypesLazy.Value;
+            var supportedCustomCommandTypes = RegisterCustomCommandProviderBase.SupportedCustomCommandBaseTypes;
             if (loadedTypes.Any(t => !supportedCustomCommandTypes.Any(st => st.IsAssignableFrom(t))))
             {
                 return CmdStrings.RESP_ERROR_REGISTERCS_UNSUPPORTED_CLASS;
             }
 
             // Check that all types have empty constructors
             if (loadedTypes.Any(t => t.GetConstructor(Type.EmptyTypes) == null))
             {
                 return CmdStrings.RESP_ERROR_INSTANTIATING_CLASS;
             }
@@ -282,7 +282,7 @@
             // Instantiate types
             foreach (var type in loadedTypes)
             {
                 var instance = Activator.CreateInstance(type);
                 classInstances[type.Name] = instance;
             }
 

libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/Tsavorite.devices.AzureStorageDevice.csproj

@@ -8,6 +8,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsAotCompatible>true</IsAotCompatible>
     <RootNamespace>Tsavorite.devices</RootNamespace>
     <AssemblyName>Tsavorite.devices.AzureStorageDevice</AssemblyName>
     <ErrorReport>prompt</ErrorReport>

main/GarnetServer/GarnetServer.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Platforms>AnyCPU</Platforms>
     <LangVersion>latest</LangVersion>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <IsAotCompatible>True</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">