netstandard2.1

Author: vilinski

.github/workflows/dotnet.yml

@@ -150,6 +150,7 @@ jobs:
           ls -lahS src/chdb/*
           cp libchdb.so src/chdb/
           ls -lahS src/chdb/libchdb*
+          dontnet nuget sources add -n chdb ./nupkg
           dotnet pack src/chdb-tool/chdb-tool.csproj -c Release --include-symbols --version-suffix ${{ github.run_number }}
           ls -lahS nupkg
 

Directory.Build.props

@@ -1,6 +1,5 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <RuntimeIdentifiers>linux-x64;osx-x64</RuntimeIdentifiers>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -13,7 +12,7 @@
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
         <EnablePackageValidation>true</EnablePackageValidation>
         <PackageOutputPath>../../nupkg</PackageOutputPath>
-        <Version>0.0.2.0$(GITHUB_RUN_NUMBER)</Version>
+        <Version>0.0.3.0$(GITHUB_RUN_NUMBER)</Version>
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
         <PackageVersion Condition="'$(BuildNumber)' != ''">$(Version).$(BuildNumber)</PackageVersion>
         <Authors>vilinski</Authors>

README.md

@@ -52,8 +52,7 @@ Probably you better served using the clickhouse client and run `clickhouse local
 Requires .NET SDK 6.0 or later.
 
 ```bash
-#dotnet tool install --global chdb-tool-<OS>-<ARCH>
-dotnet tool install --global chdb-tool-linux-x64
+dotnet tool install --global chdb-tool
 ```
 
 OS supported: linux, osx

src/chdb-tool/Program.cs

@@ -21,29 +21,28 @@ void PrintHelp()
 if (args.Length == 0 || args[0] == "--help" || args[0] == "-h")
 {
     PrintHelp();
-    return;
 }
-if (args[0] == "--version" || args[0] == "-v")
+else if (args[0] == "--version" || args[0] == "-v")
 {
     PrintVersion();
-    return;
 }
-try
-{
-    var result = ChDb.ChDb.Query(args[0], args.Length > 1 && !args[1].StartsWith('-') ? args[1] : "PrettyCompact");
-    if (result == null)
-        return; // TODO behavior changed in 1.2.1
-    Console.WriteLine(result.Buf);
-    if (!args.Contains("--quiet") && !args.Contains("-q"))
+else
+    try
     {
-        Console.WriteLine($"Elapsed: {result.Elapsed} s, read {result.RowsRead} rows, {result.BytesRead} bytes" +
-                          $", {result.RowsRead / result.Elapsed.TotalSeconds:F0} rows/s, {result.BytesRead / result.Elapsed.TotalSeconds:F0} bytes/s");
-        if (!string.IsNullOrWhiteSpace(result.ErrorMessage))
-            Console.Error.WriteLine("Error message: " + result.ErrorMessage);
+        var result = ChDb.ChDb.Query(args[0], args.Length > 1 && !args[1].StartsWith('-') ? args[1] : "PrettyCompact");
+        if (result == null)
+            return; // TODO behavior changed in 1.2.1
+        Console.WriteLine(result.Text);
+        if (!args.Contains("--quiet") && !args.Contains("-q"))
+        {
+            Console.WriteLine($"Elapsed: {result.Elapsed} s, read {result.RowsRead} rows, {result.BytesRead} bytes" +
+                              $", {result.RowsRead / result.Elapsed.TotalSeconds:F0} rows/s, {result.BytesRead / result.Elapsed.TotalSeconds:F0} bytes/s");
+            if (!string.IsNullOrWhiteSpace(result.ErrorMessage))
+                Console.Error.WriteLine("Error message: " + result.ErrorMessage);
+        }
+    }
+    catch (ArgumentException e)
+    {
+        Console.Error.WriteLine(e.Message);
+        Environment.Exit(1);
     }
-}
-catch (ArgumentException e)
-{
-    Console.Error.WriteLine(e.Message);
-    Environment.Exit(1);
-}

src/chdb-tool/chdb-tool.csproj

@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <PropertyGroup>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>chdb</ToolCommandName>

src/chdb/ChDb.cs

@@ -33,7 +33,8 @@ public static class ChDb
     /// </remarks>
     public static LocalResult? Query(string query, string? format = null)
     {
-        ArgumentNullException.ThrowIfNull(query);
+        if (query is null)
+            throw new ArgumentNullException(nameof(query));
         var argv = new[] {
             "clickhouse",
             "--multiquery",
@@ -49,7 +50,7 @@ public static class ChDb
         {
             var prefix = $"--{key}=";
             if (arg.StartsWith(prefix))
-                return arg[prefix.Length..];
+                return arg.Substring(prefix.Length);
         }
         return null;
     }

src/chdb/LocalResult.cs

@@ -5,28 +5,41 @@ namespace ChDb;
 /// <summary>
 /// The query result.
 /// </summary>
-/// <param name="Buf">Result buffer.</param>
-/// <param name="ErrorMessage">Error message if occured.</param>
-/// <param name="RowsRead">Number of rows read</param>
-/// <param name="BytesRead">Number of bytes read</param>
-/// <param name="Elapsed">Query time elapsed, in seconds.</param>
-public record LocalResult(byte[]? Buf, string? ErrorMessage, ulong RowsRead, ulong BytesRead, TimeSpan Elapsed)
+public record LocalResult
 {
+    public byte[]? Buf { get; }
+    public string? ErrorMessage { get; }
     /// <summary>
     /// By text formats contains a result text.
     /// </summary>
     public string? Text => Buf == null ? null : System.Text.Encoding.UTF8.GetString(Buf);
+    public ulong RowsRead { get; }
+    public ulong BytesRead { get; }
+    public TimeSpan Elapsed { get; }
+
+    /// <param name="Buf">Result buffer.</param>
+    /// <param name="ErrorMessage">Error message if occured.</param>
+    /// <param name="RowsRead">Number of rows read</param>
+    /// <param name="BytesRead">Number of bytes read</param>
+    /// <param name="Elapsed">Query time elapsed, in seconds.</param>
+    public LocalResult(byte[]? Buf, string? ErrorMessage, ulong RowsRead, ulong BytesRead, TimeSpan Elapsed)
+    {
+        this.Buf = Buf;
+        this.ErrorMessage = ErrorMessage;
+        this.RowsRead = RowsRead;
+        this.BytesRead = BytesRead;
+        this.Elapsed = Elapsed;
+    }
 
     internal static LocalResult? FromPtr(nint ptr)
     {
-        Handle? h = null;
         if (ptr == IntPtr.Zero)
             return null;
-        h = Marshal.PtrToStructure<Handle>(ptr);
+        var h = Marshal.PtrToStructure<Handle>(ptr);
         if (h == null)
             return null;
 
-        var errorMessage = h.error_message == IntPtr.Zero ? null : Marshal.PtrToStringUTF8(h.error_message);
+        var errorMessage = h.error_message == IntPtr.Zero ? null : MarshalPtrToStringUTF8(h.error_message);
         if (errorMessage != null)
             return new LocalResult(null, errorMessage, 0, 0, TimeSpan.Zero);
 
@@ -38,6 +51,18 @@ public record LocalResult(byte[]? Buf, string? ErrorMessage, ulong RowsRead, ulo
         return new LocalResult(buf, errorMessage, h.rows_read, h.bytes_read, elapsed);
     }
 
+    private static string MarshalPtrToStringUTF8(nint ptr)
+    {
+        unsafe
+        {
+            var str = (byte*)ptr;
+            var length = 0;
+            for (var i = str; *i != 0; i++, length++) ;
+            var clrString = System.Text.Encoding.UTF8.GetString(str, length);
+            return clrString;
+        }
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     internal class Handle
     {

src/chdb/Session.cs

@@ -5,19 +5,19 @@ public record Session : IDisposable
     /// <summary>
     /// Output format for queries if not explicitely specified. Default is TabSeparated
     /// </summary>
-    public string? Format { get; init; }
+    public string? Format { get; set; }
     /// <summary>
     /// Path to the ClickHouse data directory. If not set, a temporary directory will be used.
     /// </summary>
     public string? DataPath { get; set; } = Path.Combine(Path.GetTempPath(), "chdb_");
     /// <summary>
     /// Query Log Level.
     /// </summary>
-    public string? LogLevel { get; init; }
+    public string? LogLevel { get; set; }
     /// <summary>
     /// Whether to delete the data directory on dispose. Default is true.
     /// </summary>
-    public bool IsTemp { get; init; } = true;
+    public bool IsTemp { get; set; } = true;
 
     public void Dispose()
     {

src/chdb/chdb.csproj

@@ -2,13 +2,15 @@
 
   <PropertyGroup>
     <InternalsVisibleTo>tests</InternalsVisibleTo>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <!-- <PackageId Condition="$(IsLinuxX64) == true" >chdb-linux-x64</PackageId>
     <PackageId Condition="$(IsLinuxArm64) == true" >chdb-linux-arm64</PackageId>
     <PackageId Condition="$(IsOsxX64) == true" >chdb-osx-x64</PackageId>
     <PackageId Condition="$(IsOsxArm64) == true" >chdb-osx-arm64</PackageId> -->
     <PackageId>chdb</PackageId>
     <Title>chdb</Title>
     <Description>chdb native bindings for dotnet core</Description>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

test/ChDbTest/test.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>