diff --git a/Packages.props b/Packages.props index 3d4aa1e..765acc2 100644 --- a/Packages.props +++ b/Packages.props @@ -7,37 +7,37 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + - - + + - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -52,13 +52,13 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/examples/Packages.props b/examples/Packages.props index 79e718f..a63e0dd 100644 --- a/examples/Packages.props +++ b/examples/Packages.props @@ -2,11 +2,10 @@ - + - - - - + + + \ No newline at end of file diff --git a/examples/Transfer.Server/Transfer.Server.csproj b/examples/Transfer.Server/Transfer.Server.csproj index 63af07d..4fa3f71 100644 --- a/examples/Transfer.Server/Transfer.Server.csproj +++ b/examples/Transfer.Server/Transfer.Server.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs b/src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs index da2eaf9..4f88bfc 100644 --- a/src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs +++ b/src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs @@ -6,17 +6,16 @@ namespace Vertex.Storage.Linq2db.Entities [Table] public class EventEntity { - [Column] - [Column(DataType = DataType.VarChar, Length = 200)] + [Column(Length = 200, CanBeNull = false)] public TPrimaryKey ActorId { get; set; } - [Column(DataType = DataType.VarChar, Length = 200)] + [Column(DataType = DataType.VarChar, CanBeNull = false, Length = 200)] public string Name { get; set; } [Column(DataType = DataType.Text)] public string Data { get; set; } - [Column(DataType = DataType.VarChar, Length = 200)] + [Column(DataType = DataType.VarChar, CanBeNull = false, Length = 200)] public string FlowId { get; set; } [Column] diff --git a/src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs b/src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs index 752906d..67b9867 100644 --- a/src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs +++ b/src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs @@ -7,8 +7,7 @@ namespace Vertex.Storage.Linq2db.Entities public class SnapshotEntity { [PrimaryKey] - [Column] - [Column(DataType = DataType.VarChar, Length = 200)] + [Column(Length = 200, CanBeNull = false)] public TPrimaryKey Id { get; set; } [Column(DataType = DataType.Text)] diff --git a/src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs b/src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs index f7c1a96..3262d28 100644 --- a/src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs +++ b/src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs @@ -1,5 +1,4 @@ -using LinqToDB; -using LinqToDB.Mapping; +using LinqToDB.Mapping; namespace Vertex.Storage.Linq2db.Entities { @@ -7,8 +6,7 @@ namespace Vertex.Storage.Linq2db.Entities public class SubSnapshotEntity { [PrimaryKey] - [Column] - [Column(DataType = DataType.VarChar, Length = 200)] + [Column(Length = 200, CanBeNull = false)] public TPrimaryKey Id { get; set; } [Column] diff --git a/src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs b/src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs index 6191afd..cfebc0a 100644 --- a/src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs +++ b/src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs @@ -72,7 +72,7 @@ public Task Run() } else { - list.Add(new BytesBox(whileResult.Body, whileResult)); + list.Add(new BytesBox(whileResult.Body.ToArray(), whileResult)); } if ((DateTimeOffset.UtcNow - batchStartTime).TotalMilliseconds > @@ -98,7 +98,7 @@ public Task Run() $"An error occurred in {this.Queue}"); foreach (var item in list.Where(o => !o.Success)) { - this.Model.Model.BasicReject(((BasicGetResult) item.Origin).DeliveryTag, true); + this.Model.Model.BasicReject(((BasicGetResult)item.Origin).DeliveryTag, true); } } finally diff --git a/src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs b/src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs index 0a29950..05671fb 100644 --- a/src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs +++ b/src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs @@ -7,7 +7,9 @@ public record SnapshotMeta public long DoingVersion { get; set; } public long Version { get; set; } + public long MinEventTimestamp { get; set; } + public long MinEventVersion { get; set; } public bool IsLatest { get; set; } diff --git a/src/Vertex.Runtime/Actor/FlowActor.cs b/src/Vertex.Runtime/Actor/FlowActor.cs index 5aaeb44..beca611 100644 --- a/src/Vertex.Runtime/Actor/FlowActor.cs +++ b/src/Vertex.Runtime/Actor/FlowActor.cs @@ -25,7 +25,6 @@ using Vertex.Runtime.Exceptions; using Vertex.Runtime.Options; using Vertex.Utils.Emit; -using Vertex.Abstractions.Event; namespace Vertex.Runtime.Actor {