Merge 75c452b into db527f7

Author: FloatingCrowbar

ydb/core/persqueue/key.h

@@ -35,8 +35,8 @@ class TKeyPrefix : public TBuffer
         : Partition(partition)
     {
         Resize(UnmarkedSize());
-        *PtrType() = type;
-        memcpy(PtrPartition(),  Sprintf("%.10" PRIu32, Partition.InternalPartitionId).data(), 10);
+        SetType(type);
+        memcpy(PtrPartition(), Sprintf("%.10" PRIu32, Partition.InternalPartitionId).data(), 10);
     }
 
     TKeyPrefix(EType type, const TPartitionId& partition, EMark mark)
@@ -62,25 +62,77 @@ class TKeyPrefix : public TBuffer
     static constexpr ui32 MarkPosition() { return UnmarkedSize(); }
     static constexpr ui32 MarkedSize() { return UnmarkedSize() + 1; }
 
+
     void SetType(EType type) {
-        *PtrType() = type;
+        if (!IsServicePartition()) {
+            *PtrType() = type;
+            return;
+        }
+        switch (type) {
+            case TypeNone:
+                *PtrType() = TypeNone;
+            case TypeData:
+                return ServiceTypeData;
+            case TypeTmpData:
+                *PtrType() = ServiceTypeTmpData;
+            case TypeInfo:
+                *PtrType() = ServiceTypeInfo;
+            case TypeMeta:
+                *PtrType() = ServiceTypeMeta;
+                return TypeMeta;
+            case TypeTxMeta:
+               *PtrType() = ServiceTypeTxMeta;
+        }
     }
 
+
     EType GetType() const {
-        return EType(*PtrType());
+        switch (*PtrType()) {
+            case TypeNone:
+                return TypeNone;
+            case TypeData:
+            case ServiceTypeData:
+                return TypeData;
+            case TypeTmpData:
+            case ServiceTypeTmpData:
+                return TypeTmpData;
+            case TypeInfo:
+            case ServiceTypeInfo:
+                return TypeInfo;
+            case TypeMeta:
+            case ServiceTypeMeta:
+                return TypeMeta;
+            case TypeTxMeta:
+            case ServiceTypeTxMeta:
+                return TypeTxMeta;
+        }
+        Y_ABORT();
+        return TypeNone;
     }
 
+    bool IsServicePartition() const {return Partition.WriteId.Defined();}
+
     const TPartitionId& GetPartition() const { return Partition; }
 
 protected:
     static constexpr ui32 UnmarkedSize() { return 1 + 10; }
 
     void ParsePartition()
     {
-        Partition.InternalPartitionId = FromString<ui32>(TStringBuf{PtrPartition(), 10});
+        Partition.OriginalPartitionId = FromString<ui32>(TStringBuf{PtrPartition(), 10});
+        Partition.InternalPartitionId = Partition.OriginalPartitionId;
     }
 
+
 private:
+    enum EServiceType : char {
+        ServiceTypeInfo = 'M',
+        ServiceTypeData = 'D',
+        ServiceTypeTmpData = 'X',
+        ServiceTypeMeta = 'J',
+        ServiceTypeTxMeta = 'K'
+    };
+
     char* PtrType() { return Data(); }
     char* PtrMark() { return Data() + UnmarkedSize(); }
     char* PtrPartition() { return Data() + 1; }
@@ -90,6 +142,7 @@ class TKeyPrefix : public TBuffer
     const char* PtrPartition() const { return Data() + 1; }
 
     TPartitionId Partition;
+
 };
 
 // {char type; ui32 partiton; ui64 offset; ui16 partNo; ui32 count, ui16 internalPartsCount}

ydb/core/persqueue/ut/internals_ut.cpp

@@ -228,6 +228,29 @@ Y_UNIT_TEST(TestKeyRange) {
     UNIT_ASSERT_STRINGS_EQUAL(ToHex(result), ToHex(expected));
 } // Y_UNIT_TEST(TestKeyRange)
 
+Y_UNIT_TEST(StoreKeys) {
+    TKey keyOld(TKeyPrefix::TypeData, TPartitionId{9}, 8, 7, 6, 5, false);
+    UNIT_ASSERT_VALUES_EQUAL(keyOld.ToString(), "d0000000009_00000000000000000008_00007_0000000006_00005");
+
+    TKey keyNew(TKeyPrefix::TypeData, TPartitionId{5, 1, 9}, 8, 7, 6, 5, false);
+    UNIT_ASSERT_VALUES_EQUAL(keyNew.ToString(), "D0000000009_00000000000000000008_00007_0000000006_00005");
+
+    keyNew.SetType(TKeyPrefix::TypeInfo);
+    UNIT_ASSERT_VALUES_EQUAL(keyNew.ToString(), "M00000000009_00000000000000000008_00007_0000000006_00005");
+}
+
+Y_UNIT_TEST(RestoreKeys) {
+    {
+        TKey key("X0000000001_00000000000000000002_00003_0000000004_00005");
+        UNIT_ASSERT(key.GetType() == TKeyPrefix::TypeTmpData);
+        UNIT_ASSERT_VALUES_EQUAL(key.GetPartition().InternalPartitionId, 1);
+    }
+    {
+        TKey key("i0000000001_00000000000000000002_00003_0000000004_00005");
+        UNIT_ASSERT(key.GetType() == TKeyPrefix::TypeMeta);
+        UNIT_ASSERT_VALUES_EQUAL(key.GetPartition().InternalPartitionId, 1);
+    }
+}
 
 } //Y_UNIT_TEST_SUITE