(style guide) PQ writer KIKIMR-18159

9 files changed, 44 insertions, 47 deletions

diff --git a/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt b/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt
index facc5b0ca5..29c28de57e 100644
--- a/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt
@@ -12,14 +12,17 @@ target_link_libraries(core-persqueue-writer PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  cpp-digest-md5
   cpp-string_utils-base64
   ydb-core-base
   core-persqueue-events
   ydb-core-protos
   public-lib-base
+  lib-deprecated-kicli
+  cpp-client-ydb_params
 )
 target_sources(core-persqueue-writer PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/metadata_initializers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/writer.cpp
 )
diff --git a/ydb/core/persqueue/writer/CMakeLists.linux-aarch64.txt b/ydb/core/persqueue/writer/CMakeLists.linux-aarch64.txt
index 64893626e2..21840f9a4b 100644
--- a/ydb/core/persqueue/writer/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.linux-aarch64.txt
@@ -13,14 +13,17 @@ target_link_libraries(core-persqueue-writer PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  cpp-digest-md5
   cpp-string_utils-base64
   ydb-core-base
   core-persqueue-events
   ydb-core-protos
   public-lib-base
+  lib-deprecated-kicli
+  cpp-client-ydb_params
 )
 target_sources(core-persqueue-writer PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/metadata_initializers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/writer.cpp
 )
diff --git a/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt b/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt
index 64893626e2..21840f9a4b 100644
--- a/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt
@@ -13,14 +13,17 @@ target_link_libraries(core-persqueue-writer PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  cpp-digest-md5
   cpp-string_utils-base64
   ydb-core-base
   core-persqueue-events
   ydb-core-protos
   public-lib-base
+  lib-deprecated-kicli
+  cpp-client-ydb_params
 )
 target_sources(core-persqueue-writer PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/metadata_initializers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/writer.cpp
 )
diff --git a/ydb/core/persqueue/writer/CMakeLists.windows-x86_64.txt b/ydb/core/persqueue/writer/CMakeLists.windows-x86_64.txt
index facc5b0ca5..29c28de57e 100644
--- a/ydb/core/persqueue/writer/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.windows-x86_64.txt
@@ -12,14 +12,17 @@ target_link_libraries(core-persqueue-writer PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  cpp-digest-md5
   cpp-string_utils-base64
   ydb-core-base
   core-persqueue-events
   ydb-core-protos
   public-lib-base
+  lib-deprecated-kicli
+  cpp-client-ydb_params
 )
 target_sources(core-persqueue-writer PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/metadata_initializers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/source_id_encoding.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/persqueue/writer/writer.cpp
 )
diff --git a/ydb/core/persqueue/writer/metadata_initializers.cpp b/ydb/core/persqueue/writer/metadata_initializers.cpp
index 563565014a..178a669d52 100644
--- a/ydb/core/persqueue/writer/metadata_initializers.cpp
+++ b/ydb/core/persqueue/writer/metadata_initializers.cpp
@@ -65,5 +65,4 @@ void TSrcIdMetaInitializer::DoPrepare(NInitializer::IInitializerInput::TPtr cont
     controller->OnPreparationFinished(result);
 }
 
-
 } // namespace NKikimr::NGRpcProxy::V1
diff --git a/ydb/core/persqueue/writer/metadata_initializers.h b/ydb/core/persqueue/writer/metadata_initializers.h
index 76799fe162..817809b98c 100644
--- a/ydb/core/persqueue/writer/metadata_initializers.h
+++ b/ydb/core/persqueue/writer/metadata_initializers.h
@@ -3,7 +3,6 @@
 #include <ydb/services/metadata/service.h>
 #include <ydb/services/metadata/abstract/initialization.h>
 
-
 namespace NKikimr::NGRpcProxy::V1 {
 
 using TInitBehaviourPtr = std::shared_ptr<NMetadata::NInitializer::IInitializationBehaviour>;
@@ -28,24 +27,27 @@ protected:
     virtual TString GetInternalStorageTablePath() const override {
         return "TopicPartitionsMapping";
     }
+
     TInitBehaviourPtr ConstructInitializer() const override {
         return TSrcIdMetaInitializer::GetInstant();
     }
+
 public:
     std::shared_ptr<NMetadata::NModifications::IOperationsManager> GetOperationsManager() const override {
         return nullptr;
     }
+
     static TClassBehaviourPtr GetInstant() {
         static TClassBehaviourPtr res{new TSrcIdMetaInitManager()};
         return res;
     }
+
     virtual TString GetTypeId() const override {
         return TypeName<TSrcIdMetaInitManager>();
     }
 
 private:
     TSrcIdMetaInitManager() = default;
-
 };
 
 } // namespace NKikimr::NGRpcProxy::V1
