Merge pull request #190 from RayTale/develop

Develop
RayTale · Jul 19, 2022 · 6abfd84 · 6abfd84
2 parents 3801c2a + c39418d
commit 6abfd84
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 37 deletions.
diff --git a/Packages.props b/Packages.props
@@ -7,37 +7,37 @@
     <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.ObjectPool" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Extensions.ObjectPool" Version="6.0.7" />
     <PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
 
-    <PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.0">
+    <PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="3.6.0"/>
-    <PackageReference Update="Microsoft.Orleans.Core" Version="3.6.0" />
-    <PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="3.6.0" />
-    <PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.0" />
-    <PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="3.6.0" />
-    <PackageReference Update="Microsoft.Orleans.TestingHost" Version="3.6.0" />
+    <PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="3.6.2"/>
+    <PackageReference Update="Microsoft.Orleans.Core" Version="3.6.2" />
+    <PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="3.6.2" />
+    <PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.2" />
+    <PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="3.6.2" />
+    <PackageReference Update="Microsoft.Orleans.TestingHost" Version="3.6.2" />
 
     <PackageReference Update="System.Buffers" Version="4.5.1" />
     <PackageReference Update="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Update="System.Text.Json" Version="6.0.1" />
     <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
-    <PackageReference Update="Confluent.Kafka" Version="1.8.2" />
-    <PackageReference Update="RabbitMQ.Client" Version="5.2.0" />
+    <PackageReference Update="Confluent.Kafka" Version="1.9.0" />
+    <PackageReference Update="RabbitMQ.Client" Version="6.4.0" />
     <PackageReference Update="System.Reactive" Version="4.4.1" />
-    <PackageReference Update="linq2db" Version="3.6.0" />
-    <PackageReference Update="IdGen" Version="3.0.0" />
+    <PackageReference Update="linq2db" Version="4.1.1" />
+    <PackageReference Update="IdGen" Version="3.0.1" />
 
     <PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />
-    <PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.1" />
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.7" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.108" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -52,13 +52,13 @@
     </PackageReference>
 
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1"  PrivateAssets="All"/>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="coverlet.collector" Version="3.1.0">
+    <PackageReference Update="coverlet.collector" Version="3.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/examples/Packages.props b/examples/Packages.props
@@ -2,11 +2,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\Packages.props" />
  <ItemGroup>
-   <PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.0" />
+   <PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.1" />
    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-   <PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.1" />
-   <PackageReference Update="MySqlConnector" Version="2.1.4" />
-   <PackageReference Update="Npgsql" Version="6.0.2" />
-   <PackageReference Update="Microsoft.Data.SqlClient" Version="4.0.1" />
+   <PackageReference Update="MySqlConnector" Version="2.1.11" />
+   <PackageReference Update="Npgsql" Version="6.0.5" />
+   <PackageReference Update="Microsoft.Data.SqlClient" Version="4.1.0" />
  </ItemGroup>
 </Project>
diff --git a/examples/Transfer.Server/Transfer.Server.csproj b/examples/Transfer.Server/Transfer.Server.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Orleans.OrleansRuntime" />
     <PackageReference Include="MySqlConnector" />
     <PackageReference Include="Npgsql" />
-    <PackageReference Include="Microsoft.Data.SqlClient"/>
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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<TPrimaryKey>
     {
-        [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
@@ -7,8 +7,7 @@ namespace Vertex.Storage.Linq2db.Entities
     public class SnapshotEntity<TPrimaryKey>
     {
         [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
@@ -1,14 +1,12 @@
-using LinqToDB;
-using LinqToDB.Mapping;
+using LinqToDB.Mapping;
 
 namespace Vertex.Storage.Linq2db.Entities
 {
     [Table]
     public class SubSnapshotEntity<TPrimaryKey>
     {
         [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
@@ -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
@@ -7,7 +7,9 @@ public record SnapshotMeta<TPrimaryKey>
         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
@@ -25,7 +25,6 @@
 using Vertex.Runtime.Exceptions;
 using Vertex.Runtime.Options;
 using Vertex.Utils.Emit;
-using Vertex.Abstractions.Event;
 
 namespace Vertex.Runtime.Actor
 {