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

Compare commits

base: TrueCloudLab:master
Branches Tags
TrueCloudLab:master
potyarkin:feature/add-codeowners
potyarkin:feature/ci-linter
potyarkin:empty
..
compare: potyarkin:feature/add-codeowners
Branches Tags
potyarkin:feature/add-codeowners
potyarkin:feature/ci-linter
potyarkin:empty
TrueCloudLab:master

No commits in common. "master" and "feature/add-codeowners" have entirely different histories.
master ... feature/ad

4 changed files with 19 additions and 78 deletions
Show stats Expand all files Collapse all files

6
src/FrostFS.SDK.Client/Models/Object/FrostFsSplitInfo.cs
View file

@ -20,9 +20,7 @@ public class FrostFsSplitInfo
public SplitId SplitId => _splitId ??= new SplitId(_splitInfo.SplitId.ToUuid());
public FrostFsObjectId? Link => _link ??= _splitInfo.Link == null
? null : FrostFsObjectId.FromHash(_splitInfo.Link.Value.Span);
public FrostFsObjectId Link => _link ??= FrostFsObjectId.FromHash(_splitInfo.Link.Value.Span);
public FrostFsObjectId? LastPart => _lastPart ??= _splitInfo.LastPart == null
? null : FrostFsObjectId.FromHash(_splitInfo.LastPart.Value.Span);
public FrostFsObjectId LastPart => _lastPart ??= FrostFsObjectId.FromHash(_splitInfo.LastPart.Value.Span);
}

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

@ -39,8 +39,6 @@ public partial class Pool : IFrostFSClient
private OwnerID? _ownerId;
private FrostFsVersion _version;
private FrostFsOwner? _owner;
private FrostFsOwner Owner
@ -96,8 +94,6 @@ public partial class Pool : IFrostFSClient
throw new ArgumentException($"Missed required parameter {nameof(options.Key)}");
}
_version = new FrostFsVersion(2, 13);
var nodesParams = AdjustNodeParams(options.NodeParams);
var cache = new SessionCache(options.SessionExpirationDuration);

4
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)
{
var grpcObject = ObjectTools.CreateSingleObject(args.FrostFsObject, ClientContext);
var grpcObject = ObjectTools.CreateObject(args.FrostFsObject, ClientContext);
var request = new PutSingleRequest
{
@ -565,7 +565,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
if (header.Split != null)
{
ObjectTools.SetSplitValues(grpcHeader, header.Split, ClientContext.Owner, ClientContext.Version, ClientContext.Key);
ObjectTools.SetSplitValues(grpcHeader, header.Split, ClientContext);
}
var oid = new ObjectID { Value = grpcHeader.Sha256() };

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

@ -1,4 +1,3 @@
using System;
using System.Linq;
using FrostFS.Object;
@ -10,44 +9,9 @@ using Google.Protobuf;
namespace FrostFS.SDK.Client;
public static class ObjectTools
internal static class ObjectTools
{
public static FrostFsObjectId CalculateObjectId(
FrostFsObjectHeader header,
ReadOnlyMemory<byte> payloadHash,
FrostFsOwner owner,
FrostFsVersion version,
ClientKey key)
{
if (header is null)
{
throw new ArgumentNullException(nameof(header));
}
if (owner is null)
{
throw new ArgumentNullException(nameof(owner));
}
if (version is null)
{
throw new ArgumentNullException(nameof(version));
}
if (key is null)
{
throw new ArgumentNullException(nameof(key));
}
var grpcHeader = CreateHeader(header, payloadHash, owner, version);
if (header.Split != null)
SetSplitValues(grpcHeader, header.Split, owner, version, key);
return new ObjectID { Value = grpcHeader.Sha256() }.ToModel();
}
internal static Object.Object CreateSingleObject(FrostFsObject @object, ClientContext ctx)
internal static Object.Object CreateObject(FrostFsObject @object, ClientContext ctx)
{
@object.Header.OwnerId ??= ctx.Owner;
@object.Header.Version ??= ctx.Version;
@ -60,7 +24,7 @@ public static class ObjectTools
var split = @object.Header.Split;
if (split != null)
{
SetSplitValues(grpcHeader, split, ctx.Owner, ctx.Version, ctx.Key);
SetSplitValues(grpcHeader, split, ctx);
}
var obj = new Object.Object
@ -79,18 +43,13 @@ public static class ObjectTools
return obj;
}
internal static void SetSplitValues(
Header grpcHeader,
FrostFsSplit split,
FrostFsOwner owner,
FrostFsVersion version,
ClientKey key)
internal static void SetSplitValues(Header grpcHeader, FrostFsSplit split, ClientContext ctx)
{
if (split == null)
return;
if (key == null)
throw new FrostFsInvalidObjectException(nameof(key));
if (ctx.Key == null)
throw new FrostFsInvalidObjectException(nameof(ctx.Key));
grpcHeader.Split = new Header.Types.Split
{
@ -102,33 +61,30 @@ public static class ObjectTools
if (split.ParentHeader is not null)
{
var grpcParentHeader = CreateHeader(split.ParentHeader, Array.Empty<byte>().Sha256(), owner, version);
var grpcParentHeader = CreateHeader(split.ParentHeader, [], ctx);
grpcHeader.Split.Parent = new ObjectID { Value = grpcParentHeader.Sha256() };
grpcHeader.Split.ParentHeader = grpcParentHeader;
grpcHeader.Split.ParentSignature = new Signature
{
Key = key.PublicKeyProto,
Sign = key.ECDsaKey.SignData(grpcHeader.Split.Parent.ToByteArray()),
Key = ctx.Key.PublicKeyProto,
Sign = ctx.Key.ECDsaKey.SignData(grpcHeader.Split.Parent.ToByteArray()),
};
}
grpcHeader.Split.Previous = split.Previous?.ToMessage();
}
internal static Header CreateHeader(
FrostFsObjectHeader header,
ReadOnlyMemory<byte> payloadChecksum,
FrostFsOwner owner,
FrostFsVersion version)
internal static Header CreateHeader(FrostFsObjectHeader header, byte[]? payload, ClientContext ctx)
{
header.OwnerId ??= owner;
header.Version ??= version;
header.OwnerId ??= ctx.Owner;
header.Version ??= ctx.Version;
var grpcHeader = header.GetHeader();
grpcHeader.PayloadHash = ChecksumFromSha256(payloadChecksum);
if (payload != null) // && payload.Length > 0
grpcHeader.PayloadHash = Sha256Checksum(payload);
return grpcHeader;
}
@ -140,13 +96,4 @@ public static class ObjectTools
Sum = ByteString.CopyFrom(data.Sha256())
};
}
internal static Checksum ChecksumFromSha256(ReadOnlyMemory<byte> dataHash)
{
return new Checksum
{
Type = ChecksumType.Sha256,
Sum = UnsafeByteOperations.UnsafeWrap(dataHash)
};
}
}