From 7ea4d475a024af4ef384255176671c96ad5b4815 Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Tue, 4 Aug 2020 11:43:34 +0300 Subject: [PATCH] [#26] object: Replace object.Range message definition This commit replaces Range message definition closer to where it is used. In the future, only the types associated with the structure of the object will be defined in types.proto file. Signed-off-by: Leonard Lyubich --- object/service.proto | 7 +++++++ object/types.proto | 7 ------- proto-docs/object.md | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/object/service.proto b/object/service.proto index 91d0b99..9affad7 100644 --- a/object/service.proto +++ b/object/service.proto @@ -157,6 +157,13 @@ message SearchResponse { service.ResponseMetaHeader Meta = 99 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; } +message Range { + // Offset of the data range + uint64 Offset = 1; + // Length of the data range + uint64 Length = 2; +} + message GetRangeRequest { // Address of object (container id + object id) refs.Address Address = 1 [(gogoproto.nullable) = false]; diff --git a/object/types.proto b/object/types.proto index 46e1549..010bf8a 100644 --- a/object/types.proto +++ b/object/types.proto @@ -10,13 +10,6 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.stable_marshaler_all) = true; -message Range { - // Offset of the data range - uint64 Offset = 1; - // Length of the data range - uint64 Length = 2; -} - message UserHeader { // Key of the user's header string Key = 1; diff --git a/proto-docs/object.md b/proto-docs/object.md index 27e4bcf..02eb026 100644 --- a/proto-docs/object.md +++ b/proto-docs/object.md @@ -21,6 +21,7 @@ - [PutRequest](#object.PutRequest) - [PutRequest.PutHeader](#object.PutRequest.PutHeader) - [PutResponse](#object.PutResponse) + - [Range](#object.Range) - [SearchRequest](#object.SearchRequest) - [SearchResponse](#object.SearchResponse) @@ -34,7 +35,6 @@ - [Link](#object.Link) - [Object](#object.Object) - [PublicKey](#object.PublicKey) - - [Range](#object.Range) - [SystemHeader](#object.SystemHeader) - [Tombstone](#object.Tombstone) - [Transform](#object.Transform) @@ -308,6 +308,18 @@ in distributed system. | Meta | [service.ResponseMetaHeader](#service.ResponseMetaHeader) | | ResponseMetaHeader contains meta information based on request processing by server (should be embedded into message) | + + +### Message Range + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| Offset | [uint64](#uint64) | | Offset of the data range | +| Length | [uint64](#uint64) | | Length of the data range | + + ### Message SearchRequest @@ -430,18 +442,6 @@ in distributed system. | Value | [bytes](#bytes) | | Value contains marshaled ecdsa public key | - - -### Message Range - - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| Offset | [uint64](#uint64) | | Offset of the data range | -| Length | [uint64](#uint64) | | Length of the data range | - - ### Message SystemHeader