Merge 728ad96 into 15f3d76

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,61 @@ class TKeyPrefix : public TBuffer
     static constexpr ui32 MarkPosition() { return UnmarkedSize(); }
     static constexpr ui32 MarkedSize() { return UnmarkedSize() + 1; }
 
+
     void SetType(EType type) {
         *PtrType() = type;
     }
 
+
     EType GetType() const {
-        return EType(*PtrType());
+        switch (*PtrType()) {
+            case TypeNone:
+            case ServiceTypeNone:
+                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 {
+        ServiceTypeNone = 1,
+        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 +126,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}