Skip to content

Commit

Permalink
Merge branch 'dev' into akkadotnet#6816-move-folder-creation-outside-…
Browse files Browse the repository at this point in the history
…constuctor
  • Loading branch information
YariSPB authored Nov 5, 2023
2 parents 30f3d87 + f7fd7ab commit 06a0b43
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 8 deletions.
27 changes: 26 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
#### 1.5.14 September 24th 2023 ####

*Placeholder for nightlies*
Akka.NET v1.5.14 is a maintenance release with several bug fixes.

* [Streams: Ensure stream are closed on shutdown](https://github.com/akkadotnet/akka.net/pull/6935)
* [Akka: Fix PeriodicTimer HashWheelTimerScheduler deadlock during start](https://github.com/akkadotnet/akka.net/pull/6949)
* [Cluster: Old version of LeastShardAllocationStrategy is now deprecated](https://github.com/akkadotnet/akka.net/pull/6975)
* [Query: Add a more descriptive ToString() values to Offset types](https://github.com/akkadotnet/akka.net/pull/6978)
* Package dependency upgrades
* [MNTR: Bump Akka.Multinode.TestAdapter to 1.5.13](https://github.com/akkadotnet/akka.net/pull/6926)
* [Akka: Bump Polyfill to 1.28](https://github.com/akkadotnet/akka.net/pull/6936)
* [Akka: Bump Google.Protobuf to 3.24.4](https://github.com/akkadotnet/akka.net/pull/6951)
* [DData: Bump LightningDB to 0.16.0](https://github.com/akkadotnet/akka.net/pull/6960)
* [Persistence: Bump Microsoft.Data.SQLite to 7.0.13](https://github.com/akkadotnet/akka.net/pull/6969)

If you want to see the [full set of changes made in Akka.NET v1.5.14, click here](https://github.com/akkadotnet/akka.net/milestone/96?closed=1).

| COMMITS | LOC+ | LOC- | AUTHOR |
|---------|------|------|---------------------|
| 11 | 25 | 21 | dependabot[bot] |
| 3 | 14 | 2 | Aaron Stannard |
| 3 | 114 | 369 | Simon Cropp |
| 2 | 36 | 31 | Gregorius Soedharmo |
| 1 | 41 | 43 | Lehonti Ramos |
| 1 | 38 | 0 | Yaroslav Paslavskiy |
| 1 | 3 | 0 | Sean Killeen |
| 1 | 227 | 25 | Drew |
| 1 | 1 | 1 | szaliszali |

#### 1.5.13 August 26th 2023 ####

Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<LangVersion>11.0</LangVersion>
</PropertyGroup>
<PropertyGroup>
<XunitVersion>2.5.1</XunitVersion>
<XunitRunnerVersion>2.5.1</XunitRunnerVersion>
<XunitVersion>2.5.3</XunitVersion>
<XunitRunnerVersion>2.5.3</XunitRunnerVersion>
<TestSdkVersion>17.7.2</TestSdkVersion>
<HyperionVersion>0.12.2</HyperionVersion>
<NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
<NBenchVersion>2.0.1</NBenchVersion>
<ProtobufVersion>3.24.4</ProtobufVersion>
<BenchmarkDotNetVersion>0.13.9</BenchmarkDotNetVersion>
<ProtobufVersion>3.25.0</ProtobufVersion>
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
<NetTestVersion>net7.0</NetTestVersion>
<FsharpVersion>6.0.5</FsharpVersion>
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.10" />
<!-- FluentAssertions is used in some benchmarks to validate internal behaviors -->
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.10" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ namespace Akka.Persistence.Query
{
public static Akka.Persistence.Query.NoOffset Instance { get; }
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override string ToString() { }
}
public abstract class Offset : System.IComparable<Akka.Persistence.Query.Offset>
{
Expand All @@ -72,6 +73,7 @@ namespace Akka.Persistence.Query
public static Akka.Persistence.Query.Offset NoOffset() { }
public static Akka.Persistence.Query.Offset Sequence(long value) { }
public static Akka.Persistence.Query.Offset TimeBasedUuid(System.Guid value) { }
public virtual string ToString() { }
}
public sealed class PersistenceQuery : Akka.Actor.IExtension
{
Expand Down Expand Up @@ -100,6 +102,7 @@ namespace Akka.Persistence.Query
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override bool Equals(object obj) { }
public override int GetHashCode() { }
public override string ToString() { }
}
public sealed class TimeBasedUuid : Akka.Persistence.Query.Offset, System.IComparable<Akka.Persistence.Query.TimeBasedUuid>
{
Expand All @@ -109,5 +112,6 @@ namespace Akka.Persistence.Query
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override bool Equals(object obj) { }
public override int GetHashCode() { }
public override string ToString() { }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ namespace Akka.Persistence.Query
{
public static Akka.Persistence.Query.NoOffset Instance { get; }
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override string ToString() { }
}
public abstract class Offset : System.IComparable<Akka.Persistence.Query.Offset>
{
Expand All @@ -72,6 +73,7 @@ namespace Akka.Persistence.Query
public static Akka.Persistence.Query.Offset NoOffset() { }
public static Akka.Persistence.Query.Offset Sequence(long value) { }
public static Akka.Persistence.Query.Offset TimeBasedUuid(System.Guid value) { }
public virtual string ToString() { }
}
public sealed class PersistenceQuery : Akka.Actor.IExtension
{
Expand Down Expand Up @@ -100,6 +102,7 @@ namespace Akka.Persistence.Query
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override bool Equals(object obj) { }
public override int GetHashCode() { }
public override string ToString() { }
}
public sealed class TimeBasedUuid : Akka.Persistence.Query.Offset, System.IComparable<Akka.Persistence.Query.TimeBasedUuid>
{
Expand All @@ -109,5 +112,6 @@ namespace Akka.Persistence.Query
public override int CompareTo(Akka.Persistence.Query.Offset other) { }
public override bool Equals(object obj) { }
public override int GetHashCode() { }
public override string ToString() { }
}
}
19 changes: 19 additions & 0 deletions src/core/Akka.Persistence.Query.Tests/OffsetSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,24 @@ public void Sequence_offset_must_be_ordered_correctly()
var shuffledSequenceBasedList = sequenceBasedList.OrderBy(_ => Guid.NewGuid());
shuffledSequenceBasedList.Should().BeEquivalentTo(sequenceBasedList);
}

[Fact]
public void Sequence_must_log_value_correctly()
{
Assert.Equal("7", new Sequence(7).ToString());
}

[Fact]
public void TimeBasedUuid_must_log_value_correctly()
{
var timeBasedUuid = new TimeBasedUuid(new Guid("49225740-2019-11ea-a6f0-a0a60c2ef4ff"));
Assert.Equal("49225740-2019-11ea-a6f0-a0a60c2ef4ff", timeBasedUuid.ToString());
}

[Fact]
public void NoOffset_must_log_zero()
{
Assert.Equal("0", NoOffset.Instance.ToString());
}
}
}
11 changes: 11 additions & 0 deletions src/core/Akka.Persistence.Query/Offset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ public abstract class Offset : IComparable<Offset>
/// </summary>
/// <param name="other">The other offset to compare.</param>
public abstract int CompareTo(Offset other);

/// <summary>
/// Used to log offset's value
/// </summary>
public abstract override string ToString();
}

/// <summary>
Expand Down Expand Up @@ -83,6 +88,8 @@ public override int CompareTo(Offset other)

throw new InvalidOperationException($"Can't compare offset of type {GetType()} to offset of type {other.GetType()}");
}

public override string ToString() => Value.ToString();
}

/// <summary>
Expand Down Expand Up @@ -123,6 +130,8 @@ public override int CompareTo(Offset other)
? CompareTo(seq)
: throw new InvalidOperationException($"Can't compare offset of type {GetType()} to offset of type {other.GetType()}");
}

public override string ToString() => Value.ToString();
}

/// <summary>
Expand All @@ -145,5 +154,7 @@ public override int CompareTo(Offset other)

throw new InvalidOperationException($"Can't compare offset of type {GetType()} to offset of type {other.GetType()}");
}

public override string ToString() => "0";
}
}

0 comments on commit 06a0b43

Please sign in to comment.