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

[#28] Client: Move CalculateObjectId from IFrostFsClient to statis tools
All checks were successful
lint-build / dotnet8.0 (push) Successful in 2m23s
Details

Browse source 
Get payload hash as an argument

Signed-off-by: Pavel Gross <p.gross@yadro.com>
This commit is contained in:
Pavel Gross 2024-12-11 12:57:56 +03:00 committed by PavelGrossSpb
parent db9b93b2e6
commit 8637515869
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,7 +268,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
internal async Task<FrostFsObjectId> PutSingleObjectAsync(PrmSingleObjectPut args, CallContext ctx) internal async Task<FrostFsObjectId> PutSingleObjectAsync(PrmSingleObjectPut args, CallContext ctx)
{ {
var grpcObject = ObjectTools.CreateObject(args.FrostFsObject, ClientContext); var grpcObject = ObjectTools.CreateSingleObject(args.FrostFsObject, ClientContext);
var request = new PutSingleRequest var request = new PutSingleRequest
{ {

30
src/FrostFS.SDK.Client/Tools/ObjectTools.cs
View file

@ -14,6 +14,7 @@ public static class ObjectTools
{ {
public static FrostFsObjectId CalculateObjectId( public static FrostFsObjectId CalculateObjectId(
FrostFsObjectHeader header, FrostFsObjectHeader header,
ReadOnlyMemory<byte> payloadHash,
FrostFsOwner owner, FrostFsOwner owner,
FrostFsVersion version, FrostFsVersion version,
ClientKey key) ClientKey key)
@ -38,7 +39,7 @@ public static class ObjectTools
throw new ArgumentNullException(nameof(key)); throw new ArgumentNullException(nameof(key));
} }
var grpcHeader = CreateHeader(header, [], owner, version); var grpcHeader = CreateHeader(header, payloadHash, owner, version);
if (header.Split != null) if (header.Split != null)
SetSplitValues(grpcHeader, header.Split, owner, version, key); SetSplitValues(grpcHeader, header.Split, owner, version, key);
@ -46,7 +47,7 @@ public static class ObjectTools
return new ObjectID { Value = grpcHeader.Sha256() }.ToModel(); return new ObjectID { Value = grpcHeader.Sha256() }.ToModel();
} }
internal static Object.Object CreateObject(FrostFsObject @object, ClientContext ctx) internal static Object.Object CreateSingleObject(FrostFsObject @object, ClientContext ctx)
{ {
@object.Header.OwnerId ??= ctx.Owner; @object.Header.OwnerId ??= ctx.Owner;
@object.Header.Version ??= ctx.Version; @object.Header.Version ??= ctx.Version;
@ -81,7 +82,8 @@ public static class ObjectTools
internal static void SetSplitValues( internal static void SetSplitValues(
Header grpcHeader, Header grpcHeader,
FrostFsSplit split, FrostFsSplit split,
FrostFsOwner owner, FrostFsVersion version, FrostFsOwner owner,
FrostFsVersion version,
ClientKey key) ClientKey key)
{ {
if (split == null) if (split == null)
@ -100,7 +102,7 @@ public static class ObjectTools
if (split.ParentHeader is not null) if (split.ParentHeader is not null)
{ {
var grpcParentHeader = CreateHeader(split.ParentHeader, [], owner, version); var grpcParentHeader = CreateHeader(split.ParentHeader, Array.Empty<byte>().Sha256(), owner, version);
grpcHeader.Split.Parent = new ObjectID { Value = grpcParentHeader.Sha256() }; grpcHeader.Split.Parent = new ObjectID { Value = grpcParentHeader.Sha256() };
grpcHeader.Split.ParentHeader = grpcParentHeader; grpcHeader.Split.ParentHeader = grpcParentHeader;
@ -114,16 +116,19 @@ public static class ObjectTools
grpcHeader.Split.Previous = split.Previous?.ToMessage(); grpcHeader.Split.Previous = split.Previous?.ToMessage();
} }
internal static Header CreateHeader(FrostFsObjectHeader header, byte[]? payload, FrostFsOwner owner, FrostFsVersion version) internal static Header CreateHeader(
FrostFsObjectHeader header,
ReadOnlyMemory<byte> payloadChecksum,
FrostFsOwner owner,
FrostFsVersion version)
{ {
header.OwnerId ??= owner; header.OwnerId ??= owner;
header.Version ??= version; header.Version ??= version;
var grpcHeader = header.GetHeader(); var grpcHeader = header.GetHeader();
if (payload != null) // && payload.Length > 0 grpcHeader.PayloadHash = ChecksumFromSha256(payloadChecksum);
grpcHeader.PayloadHash = Sha256Checksum(payload);
return grpcHeader; return grpcHeader;
} }
@ -135,4 +140,13 @@ public static class ObjectTools
Sum = ByteString.CopyFrom(data.Sha256()) Sum = ByteString.CopyFrom(data.Sha256())
}; };
} }
internal static Checksum ChecksumFromSha256(ReadOnlyMemory<byte> dataHash)
{
return new Checksum
{
Type = ChecksumType.Sha256,
Sum = UnsafeByteOperations.UnsafeWrap(dataHash)
};
}
} }