Skip to content

Commit 6a83e45

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #110 from Stillpoint-Software/develop
Develop
2 parents d817da5 + 3e67bdd commit 6a83e45

8 files changed

Lines changed: 87 additions & 72 deletions

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MajorVersion>3</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>1</PatchVersion>
6+
<PatchVersion>2</PatchVersion>
77
</PropertyGroup>
88
<!-- Disable automatic package publishing -->
99
<PropertyGroup>

‎test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1818
<PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
1919
<PackageReference Include="JsonPatch.Net" Version="3.3.0" />
20-
<PackageReference Include="JsonPath.Net" Version="2.1.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0" />
20+
<PackageReference Include="JsonPath.Net" Version="2.1.1" />
21+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.2" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
</ItemGroup>
2424

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.FilterExpressionParserEvaluator-report-jsonpath.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
```
2+
3+
BenchmarkDotNet v0.14.0, Windows 11 (10.0.26100.3037)
4+
12th Gen Intel Core i9-12900HK, 1 CPU, 20 logical and 14 physical cores
5+
.NET SDK 9.0.103
6+
[Host] : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2 [AttachedDebugger]
7+
ShortRun : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2
8+
9+
10+
| Method | Mean | Error
11+
| :------------------------ | ----: | -----:
12+
| FilterParser_JsonElement | NA | NA
13+
| FilterParser_JsonNode | NA | NA
14+
15+
Benchmarks with issues:
16+
FilterExpressionParserEvaluator.FilterParser_JsonElement: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3) [Filter=("world" == 'world') && (true || false)]
17+
FilterExpressionParserEvaluator.FilterParser_JsonNode: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3) [Filter=("world" == 'world') && (true || false)]
18+
```

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.JsonDiffBenchmark-report-jsonpath.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
```
22
3-
BenchmarkDotNet v0.13.12, Windows 11 (10.0.22631.3958/23H2/2023Update/SunValley3)
4-
Intel Core i9-9980HK CPU 2.40GHz, 1 CPU, 16 logical and 8 physical cores
5-
.NET SDK 8.0.302
6-
[Host] : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
7-
ShortRun : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
3+
BenchmarkDotNet v0.14.0, Windows 11 (10.0.26100.3037)
4+
12th Gen Intel Core i9-12900HK, 1 CPU, 20 logical and 14 physical cores
5+
.NET SDK 9.0.103
6+
[Host] : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2 [AttachedDebugger]
7+
ShortRun : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2
88
99
10-
| Method | Mean | Error | StdDev | Allocated
11-
| :-------------------- | ----------: | ----------: | --------: | ---------:
12-
| JsonDiff_JsonNode | 935.1 ns | 480.7 ns | 26.35 ns | 1.22 KB
13-
| JsonDiff_JsonElement | 1,154.6 ns | 699.7 ns | 38.35 ns | 1.66 KB
14-
| | | | |
15-
| JsonDiff_JsonNode | 1,259.1 ns | 529.3 ns | 29.01 ns | 1.35 KB
16-
| JsonDiff_JsonElement | 1,595.7 ns | 1,645.0 ns | 90.17 ns | 1.93 KB
10+
| Method | Mean | Error | StdDev | Allocated
11+
| :-------------------- | --------: | ---------: | --------: | ---------:
12+
| JsonDiff_JsonNode | 473.9 ns | 83.44 ns | 4.57 ns | 1.2 KB
13+
| JsonDiff_JsonElement | 595.7 ns | 283.98 ns | 15.57 ns | 1.66 KB
14+
| | | | |
15+
| JsonDiff_JsonNode | 591.9 ns | 262.91 ns | 14.41 ns | 1.3 KB
16+
| JsonDiff_JsonElement | 775.5 ns | 75.61 ns | 4.14 ns | 1.93 KB
1717
```

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.JsonPatchBenchmark-report-jsonpath.md‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
```
22
3-
BenchmarkDotNet v0.13.12, Windows 11 (10.0.22631.3958/23H2/2023Update/SunValley3)
4-
Intel Core i9-9980HK CPU 2.40GHz, 1 CPU, 16 logical and 8 physical cores
5-
.NET SDK 8.0.302
6-
[Host] : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
7-
ShortRun : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
3+
BenchmarkDotNet v0.14.0, Windows 11 (10.0.26100.3037)
4+
12th Gen Intel Core i9-12900HK, 1 CPU, 20 logical and 14 physical cores
5+
.NET SDK 9.0.103
6+
[Host] : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2 [AttachedDebugger]
7+
ShortRun : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2
88
99
10-
| Method | Mean | Error | StdDev | Allocated
11-
| :----------------------- | --------: | ---------: | --------: | ---------:
12-
| Hyperbee_JsonNode | 292.4 ns | 69.37 ns | 3.80 ns | 584 B
13-
| Hyperbee_JsonElement | 295.2 ns | 32.43 ns | 1.78 ns | 584 B
14-
| JsonEverything_JsonNode | 506.5 ns | 565.41 ns | 30.99 ns | 728 B
15-
| AspNetCore_JsonNode | NA | NA | NA | NA
16-
17-
Benchmarks with issues:
18-
JsonPatchBenchmark.AspNetCore_JsonNode: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3) [Source={"name":"John","age":30,"city":"New York"}, Operations=[{ "op":"replace", "path":"/city", "value":"LA" }]]
10+
| Method | Mean | Error | StdDev | Allocated
11+
| :----------------------- | --------: | ---------: | -------: | ---------:
12+
| Hyperbee_JsonNode | 139.2 ns | 26.87 ns | 1.47 ns | 520 B
13+
| Hyperbee_JsonElement | 145.1 ns | 26.35 ns | 1.44 ns | 520 B
14+
| JsonEverything_JsonNode | 232.5 ns | 116.18 ns | 6.37 ns | 968 B
15+
| AspNetCore_JsonNode | 441.0 ns | 173.80 ns | 9.53 ns | 1024 B
1916
```

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.JsonPathParseAndSelectEvaluator-report-jsonpath.md‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
```
22
3-
BenchmarkDotNet v0.13.12, Windows 11 (10.0.22631.3958/23H2/2023Update/SunValley3)
4-
Intel Core i9-9980HK CPU 2.40GHz, 1 CPU, 16 logical and 8 physical cores
5-
.NET SDK 8.0.302
6-
[Host] : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
7-
ShortRun : .NET 8.0.6 (8.0.624.26715), X64 RyuJIT AVX2
3+
BenchmarkDotNet v0.14.0, Windows 11 (10.0.26100.3037)
4+
12th Gen Intel Core i9-12900HK, 1 CPU, 20 logical and 14 physical cores
5+
.NET SDK 9.0.103
6+
[Host] : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2 [AttachedDebugger]
7+
ShortRun : .NET 9.0.2 (9.0.225.6610), X64 RyuJIT AVX2
88
99
10-
| Method | Mean | Error | StdDev | Allocated
11-
| :----------------------- | ---------: | ----------: | ---------: | ---------:
10+
| Method | Mean | Error | StdDev | Allocated
11+
| :----------------------- | ---------: | ---------: | ---------: | ---------:
1212
| `$..* First()`
13-
| Hyperbee_JsonElement | 3.075 μs | 0.0128 μs | 0.0007 μs | 3.5 KB
14-
| Hyperbee_JsonNode | 3.183 μs | 2.5776 μs | 0.1413 μs | 3.07 KB
15-
| JsonEverything_JsonNode | 3.206 μs | 3.7096 μs | 0.2033 μs | 3.53 KB
16-
| JsonCons_JsonElement | 6.136 μs | 0.7476 μs | 0.0410 μs | 8.48 KB
17-
| Newtonsoft_JObject | 8.829 μs | 10.1411 μs | 0.5559 μs | 14.22 KB
18-
| | | | |
13+
| Hyperbee_JsonElement | 1.867 μs | 0.6072 μs | 0.0333 μs | 3.5 KB
14+
| Hyperbee_JsonNode | 1.916 μs | 0.2202 μs | 0.0121 μs | 3.11 KB
15+
| JsonEverything_JsonNode | 2.097 μs | 0.7484 μs | 0.0410 μs | 3.49 KB
16+
| JsonCons_JsonElement | 3.498 μs | 0.8161 μs | 0.0447 μs | 8.48 KB
17+
| Newtonsoft_JObject | 5.734 μs | 1.1777 μs | 0.0646 μs | 14.22 KB
18+
| | | | |
1919
| `$..*`
20-
| JsonCons_JsonElement | 5.595 μs | 0.8702 μs | 0.0477 μs | 8.45 KB
21-
| Hyperbee_JsonElement | 7.152 μs | 5.2088 μs | 0.2855 μs | 9.09 KB
22-
| Hyperbee_JsonNode | 9.769 μs | 9.4033 μs | 0.5154 μs | 10.86 KB
23-
| Newtonsoft_JObject | 9.780 μs | 4.8754 μs | 0.2672 μs | 14.86 KB
24-
| JsonEverything_JsonNode | 22.743 μs | 2.0588 μs | 0.1129 μs | 36.81 KB
25-
| | | | |
20+
| JsonCons_JsonElement | 3.525 μs | 1.0092 μs | 0.0553 μs | 8.45 KB
21+
| Hyperbee_JsonElement | 4.288 μs | 0.4672 μs | 0.0256 μs | 8.38 KB
22+
| Hyperbee_JsonNode | 5.744 μs | 0.8133 μs | 0.0446 μs | 11.22 KB
23+
| Newtonsoft_JObject | 7.111 μs | 1.1213 μs | 0.0615 μs | 14.43 KB
24+
| JsonEverything_JsonNode | 18.571 μs | 5.4711 μs | 0.2999 μs | 34.2 KB
25+
| | | | |
2626
| `$..price`
27-
| Hyperbee_JsonElement | 4.433 μs | 0.7724 μs | 0.0423 μs | 4.34 KB
28-
| JsonCons_JsonElement | 4.894 μs | 2.9680 μs | 0.1627 μs | 5.65 KB
29-
| Hyperbee_JsonNode | 7.421 μs | 0.4506 μs | 0.0247 μs | 7.63 KB
30-
| Newtonsoft_JObject | 12.818 μs | 37.7544 μs | 2.0694 μs | 14.4 KB
31-
| JsonEverything_JsonNode | 16.584 μs | 16.7456 μs | 0.9179 μs | 27.63 KB
32-
| | | | |
27+
| Hyperbee_JsonElement | 2.599 μs | 0.2500 μs | 0.0137 μs | 4.11 KB
28+
| JsonCons_JsonElement | 2.962 μs | 0.1946 μs | 0.0107 μs | 5.65 KB
29+
| Hyperbee_JsonNode | 4.107 μs | 0.8757 μs | 0.0480 μs | 8.22 KB
30+
| Newtonsoft_JObject | 6.653 μs | 1.2770 μs | 0.0700 μs | 14.26 KB
31+
| JsonEverything_JsonNode | 13.430 μs | 4.4075 μs | 0.2416 μs | 26.46 KB
32+
| | | | |
3333
| `$.store.book[?(@.price == 8.99)]`
34-
| Hyperbee_JsonElement | 4.164 μs | 3.7708 μs | 0.2067 μs | 5.4 KB
35-
| JsonCons_JsonElement | 4.910 μs | 2.4579 μs | 0.1347 μs | 5.05 KB
36-
| Hyperbee_JsonNode | 7.098 μs | 0.4756 μs | 0.0261 μs | 8.24 KB
37-
| Newtonsoft_JObject | 10.036 μs | 11.8552 μs | 0.6498 μs | 15.84 KB
38-
| JsonEverything_JsonNode | 11.373 μs | 3.3498 μs | 0.1836 μs | 15.85 KB
39-
| | | | |
34+
| Hyperbee_JsonElement | 2.778 μs | 0.3989 μs | 0.0219 μs | 5.41 KB
35+
| JsonCons_JsonElement | 3.282 μs | 0.5416 μs | 0.0297 μs | 5.05 KB
36+
| Hyperbee_JsonNode | 4.279 μs | 0.4826 μs | 0.0265 μs | 8.95 KB
37+
| Newtonsoft_JObject | 5.986 μs | 0.7627 μs | 0.0418 μs | 15.78 KB
38+
| JsonEverything_JsonNode | 7.135 μs | 1.1539 μs | 0.0632 μs | 15.5 KB
39+
| | | | |
4040
| `$.store.book[0]`
41-
| Hyperbee_JsonElement | 2.682 μs | 1.8565 μs | 0.1018 μs | 2.27 KB
42-
| JsonCons_JsonElement | 3.043 μs | 2.6136 μs | 0.1433 μs | 3.21 KB
43-
| Hyperbee_JsonNode | 3.229 μs | 1.4402 μs | 0.0789 μs | 2.79 KB
44-
| JsonEverything_JsonNode | 4.894 μs | 3.0709 μs | 0.1683 μs | 5.96 KB
45-
| Newtonsoft_JObject | 9.111 μs | 8.1704 μs | 0.4478 μs | 14.56 KB
41+
| Hyperbee_JsonElement | 1.623 μs | 0.3592 μs | 0.0197 μs | 2.27 KB
42+
| Hyperbee_JsonNode | 1.925 μs | 0.1748 μs | 0.0096 μs | 2.86 KB
43+
| JsonCons_JsonElement | 1.937 μs | 0.1595 μs | 0.0087 μs | 3.21 KB
44+
| JsonEverything_JsonNode | 3.095 μs | 0.4032 μs | 0.0221 μs | 5.71 KB
45+
| Newtonsoft_JObject | 5.690 μs | 1.3949 μs | 0.0765 μs | 14.51 KB
4646
```

‎test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.2">
13+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
18+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.0" />
19+
<PackageReference Include="MSTest.TestFramework" Version="3.8.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.0" />
14+
<PackageReference Include="MSTest.TestFramework" Version="3.8.0" />
1515
<PackageReference Include="YamlDotNet" Version="16.3.0" />
1616
</ItemGroup>
1717
<ItemGroup>

0 commit comments

Comments
 (0)