Adding Support for .Net 9

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
 	<PropertyGroup Label="Targets">
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
 	<!-- Versioning property for builds and packages -->

benchmark/BDN.benchmark/Parsing/IntegerToResp.cs

@@ -92,14 +92,14 @@ public void WriteInt32BulkString_AllAsciiLengths()
             .. UnsignedInt32MultiplesOfTen.Select(n => n * -1),
             .. UnsignedInt32MultiplesOfTen
         ];
-        public static int[] UnsignedInt32MultiplesOfTen => Enumerable.Range(0, 10).Select(n => (int)Math.Pow(10, n)).ToArray();
+        public static int[] UnsignedInt32MultiplesOfTen => [.. Enumerable.Range(0, 10).Select(n => (int)Math.Pow(10, n))];
 
         // All multiples of 10 from 10^-19 to 10^19
         public static long[] SignedInt64MultiplesOfTen => [
             .. UnsignedInt64MultiplesOfTen.Select(n => n * -1),
             .. UnsignedInt64MultiplesOfTen
         ];
-        public static long[] UnsignedInt64MultiplesOfTen => Enumerable.Range(0, 19).Select(n => (long)Math.Pow(10, n)).ToArray();
+        public static long[] UnsignedInt64MultiplesOfTen => [.. Enumerable.Range(0, 19).Select(n => (long)Math.Pow(10, n))];
 
         public static int[] SignedInt32Values => [int.MinValue, -1, 0, int.MaxValue];
         public static long[] SignedInt64Values => [long.MinValue, -1, 0, long.MaxValue];

benchmark/BDN.benchmark/Program.cs

@@ -21,6 +21,7 @@
 public class BaseConfig : ManualConfig
 {
     public Job Net8BaseJob { get; }
+    public Job Net9BaseJob { get; }
 
     public BaseConfig()
     {
@@ -33,9 +34,12 @@ public BaseConfig()
 
         Net8BaseJob = baseJob.WithRuntime(CoreRuntime.Core80)
             .WithEnvironmentVariables(new EnvironmentVariable("DOTNET_TieredPGO", "0"));
+        Net9BaseJob = baseJob.WithRuntime(CoreRuntime.Core90)
+            .WithEnvironmentVariables(new EnvironmentVariable("DOTNET_TieredPGO", "0"));
 
         AddJob(
-            Net8BaseJob.WithId(".NET 8")
+            Net8BaseJob.WithId(".NET 8"),
+            Net9BaseJob.WithId(".NET 9")
             );
     }
 }

benchmark/Resp.benchmark/BenchUtils.cs

@@ -4,10 +4,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using Garnet.common;
 using Garnet.server;
+using Garnet.server.TLS;
 using StackExchange.Redis;
 
 namespace Resp.benchmark
