Skip to content

Develop #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
u-less merged 3 commits into from
Jul 19, 2022
Merged

Develop #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
005dc19
清除代码警告
u-less Jan 27, 2022
6f77180
依赖包升级
u-less Jul 19, 2022
c39418d
修复MySQL字符串异常的bug
u-less Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
9 changes: 4 additions & 5 deletions examples/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion examples/Transfer.Server/Transfer.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 3 additions & 4 deletions src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
6 changes: 2 additions & 4 deletions src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
4 changes: 2 additions & 2 deletions src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 >
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 0 additions & 1 deletion src/Vertex.Runtime/Actor/FlowActor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
using Vertex.Runtime.Exceptions;
using Vertex.Runtime.Options;
using Vertex.Utils.Emit;
using Vertex.Abstractions.Event;

namespace Vertex.Runtime.Actor
{
Expand Down
Loading