chore: separate native lib + use standard dotnet runtime setup

olavloite · olavloite · commit c25dceee4300 · 2025-06-30T11:25:48.000+02:00
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/GoSlice.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/GoSlice.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Google.Cloud.SpannerLib.Native
+{
+
+    internal class DisposableGoSlice : IDisposable
+    {
+        private readonly GCHandle? _handle;
+        internal GoSlice GoSlice { get; }
+
+        internal static DisposableGoSlice Create(byte[]? value)
+        {
+            var (handle, length, capacity) = Pin(value);
+            return new DisposableGoSlice(handle,
+                new GoSlice(handle?.AddrOfPinnedObject() ?? IntPtr.Zero, length, capacity));
+        }
+
+        private DisposableGoSlice(GCHandle? handle, GoSlice goSlice)
+        {
+            _handle = handle;
+            GoSlice = goSlice;
+        }
+
+        private static (GCHandle?, int, int) Pin(byte[]? value)
+        {
+            if (value is null)
+            {
+                return (null, 0, 0);
+            }
+
+            var length = value.Length;
+            var handle = GCHandle.Alloc(value, GCHandleType.Pinned);
+            return (handle, length, length);
+        }
+
+        public void Dispose()
+        {
+            _handle?.Free();
+        }
+
+    }
+
+    internal struct GoSlice
+    {
+        public IntPtr Pointer;
+        public long Length;
+        public long Capacity;
+
+        internal GoSlice(IntPtr pointer, long length, long capacity)
+        {
+            Pointer = pointer;
+            Length = length;
+            Capacity = capacity;
+        }
+
+    }
+}
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/GoString.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/GoString.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Google.Cloud.SpannerLib.Native
+{
+
+    internal unsafe struct GoString : IDisposable
+    {
+        IntPtr Pointer { get; }
+        internal long Length;
+
+        internal GoString(string value)
+        {
+            (Pointer, Length) = StringToHGlobalUtf8(value);
+        }
+
+        private static (IntPtr, int) StringToHGlobalUtf8(string? s)
+        {
+            if (s is null)
+            {
+                return (IntPtr.Zero, 0);
+            }
+
+            var nb = Encoding.UTF8.GetMaxByteCount(s.Length);
+            var ptr = Marshal.AllocHGlobal(nb);
+
+            var pbMem = (byte*)ptr;
+            var nbWritten = Encoding.UTF8.GetBytes(s, new Span<byte>(pbMem, nb));
+
+            return (ptr, nbWritten);
+        }
+
+        public void Dispose()
+        {
+            Marshal.FreeHGlobal(Pointer);
+        }
+    }
+}
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/Google.Cloud.SpannerLib.Native.csproj b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/Google.Cloud.SpannerLib.Native.csproj
@@ -0,0 +1,18 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>9</LangVersion>
+    <PackageId>Experimental.SpannerLib.Native</PackageId>
+    <Title>Experimental native library for Spanner</Title>
+    <Authors />
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <None Include="libraries/linux-x64/spannerlib.so" Pack="true" PackagePath="runtimes/linux-x64/native/" />
+    <None Include="libraries/osx-arm64/spannerlib.dylib" Pack="true" PackagePath="runtimes/osx-arm64/native/" />
+  </ItemGroup>
+
+</Project>
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/Message.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/Message.cs
@@ -0,0 +1,13 @@
+namespace Google.Cloud.SpannerLib.Native
+{
+    internal unsafe struct Message
+    {
+#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
+        public long Pinner;
+        public int Code;
+        public long ObjectId;
+        public int Length;
+        public void* Pointer;
+#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
+    }
+}
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/MessageHandler.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/MessageHandler.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Data;
+using System.Text;
+
+namespace Google.Cloud.SpannerLib.Native
+{
+
+    internal class MessageHandler : IDisposable
+    {
+        private Message Message { get; }
+
+        internal long Length => Message.Length;
+
+        internal MessageHandler(Message message)
+        {
+            Message = message;
+        }
+
+        internal int Code()
+        {
+            return Message.Code;
+        }
+
+        internal long ObjectId()
+        {
+            return Message.ObjectId;
+        }
+
+        internal bool HasError()
+        {
+            return Message.Code != 0;
+        }
+
+        internal string? Error()
+        {
+            if (!HasError())
+            {
+                return null;
+            }
+
+            return ValueAsString();
+        }
+
+        internal string ValueAsString()
+        {
+            unsafe
+            {
+                Span<byte> tmp = new(Message.Pointer, Message.Length);
+                return Encoding.UTF8.GetString(tmp);
+            }
+        }
+
+        internal unsafe ReadOnlySpan<byte> Value()
+        {
+            return new(Message.Pointer, Message.Length);
+        }
+
+        public void Dispose()
+        {
+            var code = SpannerLib.Release(Message.Pinner);
+            if (code != 0)
+            {
+                throw new DataException("Failed to release message");
+            }
+        }
+    }
+}
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/SpannerLib.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/SpannerLib.cs
@@ -0,0 +1,81 @@
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: InternalsVisibleTo("Google.Cloud.SpannerLib")]
+
+namespace Google.Cloud.SpannerLib.Native
+{
+    public static class SpannerLib
+    {
+        private const string SpannerLibName = "spannerlib";
+        
+        [DllImport(SpannerLibName, EntryPoint = "Release")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern int Release(long pinner);
+
+        [DllImport(SpannerLibName, EntryPoint = "CreatePool")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message CreatePool(GoString dsn);
+
+        [DllImport(SpannerLibName, EntryPoint = "ClosePool")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message ClosePool(long poolId);
+
+        [DllImport(SpannerLibName, EntryPoint = "CreateConnection")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message CreateConnection(long poolId);
+
+        [DllImport(SpannerLibName, EntryPoint = "CloseConnection")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message CloseConnection(long poolId, long connectionId);
+
+        [DllImport(SpannerLibName, EntryPoint = "Apply")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Apply(long poolId, long connectionId, GoSlice mutations);
+
+        [DllImport(SpannerLibName, EntryPoint = "BufferWrite")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message BufferWrite(long poolId, long connectionId, long transactionId,
+            GoSlice mutations);
+
+        [DllImport(SpannerLibName, EntryPoint = "Execute")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Execute(long poolId, long connectionId, GoSlice statement);
+
+        [DllImport(SpannerLibName, EntryPoint = "ExecuteTransaction")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message ExecuteTransaction(long poolId, long connectionId, long txId, GoSlice statement);
+
+        [DllImport(SpannerLibName, EntryPoint = "ExecuteBatchDml")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message ExecuteBatchDml(long poolId, long connectionId, GoSlice statements);
+
+        [DllImport(SpannerLibName, EntryPoint = "Metadata")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Metadata(long poolId, long connectionId, long rowsId);
+
+        [DllImport(SpannerLibName, EntryPoint = "ResultSetStats")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message ResultSetStats(long poolId, long connectionId, long rowsId);
+
+        [DllImport(SpannerLibName, EntryPoint = "Next")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Next(long poolId, long connectionId, long rowsId);
+
+        [DllImport(SpannerLibName, EntryPoint = "CloseRows")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message CloseRows(long poolId, long connectionId, long rowsId);
+
+        [DllImport(SpannerLibName, EntryPoint = "BeginTransaction")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message BeginTransaction(long poolId, long connectionId, GoSlice transactionOptions);
+
+        [DllImport(SpannerLibName, EntryPoint = "Commit")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Commit(long poolId, long connectionId, long txId);
+
+        [DllImport(SpannerLibName, EntryPoint = "Rollback")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
+        internal static extern Message Rollback(long poolId, long connectionId, long txId);
+    }
+}
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/linux-x64/spannerlib.so b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/linux-x64/spannerlib.so
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/osx-arm64/spannerlib.dylib b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/osx-arm64/spannerlib.dylib
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/AbstractLibObject.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/AbstractLibObject.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.CompilerServices;
 
 namespace Google.Cloud.SpannerLib
 {
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/Google.Cloud.SpannerLib.csproj b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/Google.Cloud.SpannerLib.csproj
@@ -8,10 +8,11 @@
     <Authors></Authors>
     <Description>Experimental .NET library for Spanner</Description>
     <PackageId>Experimental.SpannerLib</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Experimental.SpannerLib.Native" Version="1.0.0" />
     <PackageReference Include="Google.Cloud.Spanner.Admin.Database.V1" Version="5.0.0" />
     <PackageReference Include="Google.Cloud.Spanner.V1" Version="5.0.0" />
   </ItemGroup>
@@ -28,5 +29,10 @@
       <pack>true</pack>
     </Content>
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="native/linux-x64/spannerlib.so" Pack="true" PackagePath="runtimes/linux-x64/native/" />
+    <None Include="native/osx-arm64/spannerlib.dylib" Pack="true" PackagePath="runtimes/osx-arm64/native/" />
+  </ItemGroup>
 
 </Project>
diff --git a/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/Spanner.cs b/spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/Spanner.cs
diff --git a/spannerlib/dotnet-spannerlib/dotnet-spannerlib.sln b/spannerlib/dotnet-spannerlib/dotnet-spannerlib.sln

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Runtime.CompilerServices;`
`3`	`2`
`4`	`3`	`namespace Google.Cloud.SpannerLib`
`5`	`4`	`{`