@@ -62,7 +62,7 @@ public static SslClientAuthenticationOptions GetTlsOptions(string tlsHost, strin
         {
             return new SslClientAuthenticationOptions
             {
-                ClientCertificates = [new X509Certificate2(certFile, certPassword)],
+                ClientCertificates = [CertificateUtils.GetMachineCertificateByFile(certFile, certPassword)],
                 TargetHost = tlsHost,
                 AllowRenegotiation = false,
                 RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true,

benchmark/Resp.benchmark/Program.cs

@@ -215,7 +215,7 @@ static void WaitForServer(Options opts)
 
         static void RunBasicCommandsBenchmark(Options opts)
         {
-            int[] threadBench = opts.NumThreads.ToArray();
+            int[] threadBench = [.. opts.NumThreads];
             int keyLen = opts.KeyLength;
             int valueLen = opts.ValueLength;
 
@@ -275,7 +275,7 @@ static void RunBasicCommandsBenchmark(Options opts)
         static void RunHLLBenchmark(Options opts)
         {
             var bench = new RespPerfBench(opts, 0, redis);
-            int[] threadBench = opts.NumThreads.ToArray();
+            int[] threadBench = [.. opts.NumThreads];
 
             int loadThreads = 8;
             int loadBatchSize = opts.DbSize / loadThreads;

benchmark/Resp.benchmark/RespPerfBench.cs

@@ -501,7 +501,7 @@ private void MGetThreadRunner(int threadid, int NumOps, int BatchSize = 1 << 12)
             }
             if (idx > 0)
             {
-                var result = db.StringGet(getBatch.Take(idx).ToArray());
+                var result = db.StringGet([.. getBatch.Take(idx)]);
                 if (checkResults)
                 {
                     for (int k = 0; k < idx; k++)
@@ -543,7 +543,7 @@ private void LoadDatabaseStringSet(int BatchSize = 1 << 12)
             {
                 for (int b = 0; b < DbSize; b += BatchSize)
                 {
-                    db.StringSet(database.Skip(b).Take(BatchSize).ToArray());
+                    db.StringSet([.. database.Skip(b).Take(BatchSize)]);
                     if (b > 0 && b % 1000000 == 0)
                         Console.WriteLine(b);
                 }

hosting/Windows/Garnet.worker/Garnet.worker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net8.0;net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

libs/common/EnumUtils.cs

@@ -42,7 +42,7 @@ public static IDictionary<string, string> GetEnumNameToDescription<T>() where T
         public static string[] GetEnumDescriptions<T>(T value) where T : Enum
         {
             var nameToDesc = GetEnumNameToDescription<T>();
-            return value.ToString().Split(',').Select(f => nameToDesc.ContainsKey(f.Trim()) ? nameToDesc[f.Trim()] : f).ToArray();
+            return [.. value.ToString().Split(',').Select(f => nameToDesc.ContainsKey(f.Trim()) ? nameToDesc[f.Trim()] : f)];
         }
 
         /// <summary>

libs/common/FailoverOption.cs

@@ -50,8 +50,7 @@ public enum FailoverOption : byte
     /// </summary>
     public static class FailoverUtils
     {
-        static readonly byte[][] infoSections = Enum.GetValues<FailoverOption>()
-            .Select(x => Encoding.ASCII.GetBytes($"${x.ToString().Length}\r\n{x}\r\n")).ToArray();
+        static readonly byte[][] infoSections = [.. Enum.GetValues<FailoverOption>().Select(x => Encoding.ASCII.GetBytes($"${x.ToString().Length}\r\n{x}\r\n"))];
 
         /// <summary>
         /// Return resp formatted failover option

libs/common/FileUtils.cs

@@ -159,13 +159,15 @@ public static bool TryLoadAssemblies(IEnumerable<string> assemblyPaths, out IEnu
                     Assembly assembly;
                     try
                     {
-                        assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+                        // NET9 seems to hold the assembly locked if it's opened from the path directly, causing tests to fail.
+                        //assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+                        assembly = AssemblyLoadContext.Default.LoadFromStream(new FileStream(path, FileMode.Open, FileAccess.Read));
                     }
                     catch (Exception ex) when (ex is IOException || ex is UnauthorizedAccessException ||
                                                ex is NotSupportedException || ex is BadImageFormatException ||
                                                ex is SecurityException)
                     {
-                        if (ex is FileLoadException && ex.Message == "Assembly with same name is already loaded")
+                        if (ex is FileLoadException && ex.Message.Contains("Assembly with same name is already loaded"))
                         {
                             var assemblyName = AssemblyName.GetAssemblyName(path).Name;
                             tmpAssemblies.Add(AssemblyLoadContext.Default.Assemblies.First(a => a.GetName().Name == assemblyName));

libs/common/Metrics/InfoMetricsType.cs

@@ -85,8 +85,7 @@ public enum InfoMetricsType : byte
     /// </summary>
     public static class InfoCommandUtils
     {
-        static readonly byte[][] infoSections = Enum.GetValues<InfoMetricsType>()
-            .Select(x => Encoding.ASCII.GetBytes($"${x.ToString().Length}\r\n{x}\r\n")).ToArray();
+        static readonly byte[][] infoSections = [.. Enum.GetValues<InfoMetricsType>().Select(x => Encoding.ASCII.GetBytes($"${x.ToString().Length}\r\n{x}\r\n"))];
 
         /// <summary>
         /// Return resp formatted info section

libs/host/Garnet.host.csproj

@@ -39,6 +39,8 @@
   <ItemGroup>
     <Content Include="..\host\bin\Release\net8.0\*.dll" Pack="true" PackagePath="lib\net8.0" />
     <Content Include="..\host\bin\Release\net8.0\*.xml" Pack="true" PackagePath="lib\net8.0" />
+    <Content Include="..\host\bin\Release\net9.0\*.dll" Pack="true" PackagePath="lib\net9.0" />
+    <Content Include="..\host\bin\Release\net9.0\*.xml" Pack="true" PackagePath="lib\net9.0" />
     <Content Include="..\host\bin\Release\net8.0\runtimes\**\*.so" Pack="true" PackagePath="runtimes" />
     <Content Include="..\host\bin\Release\net8.0\runtimes\**\*.dll" Pack="true" PackagePath="runtimes" />
     <None Include="..\..\README.md" Pack="true" PackagePath="/"/>

libs/server/Custom/CustomCommandManager.cs

@@ -58,8 +58,10 @@ internal int Register(string name, CommandType type, CustomRawStringFunctions cu
             var newCmd = new CustomRawStringCommand(name, (ushort)extId, type, customFunctions, expirationTicks);
             var setSuccessful = rawStringCommandMap.TrySetValue(cmdId, ref newCmd);
             Debug.Assert(setSuccessful);
-            if (commandInfo != null) customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
-            if (commandDocs != null) customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
+            if (commandInfo != null) 
+                customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
+            if (commandDocs != null) 
+                customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
             return extId;
         }
 
@@ -73,8 +75,10 @@ internal int Register(string name, Func<CustomTransactionProcedure> proc, RespCo
             var newCmd = new CustomTransaction(name, (byte)cmdId, proc);
             var setSuccessful = transactionProcMap.TrySetValue(cmdId, ref newCmd);
             Debug.Assert(setSuccessful);
-            if (commandInfo != null) customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
-            if (commandDocs != null) customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
+            if (commandInfo != null)
+                customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
+            if (commandDocs != null)
+                customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
             return cmdId;
         }
 
@@ -106,8 +110,10 @@ internal int RegisterType(CustomObjectFactory factory)
             var scSetSuccessful = wrapper.commandMap.TrySetValue(scId, ref newSubCmd);
             Debug.Assert(scSetSuccessful);
 
-            if (commandInfo != null) customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
-            if (commandDocs != null) customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
+            if (commandInfo != null)
+                customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
+            if (commandDocs != null)
+                customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
 
             return (extId, scId);
         }
@@ -132,8 +138,10 @@ internal int Register(string name, Func<CustomProcedure> customProcedure, RespCo
             var setSuccessful = customProcedureMap.TrySetValue(cmdId, ref newCmd);
             Debug.Assert(setSuccessful);
 
-            if (commandInfo != null) customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
-            if (commandDocs != null) customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
+            if (commandInfo != null)
+                customCommandsInfo.AddOrUpdate(name, commandInfo, (_, _) => commandInfo);
+            if (commandDocs != null)
+                customCommandsDocs.AddOrUpdate(name, commandDocs, (_, _) => commandDocs);
             return cmdId;
         }
 

libs/server/Custom/ExpandableMap.cs

@@ -247,6 +247,27 @@ internal bool TrySetValue(int id, ref T value, bool noExpansion, bool updateSize
             if (updateSize) TryUpdateSize(id);
             return true;
         }
+
+        /// <summary>
+        /// Maps map index to item ID
+        /// </summary>
+        /// <param name="index">Map index</param>
+        /// <returns>Item ID</returns>
+        private int GetIdFromIndex(int index) => descIds ? minId - index : index;
+
+        /// <summary>
+        /// Maps an item ID to a map index
+        /// </summary>
+        /// <param name="id">Item ID</param>
+        /// <returns>Map index</returns>
+        private int GetIndexFromId(int id) => descIds ? minId - id : id;
+
+        public void Clear()
+        {
+            if (Map is not null)
+                Array.Clear(Map);
+            ActualSize = 0;
+        }
     }
 
     /// <summary>

libs/server/Metrics/Info/GarnetInfoMetrics.cs

@@ -12,16 +12,15 @@ namespace Garnet.server
 {
     class GarnetInfoMetrics
     {
-        public static readonly InfoMetricsType[] defaultInfo = Enum.GetValues<InfoMetricsType>()
+        public static readonly InfoMetricsType[] defaultInfo = [.. Enum.GetValues<InfoMetricsType>()
             .Where(e => e switch
             {
                 InfoMetricsType.STOREHASHTABLE => false,
                 InfoMetricsType.OBJECTSTOREHASHTABLE => false,
                 InfoMetricsType.STOREREVIV => false,
                 InfoMetricsType.OBJECTSTOREREVIV => false,
                 _ => true
-            })
-            .ToArray();
+            })];
 
         MetricsItem[] serverInfo = null;
         MetricsItem[] memoryInfo = null;

libs/server/Objects/SortedSet/SortedSetObjectImpl.cs

@@ -1015,10 +1015,9 @@ private void SortedSetPopMinOrMaxCount(ref ObjectInput input, ref SpanByteAndMem
 
                 if (validLimit)
                 {
-                    elementsInLex = elementsInLex
+                    elementsInLex = [.. elementsInLex
                                         .Skip(limit.Item1 > 0 ? limit.Item1 : 0)
-                                        .Take(limit.Item2 > 0 ? limit.Item2 : elementsInLex.Count)
-                                        .ToList();
+                                        .Take(limit.Item2 > 0 ? limit.Item2 : elementsInLex.Count)];
                 }
             }
             catch (ArgumentException)
@@ -1067,10 +1066,9 @@ private void SortedSetPopMinOrMaxCount(ref ObjectInput input, ref SpanByteAndMem
             if (doReverse) scoredElements.Reverse();
             if (validLimit)
             {
-                scoredElements = scoredElements
+                scoredElements = [.. scoredElements
                                  .Skip(limit.Item1 > 0 ? limit.Item1 : 0)
-                                 .Take(limit.Item2 > 0 ? limit.Item2 : scoredElements.Count)
-                                 .ToList();
+                                 .Take(limit.Item2 > 0 ? limit.Item2 : scoredElements.Count)];
             }
 
             if (rem)

libs/server/Objects/SortedSetGeo/SortedSetGeoObjectImpl.cs

@@ -409,7 +409,7 @@ private void GeoSearch(ref ObjectInput input, ref SpanByteAndMemory output)
                 }
 
                 // Check that we have the mandatory options
-                if (errorMessage == default && !((opts.FromMember || opts.FromLonLat) && (opts.ByRadius || opts.ByBox)))
+                if (errorMessage.IsEmpty && !((opts.FromMember || opts.FromLonLat) && (opts.ByRadius || opts.ByBox)))
                     argNumError = true;
 
                 // Check if we have a wrong number of arguments
@@ -420,7 +420,7 @@ private void GeoSearch(ref ObjectInput input, ref SpanByteAndMemory output)
                 }
 
                 // Check if we encountered an error while checking the parse state
-                if (errorMessage != default)
+                if (!errorMessage.IsEmpty)
                 {
                     while (!RespWriteUtils.WriteError(errorMessage, ref curr, end))
                         ObjectUtils.ReallocateOutput(ref output, ref isMemory, ref ptr, ref ptrHandle, ref curr, ref end);

libs/server/Resp/RespCommandsInfo.cs

@@ -184,8 +184,8 @@ private static bool TryInitializeRespCommandsInfo(ILogger logger = null)
                 .Where(ci => !ci.Value.IsInternal)
                 .ToDictionary(kvp => kvp.Key, kvp => kvp.Value, StringComparer.OrdinalIgnoreCase));
             ExternalRespSubCommandsInfo = new ReadOnlyDictionary<string, RespCommandsInfo>(tmpExternalSubCommandsInfo);
-            AllRespCommandNames = ImmutableHashSet.Create(StringComparer.OrdinalIgnoreCase, AllRespCommandsInfo.Keys.ToArray());
-            ExternalRespCommandNames = ImmutableHashSet.Create(StringComparer.OrdinalIgnoreCase, ExternalRespCommandsInfo.Keys.ToArray());
+            AllRespCommandNames = ImmutableHashSet.Create(StringComparer.OrdinalIgnoreCase, [.. AllRespCommandsInfo.Keys]);
+            ExternalRespCommandNames = ImmutableHashSet.Create(StringComparer.OrdinalIgnoreCase, [.. ExternalRespCommandsInfo.Keys]);
             FlattenedRespCommandsInfo = new ReadOnlyDictionary<RespCommand, RespCommandsInfo>(tmpFlattenedRespCommandsInfo);
 
             AclCommandInfo =
@@ -196,7 +196,7 @@ private static bool TryInitializeRespCommandsInfo(ILogger logger = null)
                         .GroupBy(static t => t.Acl)
                         .ToDictionary(
                             static grp => grp.Key,
-                            static grp => (IReadOnlyList<RespCommandsInfo>)ImmutableArray.CreateRange(grp.Select(static t => t.CommandInfo))
+                            static grp => (IReadOnlyList<RespCommandsInfo>)[.. grp.Select(static t => t.CommandInfo)]
                         )
                 );
 

libs/server/ServerConfig.cs

@@ -12,13 +12,13 @@ namespace Garnet.server
 {
     static class ServerConfig
     {
-        public static readonly HashSet<ServerConfigType> DefaultConfigType = Enum.GetValues<ServerConfigType>().
+        public static readonly HashSet<ServerConfigType> DefaultConfigType = [.. Enum.GetValues<ServerConfigType>().
             Where(e => e switch
             {
                 ServerConfigType.NONE => false,
                 ServerConfigType.ALL => false,
                 _ => true
-            }).ToHashSet();
+            })];
 
         public static unsafe ServerConfigType GetConfig(Span<byte> parameter)
         {

libs/server/StoreWrapper.cs

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

libs/server/TLS/CertificateUtils.cs

@@ -58,7 +58,11 @@ public static X509Certificate2 GetMachineCertificateBySubjectName(string subject
         /// <exception cref="ArgumentException"></exception>
         public static X509Certificate2 GetMachineCertificateByFile(string fileName, string password)
         {
+#if NET9_0_OR_GREATER
+            return X509CertificateLoader.LoadPkcs12FromFile(fileName, password);
+#else
             return new X509Certificate2(fileName, password);
+#endif
         }
     }
 }

libs/server/TLS/GarnetTlsOptions.cs

@@ -257,7 +257,11 @@ X509Certificate2 GetCertificateIssuer(string issuerCertificatePath)
             {
                 try
                 {
+#if NET9_0_OR_GREATER
+                    issuer = X509CertificateLoader.LoadCertificateFromFile(issuerCertificatePath); 
+#else
                     issuer = new X509Certificate2(issuerCertificatePath);
+#endif
                 }
                 catch (Exception ex)
                 {
@@ -295,9 +299,7 @@ bool ValidateCertificateIssuer(X509Certificate2 certificateToValidate, X509Certi
                 var chainBuilt = chain.Build(certificateToValidate);
                 if (!chainBuilt)
                 {
-                    string[] errors = chain.ChainStatus
-                        .Select(x => String.Format("{0} ({1})", x.StatusInformation.Trim(), x.Status))
-                        .ToArray();
+                    string[] errors = [.. chain.ChainStatus.Select(x => String.Format("{0} ({1})", x.StatusInformation.Trim(), x.Status))];
                     string certificateErrorsString = "Unknown errors.";
                     if (errors != null && errors.Length > 0)
                         certificateErrorsString = String.Join(", ", errors);