diff --git a/ydb/core/persqueue/writer/source_id_encoding.cpp b/ydb/core/persqueue/writer/source_id_encoding.cpp
index e42a9ba7d1..20a4a09525 100644
--- a/ydb/core/persqueue/writer/source_id_encoding.cpp
+++ b/ydb/core/persqueue/writer/source_id_encoding.cpp
@@ -1,45 +1,39 @@
+#include "metadata_initializers.h"
 #include "source_id_encoding.h"
 
-#include "metadata_initializers.h"
+#include <library/cpp/digest/md5/md5.h>
 #include <library/cpp/string_utils/base64/base64.h>
+
+#include <util/digest/city.h>
+#include <util/digest/murmur.h>
 #include <util/generic/yexception.h>
-#include <util/string/strip.h>
 #include <util/string/builder.h>
 #include <util/string/hex.h>
-#include <util/digest/murmur.h>
-#include <util/digest/city.h>
 #include <util/string/join.h>
+#include <util/string/strip.h>
 
-#include <library/cpp/digest/md5/md5.h>
-
-namespace NKikimr {
-namespace NPQ {
-
+namespace NKikimr::NPQ {
 
 TString GetSourceIdSelectQueryFromPath(const TString& path, ESourceIdTableGeneration generation) {
-    TStringBuilder res;
     switch (generation) {
         case ESourceIdTableGeneration::SrcIdMeta2:
-            res << "--!syntax_v1\n"
+            return TStringBuilder() << "--!syntax_v1\n"
                    "DECLARE $Hash AS Uint32; "
                    "DECLARE $Topic AS Utf8; "
                    "DECLARE $SourceId AS Utf8; "
                    "SELECT Partition, CreateTime, AccessTime FROM `" << path << "` "
                    "WHERE Hash == $Hash AND Topic == $Topic AND SourceId == $SourceId;";
-            break;
         case ESourceIdTableGeneration::PartitionMapping:
-            res << "--!syntax_v1\n"
+            return TStringBuilder() << "--!syntax_v1\n"
                    "DECLARE $Hash AS Uint64; "
                    "DECLARE $Topic AS Utf8; "
                    "DECLARE $SourceId AS Utf8; "
                    "SELECT Partition, CreateTime, AccessTime FROM `"
                    << NGRpcProxy::V1::TSrcIdMetaInitManager::GetInstant()->GetStorageTablePath()
-                    << "` WHERE Hash == $Hash AND Topic == $Topic AND ProducerId == $SourceId;";
-            break;
+                   << "` WHERE Hash == $Hash AND Topic == $Topic AND ProducerId == $SourceId;";
         default:
             Y_FAIL();
     }
-    return res;
 }
 
 TString GetSourceIdSelectQuery(const TString& root, ESourceIdTableGeneration generation) {
@@ -57,10 +51,9 @@ TString GetSourceIdSelectQuery(const TString& root, ESourceIdTableGeneration gen
 }
 
 TString GetUpdateIdSelectQueryFromPath(const TString& path, ESourceIdTableGeneration generation) {
-    TStringBuilder res;
     switch (generation) {
         case ESourceIdTableGeneration::SrcIdMeta2:
-            res << "--!syntax_v1\n"
+            return TStringBuilder() << "--!syntax_v1\n"
                    "DECLARE $SourceId AS Utf8; "
                    "DECLARE $Topic AS Utf8; "
                    "DECLARE $Hash AS Uint32; "
@@ -69,9 +62,8 @@ TString GetUpdateIdSelectQueryFromPath(const TString& path, ESourceIdTableGenera
                    "DECLARE $AccessTime AS Uint64;\n"
                    "UPSERT INTO `" << path << "` (Hash, Topic, SourceId, CreateTime, AccessTime, Partition) VALUES "
                                               "($Hash, $Topic, $SourceId, $CreateTime, $AccessTime, $Partition);";
-            break;
         case ESourceIdTableGeneration::PartitionMapping:
-            res << "--!syntax_v1\n"
+            return TStringBuilder() << "--!syntax_v1\n"
                    "DECLARE $SourceId AS Utf8; "
                    "DECLARE $Topic AS Utf8; "
                    "DECLARE $Hash AS Uint64; "
@@ -81,13 +73,9 @@ TString GetUpdateIdSelectQueryFromPath(const TString& path, ESourceIdTableGenera
                    "UPSERT INTO `" << NGRpcProxy::V1::TSrcIdMetaInitManager::GetInstant()->GetStorageTablePath()
                     << "` (Hash, Topic, ProducerId, CreateTime, AccessTime, Partition) VALUES "
                                               "($Hash, $Topic, $SourceId, $CreateTime, $AccessTime, $Partition);";
-            break;
-
         default:
             Y_FAIL();
     }
-
-    return res;
 }
 
 TString GetUpdateIdSelectQuery(const TString& root, ESourceIdTableGeneration generation) {
@@ -103,7 +91,6 @@ TString GetUpdateIdSelectQuery(const TString& root, ESourceIdTableGeneration gen
     }
 }
 
-
 namespace NSourceIdEncoding {
 
 static const ui32 MURMUR_ARRAY_SEED = 0x9747b28c;
@@ -183,7 +170,6 @@ bool IsValidEncoded(const TString& sourceId) {
     }
 }
 
-
 template <class... TArgs>
 ui64 GetKeysHash(TArgs&&... args) {
     return CityHash64(Join("#", args...));
@@ -208,7 +194,6 @@ TEncodedSourceId EncodeSrcId(const TString& topic, const TString& userSourceId,
     return res;
 }
 
-
 void SetHashToTxParams(NClient::TParameters& parameters, const TEncodedSourceId& encodedSrcId) {
     switch (encodedSrcId.Generation) {
         case ESourceIdTableGeneration::PartitionMapping:
@@ -233,5 +218,5 @@ void SetHashToTParamsBuilder(NYdb::TParamsBuilder& builder, const TEncodedSource
 }
 
 } // NSourceIdEncoding
-} // NPQ
-} // NKikimr
+
+} // NKikimr::NPQ
diff --git a/ydb/core/persqueue/writer/source_id_encoding.h b/ydb/core/persqueue/writer/source_id_encoding.h
index 74e672146c..1aa61114d6 100644
--- a/ydb/core/persqueue/writer/source_id_encoding.h
+++ b/ydb/core/persqueue/writer/source_id_encoding.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <util/generic/fwd.h>
-#include <util/generic/string.h>
 #include <ydb/public/lib/deprecated/kicli/kicli.h>
 #include <ydb/public/sdk/cpp/client/ydb_params/params.h>
 
-namespace NKikimr {
-namespace NPQ {
+#include <util/generic/fwd.h>
+#include <util/generic/string.h>
+
+namespace NKikimr::NPQ {
 
 enum class ESourceIdTableGeneration {
     SrcIdMeta2,
@@ -19,17 +19,13 @@ TString GetUpdateIdSelectQuery(const TString& root, ESourceIdTableGeneration = E
 TString GetSourceIdSelectQueryFromPath(const TString& path, ESourceIdTableGeneration = ESourceIdTableGeneration::SrcIdMeta2);
 TString GetUpdateIdSelectQueryFromPath(const TString& path, ESourceIdTableGeneration = ESourceIdTableGeneration::SrcIdMeta2);
 
-
 namespace NSourceIdEncoding {
 
 TString EncodeSimple(const TString& sourceId);
 TString Encode(const TString& sourceId);
-
 TString Decode(const TString& encodedSourceId);
-
 bool IsValidEncoded(const TString& encodedSourceId);
 
-
 struct TEncodedSourceId {
     TString OriginalSourceId;
     TString EscapedSourceId;
@@ -45,5 +41,5 @@ void SetHashToTParamsBuilder(NYdb::TParamsBuilder& builder, const TEncodedSource
 TEncodedSourceId EncodeSrcId(const TString& topic, const TString& userSourceId, ESourceIdTableGeneration generation);
 
 } // NSourceIdEncoding
-} // NPQ
-} // NKikimr
+
+} // NKikimr::NPQ
diff --git a/ydb/core/persqueue/writer/ya.make b/ydb/core/persqueue/writer/ya.make
index 6fe2de2481..0ab2b4e9ab 100644
--- a/ydb/core/persqueue/writer/ya.make
+++ b/ydb/core/persqueue/writer/ya.make
@@ -1,18 +1,21 @@
 LIBRARY()
 
 SRCS(
-    source_id_encoding.cpp
     metadata_initializers.cpp
+    source_id_encoding.cpp
     writer.cpp
 )
 
 PEERDIR(
     library/cpp/actors/core
+    library/cpp/digest/md5
     library/cpp/string_utils/base64
     ydb/core/base
     ydb/core/persqueue/events
     ydb/core/protos
     ydb/public/lib/base
+    ydb/public/lib/deprecated/kicli
+    ydb/public/sdk/cpp/client/ydb_params
 )
 
 END()