improvements

Author: vilinski

.github/workflows/dotnet.yml

@@ -30,11 +30,6 @@ jobs:
       env:
         DOTNET_NOLOGO: 1
         DOTNET_CLI_TELEMETRY_OPTOUT: 1
-#    - name: Setup dotnet ${{ matrix.dotnet-version }}
-#      uses: actions/setup-dotnet@v3
-#      with:
-#        dotnet-version: ${{ matrix.dotnet-version }}
-
 #    - name: Cache libchdb.so
 #      id: cache-libchdb
 #      uses: actions/cache@v4
@@ -64,9 +59,10 @@ jobs:
         path: TestResults-${{ matrix.dotnet-version }}
       # Use always() to always run this step to publish test results when there are test failures
       if: ${{ always() }}
+    - name: Test chdb-tool
+      run: |
+        dotnet tool install --global chdb-tool --version 0.0.1
+        chdb --help
+        chdb "select version()" PrettyCompact
     - name: Pack
-      run: dotnet pack -c Release --include-symbols
-#    - name: Publish the package to nuget.org
-#      run: dotnet nuget push nupkg/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
-#      env:
-#        NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
+      run: dotnet pack -c Release --include-symbols

README.md

@@ -1,12 +1,15 @@
 # chdb
 
-[![Build Status](https://dev.azure.com/ChDB/ChDB/_apis/build/status/ChDB.chdb?branchName=master)](https://dev.azure.com/ChDB/ChDB/_build/latest?definitionId=1&branchName=master)
-[![NuGet](https://img.shields.io/nuget/v/ChDB.svg)](https://www.nuget.org/packages/ChDB/)
-[![NuGet](https://img.shields.io/nuget/dt/ChDB.svg)](https://www.nuget.org/packages/ChDB/)
-[![License](https://img.shields.io/github/license/ChDB/chdb.svg)](https://github.com/vilinski/chdb/LICENSE.md)
+![GitHub License](https://img.shields.io/github/license/chdb-io/chdb-dotnet)
+![example workflow](https://github.com/chdb-io/chdb-dotnet/actions/workflows/dotnet.yml/badge.svg)
+
 
 ## chdb NuGet package
 
+![NuGet Version](https://img.shields.io/nuget/vpre/chdb)
+![NuGet Downloads](https://img.shields.io/nuget/dt/chdb)
+
+
 A .NET Core binding for [chdb](https://doc.chdb.io) library.
 
 
@@ -22,7 +25,7 @@ dotnet add package chdb
 using ChDb;
 
 var result = ChDb.Query("select version()");
-Console.WriteLine(result);
+Console.WriteLine(result.Buf);
 // 23.10.1.1
 var result = ChDb.Query("select * from system.formats where is_output = 1", "PrettyCompact");
 // ┌─name───────────────────────────────────────┬─is_input─┬─is_output─┬─supports_parallel_parsing─┬─supports_parallel_formatting─┐
@@ -33,18 +36,25 @@ var result = ChDb.Query("select * from system.formats where is_output = 1", "Pre
 // │ ODBCDriver2                                │        0 │         1 │                         0 │                            0 │
 // ...
 var result = ChDb.Query("DESCRIBE s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/house_parquet/house_0.parquet')");
-Console.WriteLine(result.Buf); 
+Console.WriteLine(result.Buf);
 ```
 
 ## chdb-tool
 
-This is a dotnet tool for [chdb](https://doc.chdb.io) library. 
-Actually you better just install clickhouse client and run `clickhouse local`
+![NuGet Version](https://img.shields.io/nuget/vpre/chdb-tool)
+![NuGet Downloads](https://img.shields.io/nuget/dt/chdb-tool)
+
+This is a dotnet tool, running [chdb](https://doc.chdb.io) library.
+Actually you better install the clickhouse client and run `clickhouse local`, but maybe it is more useful for some cases.
+
+>Note for windows users - there is no windows bild in sight, but you can use it in WSL.
 
 ### Installation
 
+Requires .NET SDK 6.0 or later.
+
 ```bash
-dotnet tool install -g chdb-tool
+dotnet tool install --global chdb-tool
 ```
 
 ### Usage
@@ -55,15 +65,15 @@ Try any of this commands lines to see which output you get.
 chdb
 chdb --version
 chdb --help
-chdb "select version()" 
+chdb "select version()"
 chdb "select * from system.formats where is_output = 1" PrettyCompact
 ```
 
 # Build
 
 ```bash
 # update latest chdb version
-./update_libchdb.sh
+./update_libchdb.sh [v1.2.1]
 # install versionbump tool
 dotnet tool install -g BumpVersion
 # bump version
@@ -73,4 +83,4 @@ git push --foloow-tags
 
 ## Authors
 
-* [Andreas Vilinski](https://github.com/vilinski)
+* [Andreas Vilinski](https://github.com/vilinski)

src/chdb-tool/Program.cs

@@ -35,9 +35,12 @@ void PrintHelp()
         return; // TODO behavior changed in 1.2.1
     Console.WriteLine(result.Buf);
     if (!args.Contains("--quiet") && !args.Contains("-q"))
-        Console.WriteLine($"Elapsed: {result.Elapsed} s, read {result.RowsRead} rows, {result.BytesRead} bytes");
-    if (!string.IsNullOrWhiteSpace(result.ErrorMessage))
-        Console.Error.WriteLine("Error message: " + result.ErrorMessage);
+    {
+        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)
 {

src/chdb/ChDb.cs

@@ -67,13 +67,17 @@ public static class ChDb
         }
         catch (RuntimeWrappedException e)
         {
-            Console.Error.WriteLine($"Native error {e.Message}", e);
-            throw;
+            var s = e.WrappedException as string;
+            if (s != null)
+                throw new ArgumentException(s);
+            else
+                Console.Error.WriteLine($"Unmanaged error {e.WrappedException}");
         }
         catch (Exception e)
         {
             Console.Error.WriteLine($"Managed error {e.Message}", e);
             throw;
         }
+        return null;
     }
 }

src/chdb/Session.cs

@@ -1,21 +1,32 @@
 namespace ChDb;
 
-public record Session
+public record Session : IDisposable
 {
     public string? Format { get; init; }
-    public string? DataPath { get; init; }
-    public string? UdfPath { get; init; }
+    public string? DataPath { get; set; }
+    // public string? UdfPath { get; init; }
     public string? LogLevel { get; init; }
+    public bool IsTemp { get; init; } = true;
+
+    public void Dispose()
+    {
+        if (!IsTemp && DataPath?.EndsWith("chdb_") == true && Directory.Exists(DataPath))
+            Directory.Delete(DataPath, true);
+    }
 
     public LocalResult? Execute(string query, string? format = null)
     {
+        if (IsTemp && DataPath is null) {
+            DataPath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "chdb_");
+        }
+
         var argv = new[] {
             "clickhouse",
             "--multiquery",
             $"--query={query}",
             $"--output-format={format ?? Format ?? "TabSeparated"}",  //$"--path={DataPath}",
             $"--path={DataPath}",
-            // $"--udf-path={UdfPath}",
+            // $"--user_scripts_path={UdfPath}", $"--user_defined_executable_functions_config={UdfPath}/*.xml",
             $"--log-level={LogLevel ?? "trace"}",
         };
         try

src/chdb/chdb.csproj

@@ -8,6 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="libchdb.so" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="libchdb.so" CopyToOutputDirectory="PreserveNewest" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
   </ItemGroup>
 </Project>

test/ChDbTest/ChDbTest.cs

@@ -1,6 +1,4 @@
-namespace test;
-
-using ChDb;
+namespace ChDb;
 
 [TestClass]
 public class ChDbTest
@@ -116,15 +114,41 @@ FROM s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/house_parquet
         Assert.AreEqual(2772030, count);
     }
 
+    [TestMethod]
+    [Ignore("TODO")]
+    public void CsvTest() {
+        var csv = """
+            Name, Age, City
+            John, 25, New York
+            Alice, 30, London
+            Bob, 22, Tokyo
+            Eva, 28, Paris
+            """;
+        var dataPath = "/tmp/chdb/data";
+        Directory.CreateDirectory(dataPath);
+        File.WriteAllText(Path.Combine(".", "test.csv"), csv);
+        var session = new Session
+        {
+            Format = "PrettyCompact",
+            DataPath = dataPath,
+            // UdfPath = "/tmp/chdb/udf",
+            LogLevel = "trace",
+        };
+        var result = session.Execute("SELECT * FROM 'test.csv'", "CSVWithNamesAndTypes");
+        Assert.IsNotNull(result);
+        Assert.AreEqual(4UL, result.RowsRead);
+        Assert.AreEqual(155UL, result.BytesRead);
+        Assert.AreEqual("Name\tString\nAge\tUInt8\nCity\tString\nJohn\t25\tNew York\nAlice\t30\tLondon\nBob\t22\tTokyo\nEva\t28\tParis\n", result.Buf);
+        StringAssert.StartsWith(result.Buf, """"Name","Age","City"""");
+    }
+
     [TestMethod]
     [Ignore("Bugfix is in v1.2.1")]
     public void SessionTest()
     {
-        var session = new Session
+        using var session = new Session
         {
             Format = "PrettyCompact",
-            DataPath = "/tmp/chdb/data",
-            UdfPath = "/tmp/chdb/udf",
             LogLevel = "trace",
         };
         // var r1 = session.Execute("select 1");