Making Windows auto resize work with netcore3.1 and net5.0 (#138)

Making Windows auto resize work with netcore3.1 and net5.0

Author: CoreyKaylor

.github/workflows/dotnetcoretest.yml

@@ -28,9 +28,9 @@ jobs:
         run: make
         if: matrix.os == 'ubuntu-latest'
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v1.8.0
         with:
-          dotnet-version: 3.1.101
+          dotnet-version: 5.0.301
       - name: Install dependencies
         working-directory: ${{ runner.workspace }}/Lightning.NET
         run: dotnet restore
@@ -39,9 +39,9 @@ jobs:
         run: dotnet build --configuration Release --no-restore
       - name: Test (Linux)
         working-directory: ${{ runner.workspace }}/Lightning.NET
-        run: LD_LIBRARY_PATH=${{ runner.workspace}}/Lightning.NET/lmdb/libraries/liblmdb/:$LD_LIBRARY_PATH dotnet test -f netcoreapp3.1 --no-restore --verbosity normal
+        run: LD_LIBRARY_PATH=${{ runner.workspace}}/Lightning.NET/lmdb/libraries/liblmdb/:$LD_LIBRARY_PATH dotnet test -f net5.0 --no-restore --verbosity normal
         if: matrix.os == 'ubuntu-latest'
       - name: Test (Windows or Mac)
         working-directory: ${{ runner.workspace }}/Lightning.NET
-        run: dotnet test -f netcoreapp3.1 --no-restore --verbosity normal
+        run: dotnet test -f net5.0 --no-restore --verbosity normal
         if: matrix.os == 'windows-latest' || matrix.os == 'macos-latest' 

src/LightningDB.Benchmarks/LightningDB.Benchmarks.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/LightningDB.Tests/EnvironmentTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using Xunit;
 
 namespace LightningDB.Tests
@@ -142,5 +143,29 @@ public void CanOpenEnvironmentMoreThan50Mb()
 
             _env.Open();
         }
+        
+        
+#if (NETCOREAPP3_1 || NET5_0)
+        [Fact(Skip = "Run manually, behavior will override all tests with auto resize")]
+        public void CreateEnvironmentWithAutoResize()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                using (var env = new LightningEnvironment(_path, new EnvironmentConfiguration
+                {
+                    MapSize = 10 * 1024 * 1024,
+                    AutoResizeWindows = true,
+                }))
+                {
+                    env.Open();
+                }
+
+                using (var dbFile = File.OpenRead(Path.Combine(_path, "data.mdb")))
+                {
+                    Assert.Equal(8192, dbFile.Length);
+                }
+            }
+        }
+#endif
     }
 }

src/LightningDB.Tests/LightningDB.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <AssemblyName>LightningDB.Tests</AssemblyName>
     <PackageId>LightningDB.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

src/LightningDB/EnvironmentConfiguration.cs

@@ -8,6 +8,16 @@ public class EnvironmentConfiguration
         private long? _mapSize;
         private int? _maxReaders;
         private int? _maxDatabases;
+        
+#if NETCOREAPP3_1 || NET5_0
+        private bool? _autoResizeWindows;
+        
+        public bool AutoResizeWindows
+        {
+            get { return _autoResizeWindows ?? false; }
+            set { _autoResizeWindows = value; }
+        }
+#endif
 
         public long MapSize
         {

src/LightningDB/LightningDB.csproj

@@ -4,7 +4,7 @@
     <Description>LightningDB</Description>
     <VersionPrefix>0.13.0</VersionPrefix>
     <Authors>Ilya Lukyanov;Corey Kaylor</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <AssemblyName>LightningDB</AssemblyName>
     <PackageId>LightningDB</PackageId>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>

src/LightningDB/LightningDB.targets

@@ -9,9 +9,19 @@
       <Link>lmdb.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)$(LightningDBTargetRuntimeRelativePath)runtimes\win-x64\native\lmdbautoresize.dll">
+      <Visible>false</Visible>
+      <Link>lmdbautoresize.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup Condition="'$([MSBuild]::IsOsPlatform(Windows))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">
     <None Include="$(MSBuildThisFileDirectory)$(LightningDBTargetRuntimeRelativePath)runtimes\win-x86\native\lmdb.dll">
+      <Visible>false</Visible>
+      <Link>lmdbautoresize.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)$(LightningDBTargetRuntimeRelativePath)runtimes\win-x86\native\lmdbautoresize.dll">
       <Visible>false</Visible>
       <Link>lmdb.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/LightningDB/LightningEnvironment.cs

@@ -24,14 +24,21 @@ public LightningEnvironment(string path, EnvironmentConfiguration configuration
         {
             if (string.IsNullOrWhiteSpace(path))
                 throw new ArgumentException("Invalid directory name");
+            
+            var config = configuration ?? _config;
+#if NETCOREAPP3_1 || NET5_0
+            if (config.AutoResizeWindows)
+            {
+                LoadWindowsAutoResizeLibrary();
+            }
+#endif
 
             mdb_env_create(out _handle).ThrowOnError();
+            config.Configure(this);
+            _config = config;
 
             Path = path;
 
-            var config = configuration ?? _config;
-            config.Configure(this);
-            _config = config;
         }
 
         public IntPtr Handle()

src/LightningDB/LightningExtensions.cs

@@ -52,7 +52,7 @@ public static (MDBResultCode resultCode, MDBValue key, MDBValue value) ThrowOnRe
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static string mdb_strerror(int err)
         {
-            var ptr = LmdbMethods.mdb_strerror(err);
+            var ptr = Lmdb.mdb_strerror(err);
             return Marshal.PtrToStringAnsi(ptr);
         }