TrueCloudLab/frostfs-sdk-csharp
18
0
Fork 5
Code Issues 4 Pull requests Projects Releases Packages 3 Activity Actions

[#64] Fix for client cut logic #65

Closed
PavelGrossSpb wants to merge 3 commits from PavelGrossSpb/frostfs-sdk-csharp:UploadFix into master
pull from: PavelGrossSpb/frostfs-sdk-csharp:UploadFix
merge into: TrueCloudLab:master
Conversation 0 Commits 3 Files changed 7 +14 -13
7 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/FrostFS.SDK.Client/AssemblyInfo.cs
View file

@ -1,8 +1,8 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyCompany("FrostFS.SDK.Client")] [assembly: AssemblyCompany("FrostFS.SDK.Client")]
[assembly: AssemblyFileVersion("1.0.4.0")] [assembly: AssemblyFileVersion("1.0.6.0")]
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")] [assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Client")] [assembly: AssemblyProduct("FrostFS.SDK.Client")]
[assembly: AssemblyTitle("FrostFS.SDK.Client")] [assembly: AssemblyTitle("FrostFS.SDK.Client")]
[assembly: AssemblyVersion("1.0.4")] [assembly: AssemblyVersion("1.0.6")]

4
src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj
View file

@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AnalysisMode>AllEnabledByDefault</AnalysisMode> <AnalysisMode>AllEnabledByDefault</AnalysisMode>
<PackageId>FrostFS.SDK.Client</PackageId> <PackageId>FrostFS.SDK.Client</PackageId>
<Version>1.0.4</Version> <Version>1.0.6</Version>
<Description> <Description>
C# SDK for FrostFS gRPC native protocol C# SDK for FrostFS gRPC native protocol
</Description> </Description>
@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" /> <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" /> <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
<PackageReference Include="System.Runtime.Caching" Version="7.0.0" /> <PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.4" /> <PackageReference Include="System.Text.Json" Version="7.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs
View file

@ -583,13 +583,14 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
var objectsCount = fullLength > 0 ? (int)(fullLength / (ulong)partSize) + restPart : 0; var objectsCount = fullLength > 0 ? (int)(fullLength / (ulong)partSize) + restPart : 0;
// if the object fits one part, it can be loaded as non-complex object // if the object fits one part, it can be loaded as non-complex object
if (objectsCount == 1) if (objectsCount == 1 && progressInfo.GetLast().Length == 0)
{ {
args.PutObjectContext.MaxObjectSizeCache = partSize; args.PutObjectContext.MaxObjectSizeCache = partSize;
args.PutObjectContext.FullLength = fullLength;
var singlePartResult = await PutMultipartStreamObjectAsync(args, default).ConfigureAwait(false); var singlePartResult = await PutMultipartStreamObjectAsync(args, default).ConfigureAwait(false);
return singlePartResult.ObjectId; return singlePartResult.ObjectId;
} }
progressInfo ??= new UploadProgressInfo(Guid.NewGuid(), objectsCount); progressInfo ??= new UploadProgressInfo(Guid.NewGuid(), objectsCount);
var remain = fullLength; var remain = fullLength;

4
src/FrostFS.SDK.Cryptography/AssemblyInfo.cs
View file

@ -1,8 +1,8 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyCompany("FrostFS.SDK.Cryptography")] [assembly: AssemblyCompany("FrostFS.SDK.Cryptography")]
[assembly: AssemblyFileVersion("1.0.4.0")] [assembly: AssemblyFileVersion("1.0.6.0")]
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")] [assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Cryptography")] [assembly: AssemblyProduct("FrostFS.SDK.Cryptography")]
[assembly: AssemblyTitle("FrostFS.SDK.Cryptography")] [assembly: AssemblyTitle("FrostFS.SDK.Cryptography")]
[assembly: AssemblyVersion("1.0.4.0")] [assembly: AssemblyVersion("1.0.6.0")]

4
src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj
View file

@ -5,7 +5,7 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<PackageId>FrostFS.SDK.Cryptography</PackageId> <PackageId>FrostFS.SDK.Cryptography</PackageId>
<Version>1.0.4</Version> <Version>1.0.6</Version>
<Description> <Description>
Cryptography tools for C# SDK Cryptography tools for C# SDK
</Description> </Description>
@ -35,7 +35,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.Memory" Version="4.5.5" /> <PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Text.Json" Version="7.0.4" /> <PackageReference Include="System.Text.Json" Version="7.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/FrostFS.SDK.Protos/AssemblyInfo.cs
View file

@ -1,8 +1,8 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyCompany("FrostFS.SDK.Protos")] [assembly: AssemblyCompany("FrostFS.SDK.Protos")]
[assembly: AssemblyFileVersion("1.0.4.0")] [assembly: AssemblyFileVersion("1.0.6.0")]
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")] [assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Protos")] [assembly: AssemblyProduct("FrostFS.SDK.Protos")]
[assembly: AssemblyTitle("FrostFS.SDK.Protos")] [assembly: AssemblyTitle("FrostFS.SDK.Protos")]
[assembly: AssemblyVersion("1.0.4.0")] [assembly: AssemblyVersion("1.0.6.0")]

2
src/FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj
View file

@ -5,7 +5,7 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<PackageId>FrostFS.SDK.Protos</PackageId> <PackageId>FrostFS.SDK.Protos</PackageId>
<Version>1.0.4</Version> <Version>1.0.6</Version>
<Description> <Description>
Protobuf client for C# SDK Protobuf client for C# SDK
</Description> </Description>