diff --git a/MiniExcel.slnx b/MiniExcel.slnx
index 95844211..364d4883 100644
--- a/MiniExcel.slnx
+++ b/MiniExcel.slnx
@@ -8,7 +8,6 @@
-
@@ -17,11 +16,21 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,7 +46,6 @@
-
diff --git a/README.md b/README.md
index 5b3c9ae8..5de14e83 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ At present, most popular frameworks need to load all the data from an Excel docu
### MiniExcel for Rust
-MiniExcel is also available for Rust, offering lower-level control and efficient XLSX processing. See [MiniExcel-Rust](https://github.com/mini-software/MiniExcel-Rust) and the [Rust vs. .NET query benchmark](#rust-vs-net-query-benchmark).
+MiniExcel is also available for Rust, offering lower-level control and efficient XLSX processing. See [MiniExcel-Rust](https://github.com/mini-software/MiniExcel-Rust).
```mermaid
flowchart LR
@@ -135,25 +135,6 @@ dotnet run --project .\benchmarks\MiniExcel.Benchmarks -c Release -f net9.0 -- -
You can find the benchmarks' results for the latest release [here](benchmarks/results).
-#### Rust vs. .NET query benchmark
-
-This benchmark compares dynamic, streaming query performance. The .NET implementation uses `OpenXmlImporter.Query`, while the Rust implementation uses `MiniExcel::query`. Write performance is not included. With `MiniExcel` and `MiniExcel-Rust` checked out as sibling directories, run both implementations against the same 100,000-row XLSX workbook:
-
-```powershell
-pwsh ./benchmarks/compare-rust-dotnet.ps1
-```
-
-By default, each measured iteration streams the entire workbook three times, and each runtime is measured for three iterations. The script verifies that both implementations return the same row count and reports elapsed time and peak working set. Results vary by hardware, operating system, filesystem cache, and runtime version; use `-Passes` and `-Iterations` to adjust the workload.
-
-The following results were collected on an AMD Ryzen 5 5600X system running Windows 10 22H2, .NET SDK 10.0.103, and Rust 1.85.0:
-
-| Runtime | Method | Rows per iteration | Average elapsed | Average peak working set | Maximum peak working set |
-|---------|--------|-------------------:|----------------:|-------------------------:|-------------------------:|
-| .NET | `OpenXmlImporter.Query` | 300,000 | 6,282.31 ms | 70.65 MB | 70.71 MB |
-| Rust | `MiniExcel::query` | 300,000 | 3,814.61 ms | 9.79 MB | 9.83 MB |
-
-These measurements are from a single machine and do not constitute a general performance guarantee.
-
### Excel Query/Import
diff --git a/README.zh-CN.md b/README.zh-CN.md
index a5262968..c3b986ba 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -41,7 +41,7 @@ MiniExcel简单、高效避免OOM的.NET处理Excel查、写、填充数据工
### MiniExcel Rust
-MiniExcel 现已支持 Rust，提供更底层的控制和高效的 XLSX 处理。详见 [MiniExcel-Rust](https://github.com/mini-software/MiniExcel-Rust/blob/main/README.zh-CN.md) 与 [Rust/.NET 基准测试](#rust-与-net-基准测试)。
+MiniExcel 现已支持 Rust，提供更底层的控制和高效的 XLSX 处理。详见 [MiniExcel-Rust](https://github.com/mini-software/MiniExcel-Rust/blob/main/README.zh-CN.md)。
目前主流框架大多需要将数据全载入到内存方便操作，但这会导致内存消耗问题，MiniExcel 尝试以 Stream 角度写底层算法逻辑，能让原本1000多MB占用降低到几MB，避免内存不够情况。
@@ -123,24 +123,6 @@ IterationCount=3 LaunchCount=3 WarmupCount=3
Benchmark History : [Link](https://github.com/mini-software/MiniExcel/issues/276)
-#### Rust 与 .NET 基准测试
-
-此基准测试比较动态流式 Query 性能：.NET 使用 `OpenXmlImporter.Query`，Rust 使用 `MiniExcel::query`，不包含 Save 性能。将 `MiniExcel` 与 `MiniExcel-Rust` 放在同级目录后，可使用同一份 100,000 行 XLSX 工作簿测试两种实现：
-
-```powershell
-pwsh ./benchmarks/compare-rust-dotnet.ps1
-```
-
-默认每轮完整流式读取 3 次，并对每个运行时重复测试 3 轮。脚本会校验两端读取行数一致，并输出耗时与峰值工作集。结果会受硬件、操作系统、文件缓存及运行时版本影响，可通过 `-Passes` 和 `-Iterations` 调整测试负载。
-
-测试环境：AMD Ryzen 5 5600X、Windows 10 22H2、.NET SDK 10.0.103、Rust 1.85.0。
-
-| 运行时 | 方法 | 每轮读取行数 | 平均耗时 | 平均峰值工作集 | 最大峰值工作集 |
-|--------|------|-------------:|---------:|---------------:|---------------:|
-| .NET | `OpenXmlImporter.Query` | 300,000 | 6,282.31 ms | 70.65 MB | 70.71 MB |
-| Rust | `MiniExcel::query` | 300,000 | 3,814.61 ms | 9.79 MB | 9.83 MB |
-
-以上结果仅供同机环境参考，不代表所有环境下的性能表现。
#### 导入、查询 Excel 比较
diff --git a/benchmarks/MiniExcel.Rust.PackageTests/MiniExcel.Rust.PackageTests.csproj b/benchmarks/MiniExcel.Rust.PackageTests/MiniExcel.Rust.PackageTests.csproj
deleted file mode 100644
index e7684cd3..00000000
--- a/benchmarks/MiniExcel.Rust.PackageTests/MiniExcel.Rust.PackageTests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
- $(MSBuildThisFileDirectory)..\..\artifacts\local-rust
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/benchmarks/MiniExcel.Rust.PackageTests/Program.cs b/benchmarks/MiniExcel.Rust.PackageTests/Program.cs
deleted file mode 100644
index 1bc9c25d..00000000
--- a/benchmarks/MiniExcel.Rust.PackageTests/Program.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System.Diagnostics;
-using System.Text.Json;
-using MiniExcelLib;
-using MiniExcelLib.OpenXml;
-using RustQuery = MiniExcelLibs.MiniExcelRust;
-
-if (args.Length < 1)
- return Usage();
-
-return args[0].ToLowerInvariant() switch
-{
- "verify" => Verify(args),
- "lifecycle" => Lifecycle(args),
- "managed" => Benchmark(args, useRust: false),
- "rust" => Benchmark(args, useRust: true),
- _ => Usage()
-};
-
-static int Verify(string[] args)
-{
- if (args.Length != 3 || !bool.TryParse(args[2], out var useHeaderRow))
- return Usage();
-
- var path = Path.GetFullPath(args[1]);
- using var managed = QueryManaged(path, useHeaderRow).GetEnumerator();
- using var rust = RustQuery.Query(path, useHeaderRow).GetEnumerator();
- var rowIndex = 0;
-
- while (true)
- {
- var hasManaged = managed.MoveNext();
- var hasRust = rust.MoveNext();
- if (hasManaged != hasRust)
- throw new InvalidOperationException($"Row count differs after row {rowIndex}.");
- if (!hasManaged)
- break;
-
- CompareRow(managed.Current, rust.Current, rowIndex);
- rowIndex++;
- }
-
- Console.WriteLine($"Verified {rowIndex} rows from the local MiniExcel.Rust NuGet package.");
- return 0;
-}
-
-static int Lifecycle(string[] args)
-{
- if (args.Length != 2)
- return Usage();
-
- var temporaryPath = Path.Combine(Path.GetTempPath(), $"miniexcel-rust-{Guid.NewGuid():N}.xlsx");
- File.Copy(Path.GetFullPath(args[1]), temporaryPath);
- try
- {
- for (var iteration = 0; iteration < 100; iteration++)
- {
- using var rows = RustQuery.Query(temporaryPath).GetEnumerator();
- if (!rows.MoveNext())
- throw new InvalidOperationException("The lifecycle fixture did not contain a row.");
- }
-
- File.Delete(temporaryPath);
- Console.WriteLine("Verified 100 early-disposal query cycles from the local MiniExcel.Rust NuGet package.");
- return 0;
- }
- finally
- {
- if (File.Exists(temporaryPath))
- File.Delete(temporaryPath);
- }
-}
-
-static int Benchmark(string[] args, bool useRust)
-{
- if (args.Length is < 2 or > 4)
- return Usage();
-
- var path = Path.GetFullPath(args[1]);
- var passes = args.Length >= 3 ? int.Parse(args[2]) : 1;
- var warmupPasses = args.Length >= 4 ? int.Parse(args[3]) : 0;
- if (passes < 1 || warmupPasses < 0)
- throw new ArgumentOutOfRangeException(nameof(args), "Passes must be positive and warm-up passes cannot be negative.");
-
- for (var pass = 0; pass < warmupPasses; pass++)
- Consume(path, useRust);
-
- GC.Collect();
- GC.WaitForPendingFinalizers();
- GC.Collect();
-
- var allocatedBefore = GC.GetTotalAllocatedBytes(precise: true);
- var stopwatch = Stopwatch.StartNew();
- var firstRowMilliseconds = 0d;
- long rowCount = 0;
- long cellCount = 0;
-
- for (var pass = 0; pass < passes; pass++)
- {
- var rows = useRust ? RustQuery.Query(path) : QueryManaged(path, useHeaderRow: false);
- foreach (var row in rows)
- {
- if (rowCount == 0)
- firstRowMilliseconds = stopwatch.Elapsed.TotalMilliseconds;
- rowCount++;
- cellCount += row.Count;
- }
- }
-
- stopwatch.Stop();
- var result = new BenchmarkResult(
- useRust ? "RustNuGet" : "ManagedV2",
- passes,
- rowCount,
- cellCount,
- stopwatch.Elapsed.TotalMilliseconds,
- firstRowMilliseconds,
- GC.GetTotalAllocatedBytes(precise: true) - allocatedBefore);
- Console.WriteLine(JsonSerializer.Serialize(result));
- return 0;
-}
-
-static void Consume(string path, bool useRust)
-{
- var rows = useRust ? RustQuery.Query(path) : QueryManaged(path, useHeaderRow: false);
- foreach (var row in rows)
- _ = row.Count;
-}
-
-static IEnumerable> QueryManaged(string path, bool useHeaderRow)
-{
- var importer = MiniExcel.Importers.GetOpenXmlImporter();
- foreach (IDictionary row in importer.Query(path, hasHeaderRow: useHeaderRow))
- yield return row;
-}
-
-static void CompareRow(
- IDictionary expected,
- IDictionary actual,
- int rowIndex)
-{
- if (!expected.Keys.SequenceEqual(actual.Keys, StringComparer.Ordinal))
- throw new InvalidOperationException($"Column order differs at row {rowIndex}.");
-
- foreach (var key in expected.Keys)
- {
- if (!Equals(expected[key], actual[key]))
- throw new InvalidOperationException(
- $"Value differs at row {rowIndex}, column {key}: managed={expected[key] ?? ""}, rust={actual[key] ?? ""}.");
- }
-}
-
-static int Usage()
-{
- Console.Error.WriteLine("Usage:");
- Console.Error.WriteLine(" MiniExcel.Rust.PackageTests verify ");
- Console.Error.WriteLine(" MiniExcel.Rust.PackageTests lifecycle ");
- Console.Error.WriteLine(" MiniExcel.Rust.PackageTests [passes] [warmup-passes]");
- return 2;
-}
-
-internal sealed record BenchmarkResult(
- string Runtime,
- int Passes,
- long Rows,
- long Cells,
- double ElapsedMilliseconds,
- double FirstRowMilliseconds,
- long AllocatedBytes);
\ No newline at end of file
diff --git a/benchmarks/MiniExcel.StressTests/MiniExcel.StressTests.csproj b/benchmarks/MiniExcel.StressTests/MiniExcel.StressTests.csproj
deleted file mode 100644
index a953cd73..00000000
--- a/benchmarks/MiniExcel.StressTests/MiniExcel.StressTests.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/benchmarks/MiniExcel.StressTests/Program.cs b/benchmarks/MiniExcel.StressTests/Program.cs
deleted file mode 100644
index 072161bc..00000000
--- a/benchmarks/MiniExcel.StressTests/Program.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using MiniExcelLib;
-using MiniExcelLib.OpenXml;
-
-if (args.Length is < 1 or > 2)
-{
- Console.Error.WriteLine("Usage: MiniExcel.StressTests [passes]");
- return 2;
-}
-
-var path = Path.GetFullPath(args[0]);
-var passes = args.Length == 2 && int.TryParse(args[1], out var parsedPasses) && parsedPasses > 0
- ? parsedPasses
- : 1;
-
-var importer = MiniExcel.Importers.GetOpenXmlImporter();
-long rowCount = 0;
-
-for (var pass = 0; pass < passes; pass++)
-{
- foreach (var row in importer.Query(path))
- {
- _ = row;
- rowCount++;
- }
-}
-
-Console.WriteLine(rowCount);
-return 0;
\ No newline at end of file
diff --git a/benchmarks/compare-rust-dotnet.ps1 b/benchmarks/compare-rust-dotnet.ps1
deleted file mode 100644
index 64bb8952..00000000
--- a/benchmarks/compare-rust-dotnet.ps1
+++ /dev/null
@@ -1,137 +0,0 @@
-param(
- [string]$Workbook,
- [string]$RustRepository,
- [ValidateRange(1, 100)]
- [int]$Passes = 3,
- [ValidateRange(1, 100)]
- [int]$Iterations = 3,
- [switch]$SkipBuild
-)
-
-$ErrorActionPreference = "Stop"
-$repositoryRoot = Split-Path $PSScriptRoot -Parent
-
-if ([string]::IsNullOrWhiteSpace($Workbook)) {
- $benchmarkData = Join-Path $PSScriptRoot "MiniExcel.Benchmarks" "data"
- $Workbook = Join-Path $benchmarkData "Test100,000x10.xlsx"
-}
-if ([string]::IsNullOrWhiteSpace($RustRepository)) {
- $RustRepository = Join-Path (Split-Path $repositoryRoot -Parent) "MiniExcel-Rust"
-}
-
-$Workbook = [IO.Path]::GetFullPath($Workbook)
-$RustRepository = [IO.Path]::GetFullPath($RustRepository)
-$dotnetStressDirectory = Join-Path $PSScriptRoot "MiniExcel.StressTests"
-$dotnetProject = Join-Path $dotnetStressDirectory "MiniExcel.StressTests.csproj"
-$dotnetOutputDirectory = Join-Path $dotnetStressDirectory "bin" "Release" "net10.0"
-$dotnetRunner = Join-Path $dotnetOutputDirectory "MiniExcel.StressTests.dll"
-$rustManifest = Join-Path $RustRepository "Cargo.toml"
-$executableSuffix = if ($env:OS -eq "Windows_NT") { ".exe" } else { "" }
-$rustOutputDirectory = Join-Path $RustRepository "target" "release" "examples"
-$rustRunner = Join-Path $rustOutputDirectory "stress_query$executableSuffix"
-
-foreach ($requiredPath in @($Workbook, $dotnetProject, $rustManifest)) {
- if (-not (Test-Path $requiredPath)) {
- throw "Required path not found: $requiredPath"
- }
-}
-
-if (-not $SkipBuild) {
- & dotnet build $dotnetProject -c Release --nologo --verbosity:quiet
- if ($LASTEXITCODE -ne 0) { throw ".NET stress runner build failed." }
-
- & cargo +1.85.0 build --manifest-path $rustManifest --release -p miniexcel --example stress_query --locked
- if ($LASTEXITCODE -ne 0) { throw "Rust stress runner build failed." }
-}
-
-function Invoke-MeasuredProcess {
- param(
- [string]$Runtime,
- [string]$Executable,
- [string[]]$Arguments,
- [int]$Iteration
- )
-
- $startInfo = [Diagnostics.ProcessStartInfo]::new()
- $startInfo.FileName = $Executable
- $startInfo.UseShellExecute = $false
- $startInfo.RedirectStandardOutput = $true
- $startInfo.RedirectStandardError = $true
- foreach ($argument in $Arguments) {
- $startInfo.ArgumentList.Add($argument)
- }
-
- $stopwatch = [Diagnostics.Stopwatch]::StartNew()
- $process = [Diagnostics.Process]::Start($startInfo)
- $peakWorkingSet = 0L
- while (-not $process.WaitForExit(10)) {
- $process.Refresh()
- $peakWorkingSet = [Math]::Max($peakWorkingSet, $process.WorkingSet64)
- }
- $stopwatch.Stop()
-
- $standardOutput = $process.StandardOutput.ReadToEnd().Trim()
- $standardError = $process.StandardError.ReadToEnd().Trim()
- if ($process.ExitCode -ne 0) {
- throw "$Runtime runner failed with exit code $($process.ExitCode): $standardError"
- }
-
- $rowCount = 0L
- if (-not [long]::TryParse($standardOutput, [ref]$rowCount)) {
- throw "$Runtime runner returned an invalid row count: $standardOutput"
- }
-
- [pscustomobject]@{
- Runtime = $Runtime
- Iteration = $Iteration
- Passes = $Passes
- Rows = $rowCount
- ElapsedMs = [Math]::Round($stopwatch.Elapsed.TotalMilliseconds, 2)
- PeakWorkingSetMB = [Math]::Round($peakWorkingSet / 1MB, 2)
- }
-}
-
-$runners = @(
- @{
- Runtime = ".NET"
- Executable = "dotnet"
- Arguments = @($dotnetRunner, $Workbook, $Passes.ToString())
- },
- @{
- Runtime = "Rust"
- Executable = $rustRunner
- Arguments = @($Workbook, $Passes.ToString())
- }
-)
-
-foreach ($runner in $runners) {
- $null = Invoke-MeasuredProcess @runner -Iteration 0
-}
-
-$results = foreach ($iteration in 1..$Iterations) {
- foreach ($runner in $runners) {
- Invoke-MeasuredProcess @runner -Iteration $iteration
- }
-}
-
-$expectedRows = $results[0].Rows
-if ($results.Where({ $_.Rows -ne $expectedRows }).Count -ne 0) {
- throw "The runners returned different row counts."
-}
-
-$results | Format-Table -AutoSize
-
-$summary = $results | Group-Object Runtime | ForEach-Object {
- $elapsed = $_.Group.ElapsedMs | Measure-Object -Average
- $memory = $_.Group.PeakWorkingSetMB | Measure-Object -Average -Maximum
- [pscustomobject]@{
- Runtime = $_.Name
- AverageElapsedMs = [Math]::Round($elapsed.Average, 2)
- AveragePeakWorkingSetMB = [Math]::Round($memory.Average, 2)
- MaximumPeakWorkingSetMB = [Math]::Round($memory.Maximum, 2)
- RowsPerIteration = $expectedRows
- }
-}
-
-"Summary"
-$summary | Format-Table -AutoSize
\ No newline at end of file
diff --git a/benchmarks/results/rust-nuget-poc.md b/benchmarks/results/rust-nuget-poc.md
deleted file mode 100644
index ebfcf257..00000000
--- a/benchmarks/results/rust-nuget-poc.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Rust-backed NuGet proof of concept
-
-Date: 2026-08-30
-
-## Scope
-
-This proof of concept adds `MiniExcelRust.Query` as a synchronous, path-based dynamic XLSX
-query. A managed `MiniExcel.Rust` package calls a Rust `cdylib` through a versioned C ABI and
-transfers up to 64 rows per P/Invoke call in a tagged binary frame.
-
-The test consumer references `MiniExcel.Rust` only through a freshly packed local NuGet feed.
-The managed comparison references the current MiniExcel V2 source tree.
-
-## Environment
-
-| Item | Value |
-| --- | --- |
-| Operating system | Windows x64 |
-| .NET SDK | 10.0.103 |
-| Rust | 1.85.0 |
-| Workbook | `Test100,000x10.xlsx` |
-| Workbook rows and cells | 100,000 rows, 1,000,000 cells per pass |
-| Local package | `MiniExcel.Rust.0.1.0-preview.1.nupkg` |
-| Local package size | 639,093 bytes (0.61 MB) |
-| Native asset | `runtimes/win-x64/native/miniexcel_ffi.dll` |
-
-## Correctness and lifecycle
-
-The local package consumer compared column order and every value against MiniExcel V2 for:
-
-- Headerless dynamic query.
-- Header-based dynamic query.
-- Empty rows with and without a header.
-
-All 15 compared rows matched. A separate lifecycle check opened 100 queries, consumed one row,
-disposed each iterator early, and then deleted the workbook copy successfully.
-
-## Cold query
-
-Five fresh processes performed one measured pass without an in-process warm-up. Values are
-averages.
-
-| Runtime | Elapsed | First row | Managed allocation | Peak working set |
-| --- | ---: | ---: | ---: | ---: |
-| Managed V2 | 2,530.10 ms | 171.11 ms | 668.93 MB | 67.53 MB |
-| Rust NuGet | 725.78 ms | 35.76 ms | 142.49 MB | 45.38 MB |
-
-The Rust NuGet path was 3.49 times faster, reduced first-row latency by 79.1%, reduced managed
-allocation by 78.7%, and reduced peak working set by 32.8%.
-
-## Warm sustained query
-
-Five fresh processes performed one untimed warm-up pass followed by three measured passes. Values
-are averages for all three measured passes.
-
-| Runtime | Elapsed | First measured row | Managed allocation | Peak working set |
-| --- | ---: | ---: | ---: | ---: |
-| Managed V2 | 5,222.79 ms | 44.97 ms | 2,006.98 MB | 78.25 MB |
-| Rust NuGet | 1,863.37 ms | 28.51 ms | 427.46 MB | 50.49 MB |
-
-The Rust NuGet path was 2.80 times faster, reduced first-row latency by 36.6%, reduced managed
-allocation by 78.7%, and reduced peak working set by 35.5%.
-
-Managed allocation excludes allocations inside the Rust native library. Peak working set includes
-the complete process and is the more useful cross-runtime memory measurement. Similar peak working
-sets across one and repeated passes show no pass-count-proportional retention in this test; broader
-workbook-size scaling is still required for a general bounded-memory claim.
-
-## Acceptance status
-
-| Requirement | Status |
-| --- | --- |
-| In-process throughput at least current V2 | Pass |
-| First-row latency no more than 10% slower | Pass; it is faster |
-| Focused dynamic row equivalence | Pass |
-| Deterministic early disposal | Pass |
-| No repeated-pass memory growth | Pass for this workbook |
-| Complete dynamic parity contract | Not yet tested |
-| Cancellation latency | Not implemented in this synchronous API |
-| All supported RIDs | Not met; package currently contains only `win-x64` |
-| Single-file, trimming, and NativeAOT | Not yet tested |
-
-## Reproduce
-
-From the MiniExcel repository root:
-
-```powershell
-pwsh ./benchmarks/test-rust-nuget.ps1 -Iterations 5 -Passes 3 -WarmupPasses 1
-pwsh ./benchmarks/test-rust-nuget.ps1 -Iterations 5 -Passes 1 -WarmupPasses 0
-```
-
-The result supports continuing with the optional Rust query backend. It does not yet support
-replacing the main MiniExcel NuGet implementation or enabling Rust by default.
\ No newline at end of file
diff --git a/benchmarks/test-rust-nuget.ps1 b/benchmarks/test-rust-nuget.ps1
deleted file mode 100644
index d8033c7b..00000000
--- a/benchmarks/test-rust-nuget.ps1
+++ /dev/null
@@ -1,111 +0,0 @@
-param(
- [ValidateRange(1, 20)]
- [int]$Iterations = 5,
- [ValidateRange(1, 20)]
- [int]$Passes = 3,
- [ValidateRange(0, 20)]
- [int]$WarmupPasses = 1
-)
-
-$ErrorActionPreference = "Stop"
-$repositoryRoot = Split-Path $PSScriptRoot -Parent
-$rustRepository = Join-Path (Split-Path $repositoryRoot -Parent) "MiniExcel-Rust"
-$localFeed = Join-Path $repositoryRoot "artifacts/local-rust"
-$localPackages = Join-Path $localFeed "packages"
-$packageProject = Join-Path $repositoryRoot "src/MiniExcel.Rust/MiniExcel.Rust.csproj"
-$consumerProject = Join-Path $PSScriptRoot "MiniExcel.Rust.PackageTests/MiniExcel.Rust.PackageTests.csproj"
-$consumerDll = Join-Path $PSScriptRoot "MiniExcel.Rust.PackageTests/bin/Release/net10.0/MiniExcel.Rust.PackageTests.dll"
-$benchmarkWorkbook = Join-Path $PSScriptRoot "MiniExcel.Benchmarks/data/Test100,000x10.xlsx"
-$fixtures = @(
- @{ Path = "tests/data/xlsx/TestDynamicQueryBasic_WithoutHead.xlsx"; Header = "false" },
- @{ Path = "tests/data/xlsx/TestDynamicQueryBasic.xlsx"; Header = "true" },
- @{ Path = "tests/data/xlsx/TestCenterEmptyRow/TestCenterEmptyRow.xlsx"; Header = "false" },
- @{ Path = "tests/data/xlsx/TestCenterEmptyRow/TestCenterEmptyRow.xlsx"; Header = "true" }
-)
-
-New-Item -ItemType Directory -Force $localFeed | Out-Null
-Remove-Item $localPackages -Recurse -Force -ErrorAction SilentlyContinue
-
-Push-Location $rustRepository
-try {
- & cargo +1.85.0 build --release -p miniexcel-ffi --locked
- if ($LASTEXITCODE -ne 0) { throw "Rust FFI release build failed." }
-}
-finally {
- Pop-Location
-}
-
-& dotnet pack $packageProject -c Release -o $localFeed --nologo --no-restore
-if ($LASTEXITCODE -ne 0) { throw "MiniExcel.Rust pack failed." }
-
-& dotnet restore $consumerProject --packages $localPackages --force --no-cache --nologo
-if ($LASTEXITCODE -ne 0) { throw "Local package consumer restore failed." }
-& dotnet build $consumerProject -c Release --no-restore --nologo
-if ($LASTEXITCODE -ne 0) { throw "Local package consumer build failed." }
-
-foreach ($fixture in $fixtures) {
- & dotnet $consumerDll verify (Join-Path $repositoryRoot $fixture.Path) $fixture.Header
- if ($LASTEXITCODE -ne 0) { throw "Local package verification failed for $($fixture.Path)." }
-}
-& dotnet $consumerDll lifecycle (Join-Path $repositoryRoot $fixtures[0].Path)
-if ($LASTEXITCODE -ne 0) { throw "Local package lifecycle verification failed." }
-
-function Invoke-BenchmarkProcess {
- param([string]$Runtime, [int]$Iteration)
-
- $startInfo = [Diagnostics.ProcessStartInfo]::new()
- $startInfo.FileName = "dotnet"
- $startInfo.UseShellExecute = $false
- $startInfo.RedirectStandardOutput = $true
- $startInfo.RedirectStandardError = $true
- foreach ($argument in @($consumerDll, $Runtime, $benchmarkWorkbook, "$Passes", "$WarmupPasses")) {
- $startInfo.ArgumentList.Add($argument)
- }
-
- $process = [Diagnostics.Process]::Start($startInfo)
- $peakWorkingSet = 0L
- while (-not $process.WaitForExit(10)) {
- $process.Refresh()
- $peakWorkingSet = [Math]::Max($peakWorkingSet, $process.WorkingSet64)
- }
-
- $output = $process.StandardOutput.ReadToEnd().Trim()
- $errorOutput = $process.StandardError.ReadToEnd().Trim()
- if ($process.ExitCode -ne 0) {
- throw "$Runtime benchmark failed: $errorOutput"
- }
-
- $measurement = $output | ConvertFrom-Json
- [pscustomobject]@{
- Runtime = $measurement.Runtime
- Iteration = $Iteration
- Rows = $measurement.Rows
- Cells = $measurement.Cells
- ElapsedMs = [Math]::Round($measurement.ElapsedMilliseconds, 2)
- FirstRowMs = [Math]::Round($measurement.FirstRowMilliseconds, 2)
- AllocatedMB = [Math]::Round($measurement.AllocatedBytes / 1MB, 2)
- PeakWorkingSetMB = [Math]::Round($peakWorkingSet / 1MB, 2)
- }
-}
-
-$results = foreach ($iteration in 1..$Iterations) {
- Invoke-BenchmarkProcess -Runtime managed -Iteration $iteration
- Invoke-BenchmarkProcess -Runtime rust -Iteration $iteration
-}
-
-if (($results.Rows | Select-Object -Unique).Count -ne 1 -or ($results.Cells | Select-Object -Unique).Count -ne 1) {
- throw "Managed and Rust runners returned different row or cell counts."
-}
-
-$results | Format-Table -AutoSize
-
-"Summary (averages)"
-$results | Group-Object Runtime | ForEach-Object {
- [pscustomobject]@{
- Runtime = $_.Name
- ElapsedMs = [Math]::Round(($_.Group.ElapsedMs | Measure-Object -Average).Average, 2)
- FirstRowMs = [Math]::Round(($_.Group.FirstRowMs | Measure-Object -Average).Average, 2)
- AllocatedMB = [Math]::Round(($_.Group.AllocatedMB | Measure-Object -Average).Average, 2)
- PeakWorkingSetMB = [Math]::Round(($_.Group.PeakWorkingSetMB | Measure-Object -Average).Average, 2)
- }
-} | Format-Table -AutoSize
\ No newline at end of file
diff --git a/src/MiniExcel.Rust/MiniExcel.Rust.csproj b/src/MiniExcel.Rust/MiniExcel.Rust.csproj
deleted file mode 100644
index d3f9f6da..00000000
--- a/src/MiniExcel.Rust/MiniExcel.Rust.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- MiniExcelLibs
- MiniExcel.Rust
- MiniExcel.Rust
- 0.1.0-preview.1
- Experimental MiniExcel XLSX query API backed by Rust.
- $(MSBuildThisFileDirectory)..\..\..\MiniExcel-Rust\target\release\miniexcel_ffi.dll
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiniExcel.Rust/MiniExcelRust.cs b/src/MiniExcel.Rust/MiniExcelRust.cs
deleted file mode 100644
index ec1761be..00000000
--- a/src/MiniExcel.Rust/MiniExcelRust.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using System.Collections;
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Text;
-using Microsoft.Win32.SafeHandles;
-
-namespace MiniExcelLibs;
-
-///
-/// Provides experimental XLSX queries backed by the native MiniExcel Rust library.
-///
-public static class MiniExcelRust
-{
- private const int BatchSize = 64;
-
- ///
- /// Streams rows from an XLSX file through the native Rust query engine.
- ///
- public static IEnumerable> Query(
- string path,
- bool useHeaderRow = false,
- string? sheetName = null,
- string startCell = "A1")
- {
- if (string.IsNullOrWhiteSpace(path))
- throw new ArgumentException("The path is required.", nameof(path));
- if (string.IsNullOrWhiteSpace(startCell))
- throw new ArgumentException("The start cell is required.", nameof(startCell));
-
- return QueryIterator(Path.GetFullPath(path), useHeaderRow, sheetName, startCell);
- }
-
- private static IEnumerable> QueryIterator(
- string path,
- bool useHeaderRow,
- string? sheetName,
- string startCell)
- {
- EnsureAbiVersion();
-
- using var nativePath = new Utf8String(path);
- using var nativeSheetName = new Utf8String(sheetName);
- using var nativeStartCell = new Utf8String(startCell);
- var result = NativeMethods.QueryOpen(
- nativePath.Pointer,
- useHeaderRow ? (byte)1 : (byte)0,
- nativeSheetName.Pointer,
- nativeStartCell.Pointer,
- out var rawHandle);
- if (result < 0)
- throw CreateNativeException(result);
-
- using var handle = new NativeQueryHandle(rawHandle);
- while (true)
- {
- result = NativeMethods.QueryNextBatch(handle, BatchSize, out var data, out var length);
- if (result == 0)
- yield break;
- if (result < 0)
- throw CreateNativeException(result);
-
- var byteLength = checked((int)length.ToUInt64());
- var frame = new byte[byteLength];
- Marshal.Copy(data, frame, 0, byteLength);
- foreach (var row in DecodeBatch(frame))
- yield return row;
- }
- }
-
- private static IEnumerable> DecodeBatch(byte[] frame)
- {
- var reader = new FrameReader(frame);
- var rowCount = reader.ReadLength();
- for (var rowIndex = 0; rowIndex < rowCount; rowIndex++)
- {
- var cellCount = reader.ReadLength();
- IDictionary row = new Dictionary(cellCount, StringComparer.Ordinal);
- for (var cellIndex = 0; cellIndex < cellCount; cellIndex++)
- row.Add(reader.ReadString(), reader.ReadValue());
- yield return row;
- }
-
- reader.EnsureComplete();
- }
-
- private static void EnsureAbiVersion()
- {
- var version = NativeMethods.GetAbiVersion();
- if (version != 1)
- throw new NotSupportedException($"MiniExcel Rust ABI version {version} is not supported.");
- }
-
- private static Exception CreateNativeException(int result)
- {
- var data = NativeMethods.GetLastError(out var length);
- var byteLength = checked((int)length.ToUInt64());
- if (data == IntPtr.Zero || byteLength == 0)
- return new InvalidOperationException($"MiniExcel Rust query failed with native error {result}.");
-
- var bytes = new byte[byteLength];
- Marshal.Copy(data, bytes, 0, byteLength);
- return new InvalidOperationException(Encoding.UTF8.GetString(bytes));
- }
-
- private sealed class FrameReader(byte[] frame)
- {
- private int _offset;
-
- public int ReadLength()
- {
- var value = ReadUInt32();
- if (value > int.MaxValue)
- throw new InvalidDataException("The native MiniExcel frame contains an unsupported length.");
- return (int)value;
- }
-
- public string ReadString()
- {
- var length = ReadLength();
- EnsureAvailable(length);
- var value = Encoding.UTF8.GetString(frame, _offset, length);
- _offset += length;
- return value;
- }
-
- public object? ReadValue()
- {
- EnsureAvailable(1);
- return frame[_offset++] switch
- {
- 0 => null,
- 1 => ReadBoolean(),
- 2 => Convert.ToDouble(ReadInt64(), CultureInfo.InvariantCulture),
- 3 => BitConverter.Int64BitsToDouble(ReadInt64()),
- 4 => ReadString(),
- 5 => DateTime.ParseExact(ReadString(), "yyyy-MM-dd", CultureInfo.InvariantCulture),
- 6 => TimeSpan.Parse(ReadString(), CultureInfo.InvariantCulture),
- 7 => DateTime.Parse(ReadString(), CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind),
- 8 => TimeSpan.FromMilliseconds(ReadInt64()),
- 9 => ReadString(),
- var tag => throw new InvalidDataException($"The native MiniExcel frame contains unknown value tag {tag}.")
- };
- }
-
- public void EnsureComplete()
- {
- if (_offset != frame.Length)
- throw new InvalidDataException("The native MiniExcel frame contains trailing data.");
- }
-
- private bool ReadBoolean()
- {
- EnsureAvailable(1);
- return frame[_offset++] != 0;
- }
-
- private uint ReadUInt32()
- {
- EnsureAvailable(sizeof(uint));
- var value = (uint)(frame[_offset]
- | frame[_offset + 1] << 8
- | frame[_offset + 2] << 16
- | frame[_offset + 3] << 24);
- _offset += sizeof(uint);
- return value;
- }
-
- private long ReadInt64()
- {
- EnsureAvailable(sizeof(long));
- ulong value = 0;
- for (var index = 0; index < sizeof(long); index++)
- value |= (ulong)frame[_offset + index] << (index * 8);
- _offset += sizeof(long);
- return unchecked((long)value);
- }
-
- private void EnsureAvailable(int length)
- {
- if (length < 0 || _offset > frame.Length - length)
- throw new InvalidDataException("The native MiniExcel frame is truncated.");
- }
- }
-
- private sealed class Utf8String : IDisposable
- {
- public Utf8String(string? value)
- {
- if (value is null)
- return;
-
- var bytes = Encoding.UTF8.GetBytes(value);
- Pointer = Marshal.AllocHGlobal(bytes.Length + 1);
- Marshal.Copy(bytes, 0, Pointer, bytes.Length);
- Marshal.WriteByte(Pointer, bytes.Length, 0);
- }
-
- public IntPtr Pointer { get; private set; }
-
- public void Dispose()
- {
- if (Pointer == IntPtr.Zero)
- return;
-
- Marshal.FreeHGlobal(Pointer);
- Pointer = IntPtr.Zero;
- }
- }
-
- private sealed class NativeQueryHandle : SafeHandleZeroOrMinusOneIsInvalid
- {
- public NativeQueryHandle() : base(true) { }
-
- public NativeQueryHandle(IntPtr value) : this()
- {
- SetHandle(value);
- }
-
- protected override bool ReleaseHandle()
- {
- NativeMethods.QueryClose(handle);
- return true;
- }
- }
-
- private static class NativeMethods
- {
- private const string LibraryName = "miniexcel_ffi";
-
- [DllImport(LibraryName, EntryPoint = "miniexcel_abi_version", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
- internal static extern uint GetAbiVersion();
-
- [DllImport(LibraryName, EntryPoint = "miniexcel_query_open", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
- internal static extern int QueryOpen(
- IntPtr path,
- byte useHeaderRow,
- IntPtr sheetName,
- IntPtr startCell,
- out IntPtr handle);
-
- [DllImport(LibraryName, EntryPoint = "miniexcel_query_next_batch", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
- internal static extern int QueryNextBatch(
- NativeQueryHandle handle,
- uint maxRows,
- out IntPtr data,
- out UIntPtr length);
-
- [DllImport(LibraryName, EntryPoint = "miniexcel_query_close", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
- internal static extern void QueryClose(IntPtr handle);
-
- [DllImport(LibraryName, EntryPoint = "miniexcel_last_error", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
- internal static extern IntPtr GetLastError(out UIntPtr length);
- }