From 9dc375346703cdcceadf3e3835d80bc4fea32ab4 Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Wed, 15 Mar 2023 12:50:43 +0300 Subject: [PATCH] [#13] *: Rename __FROSTFS__ prefix to __SYSTEM__ Signed-off-by: Denis Kirillov --- container/attributes.go | 7 ++++++- netmap/attributes.go | 5 +++-- netmap/attributes_test.go | 2 +- object/attributes.go | 7 ++++++- session/xheaders.go | 5 ++++- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/container/attributes.go b/container/attributes.go index 356a6b9a..1d7c94a2 100644 --- a/container/attributes.go +++ b/container/attributes.go @@ -1,7 +1,7 @@ package container // SysAttributePrefix is a prefix of key to system attribute. -const SysAttributePrefix = "__FROSTFS__" +const SysAttributePrefix = "__SYSTEM__" const ( // SysAttributeSubnet is a string ID of container's storage subnet. @@ -18,19 +18,24 @@ const ( ) // SysAttributePrefixNeoFS is a prefix of key to system attribute. +// Deprecated: use SysAttributePrefix const SysAttributePrefixNeoFS = "__NEOFS__" const ( // SysAttributeSubnetNeoFS is a string ID of container's storage subnet. + // Deprecated: use SysAttributeSubnet SysAttributeSubnetNeoFS = SysAttributePrefixNeoFS + "SUBNET" // SysAttributeNameNeoFS is a string of human-friendly container name registered as the domain in NNS contract. + // Deprecated: use SysAttributeName SysAttributeNameNeoFS = SysAttributePrefixNeoFS + "NAME" // SysAttributeZoneNeoFS is a string of zone for container name. + // Deprecated: use SysAttributeZone SysAttributeZoneNeoFS = SysAttributePrefixNeoFS + "ZONE" // SysAttributeHomomorphicHashingNeoFS is a container's homomorphic hashing state. + // Deprecated: use SysAttributeHomomorphicHashing SysAttributeHomomorphicHashingNeoFS = SysAttributePrefixNeoFS + "DISABLE_HOMOMORPHIC_HASHING" ) diff --git a/netmap/attributes.go b/netmap/attributes.go index 3ebec576..205376b2 100644 --- a/netmap/attributes.go +++ b/netmap/attributes.go @@ -9,9 +9,10 @@ import ( ) // prefix of keys to subnet attributes. -const attrSubnetPrefix = "__FROSTFS__SUBNET_" +const attrSubnetPrefix = "__SYSTEM__SUBNET_" // prefix of keys to subnet attributes. +// Deprecated: use attrSubnetPrefix const attrSubnetPrefixNeoFS = "__NEOFS__SUBNET_" const ( @@ -65,7 +66,7 @@ func subnetAttributeKey(id *refs.SubnetID) string { // - disables non-zero subnet; // - enables zero subnet. // -// Attribute key is calculated from ID using format `__FROSTFS__SUBNET_%s`. +// Attribute key is calculated from ID using format `__SYSTEM__SUBNET_%s`. // Attribute Value is: // - `True` if node enters the subnet; // - `False`, otherwise. diff --git a/netmap/attributes_test.go b/netmap/attributes_test.go index a2b3be90..1a340bd8 100644 --- a/netmap/attributes_test.go +++ b/netmap/attributes_test.go @@ -11,7 +11,7 @@ import ( ) func subnetAttrKey(val string) string { - return "__FROSTFS__SUBNET_" + val + return "__SYSTEM__SUBNET_" + val } func assertSubnetAttrKey(t *testing.T, attr *netmap.Attribute, num uint32) { diff --git a/object/attributes.go b/object/attributes.go index 32936825..9aa592f3 100644 --- a/object/attributes.go +++ b/object/attributes.go @@ -7,7 +7,7 @@ import ( ) // SysAttributePrefix is a prefix of key to system attribute. -const SysAttributePrefix = "__FROSTFS__" +const SysAttributePrefix = "__SYSTEM__" const ( // SysAttributeUploadID marks smaller parts of a split bigger object. @@ -26,21 +26,26 @@ const ( ) // SysAttributePrefixNeoFS is a prefix of key to system attribute. +// Deprecated: use SysAttributePrefix const SysAttributePrefixNeoFS = "__NEOFS__" const ( // SysAttributeUploadIDNeoFS marks smaller parts of a split bigger object. + // Deprecated: use SysAttributeUploadID SysAttributeUploadIDNeoFS = SysAttributePrefixNeoFS + "UPLOAD_ID" // SysAttributeExpEpochNeoFS tells GC to delete object after that epoch. + // Deprecated: use SysAttributeExpEpoch SysAttributeExpEpochNeoFS = SysAttributePrefixNeoFS + "EXPIRATION_EPOCH" // SysAttributeTickEpochNeoFS defines what epoch must produce object // notification. + // Deprecated: use SysAttributeTickEpoch SysAttributeTickEpochNeoFS = SysAttributePrefixNeoFS + "TICK_EPOCH" // SysAttributeTickTopicNeoFS defines what topic object notification // must be sent to. + // Deprecated: use SysAttributeTickTopic SysAttributeTickTopicNeoFS = SysAttributePrefixNeoFS + "TICK_TOPIC" ) diff --git a/session/xheaders.go b/session/xheaders.go index ba3ac8d4..0e02093d 100644 --- a/session/xheaders.go +++ b/session/xheaders.go @@ -1,7 +1,7 @@ package session // ReservedXHeaderPrefix is a prefix of keys to "well-known" X-headers. -const ReservedXHeaderPrefix = "__FROSTFS__" +const ReservedXHeaderPrefix = "__SYSTEM__" const ( // XHeaderNetmapEpoch is a key to the reserved X-header that specifies netmap epoch @@ -16,16 +16,19 @@ const ( ) // ReservedXHeaderPrefixNeoFS is a prefix of keys to "well-known" X-headers. +// Deprecated: use ReservedXHeaderPrefix const ReservedXHeaderPrefixNeoFS = "__NEOFS__" const ( // XHeaderNetmapEpochNeoFS is a key to the reserved X-header that specifies netmap epoch // to use for object placement calculation. If set to '0' or not set, the current // epoch only will be used. + // Deprecated: use XHeaderNetmapEpoch XHeaderNetmapEpochNeoFS = ReservedXHeaderPrefixNeoFS + "NETMAP_EPOCH" // XHeaderNetmapLookupDepthNeoFS is a key to the reserved X-header that limits // how many past epochs back the node will can lookup. If set to '0' or not // set, the current epoch only will be used. + // Deprecated: use XHeaderNetmapLookupDepth XHeaderNetmapLookupDepthNeoFS = ReservedXHeaderPrefixNeoFS + "NETMAP_LOOKUP_DEPTH" )