[#64] Fix for client cut logic
Signed-off-by: Pavel Gross <p.gross@yadro.com>
This commit is contained in:
parent
764b669295
commit
f099edb17b
7 changed files with 13 additions and 12 deletions
|
@ -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")]
|
||||||
|
|
|
@ -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.5</Version>
|
<Version>1.0.6</Version>
|
||||||
<Description>
|
<Description>
|
||||||
C# SDK for FrostFS gRPC native protocol
|
C# SDK for FrostFS gRPC native protocol
|
||||||
</Description>
|
</Description>
|
||||||
|
|
|
@ -582,14 +582,15 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
|
||||||
var restPart = (fullLength % (ulong)partSize) > 0 ? 1 : 0;
|
var restPart = (fullLength % (ulong)partSize) > 0 ? 1 : 0;
|
||||||
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, but if it is not upload resuming
|
||||||
if (objectsCount == 1)
|
if (objectsCount == 1 && progressInfo != null && 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;
|
||||||
|
|
|
@ -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")]
|
||||||
|
|
|
@ -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.5</Version>
|
<Version>1.0.6</Version>
|
||||||
<Description>
|
<Description>
|
||||||
Cryptography tools for C# SDK
|
Cryptography tools for C# SDK
|
||||||
</Description>
|
</Description>
|
||||||
|
|
|
@ -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")]
|
||||||
|
|
|
@ -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.5</Version>
|
<Version>1.0.6</Version>
|
||||||
<Description>
|
<Description>
|
||||||
Protobuf client for C# SDK
|
Protobuf client for C# SDK
|
||||||
</Description>
|
</Description>
|
||||||
|
|
Loading…
Add table
Reference in a new issue