Restoring authorship annotation for <zhenyok@yandex-team.ru>. Commit 2 of 2.

library/cpp/messagebus/message_status_counter.cpp

@@ -5,7 +5,7 @@
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
-#include <util/stream/str.h> 
+#include <util/stream/str.h>
 
 using namespace NBus;
 using namespace NBus::NPrivate;
@@ -55,17 +55,17 @@ TString TMessageStatusCounter::PrintToString() const {
     return ss.Str();
 }
 
-void TMessageStatusCounter::FillErrorsProtobuf(TConnectionStatusMonRecord* status) const { 
-    status->clear_errorcountbystatus(); 
-    for (size_t i = 0; i < MESSAGE_STATUS_COUNT; ++i) { 
-        if (i == MESSAGE_OK) { 
+void TMessageStatusCounter::FillErrorsProtobuf(TConnectionStatusMonRecord* status) const {
+    status->clear_errorcountbystatus();
+    for (size_t i = 0; i < MESSAGE_STATUS_COUNT; ++i) {
+        if (i == MESSAGE_OK) {
             Y_VERIFY(Counts[i] == 0);
-            continue; 
-        } 
-        if (Counts[i] != 0) { 
-            TMessageStatusRecord* description = status->add_errorcountbystatus(); 
-            description->SetStatus(TMessageStatusCounter::MessageStatusToProtobuf((EMessageStatus)i)); 
-            description->SetCount(Counts[i]); 
-        } 
-    } 
-} 
+            continue;
+        }
+        if (Counts[i] != 0) {
+            TMessageStatusRecord* description = status->add_errorcountbystatus();
+            description->SetStatus(TMessageStatusCounter::MessageStatusToProtobuf((EMessageStatus)i));
+            description->SetCount(Counts[i]);
+        }
+    }
+}

library/cpp/messagebus/message_status_counter.h

@@ -3,7 +3,7 @@
 #include "message_status.h"
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
- 
+
 #include <util/generic/string.h>
 
 #include <array>
@@ -25,9 +25,9 @@ namespace NBus {
             }
 
             TMessageStatusCounter();
- 
+
             TMessageStatusCounter& operator+=(const TMessageStatusCounter&);
- 
+
             TString PrintToString() const;
             void FillErrorsProtobuf(TConnectionStatusMonRecord*) const;
         };

library/cpp/messagebus/message_status_counter_ut.cpp

@@ -1,23 +1,23 @@
 #include <library/cpp/testing/unittest/registar.h>
- 
+
 #include "message_status_counter.h"
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
- 
-using namespace NBus; 
-using namespace NBus::NPrivate; 
- 
+
+using namespace NBus;
+using namespace NBus::NPrivate;
+
 Y_UNIT_TEST_SUITE(MessageStatusCounter) {
     Y_UNIT_TEST(MessageStatusConversion) {
-        const ::google::protobuf::EnumDescriptor* descriptor = 
-            TMessageStatusRecord_EMessageStatus_descriptor(); 
- 
-        for (int i = 0; i < MESSAGE_STATUS_COUNT; i++) { 
-            const ::google::protobuf::EnumValueDescriptor* valueDescriptor = 
-                descriptor->FindValueByName(ToString((EMessageStatus)i)); 
-            UNIT_ASSERT_UNEQUAL(valueDescriptor, nullptr); 
-            UNIT_ASSERT_EQUAL(valueDescriptor->number(), i); 
-        } 
-        UNIT_ASSERT_EQUAL(MESSAGE_STATUS_COUNT, descriptor->value_count()); 
-    } 
-} 
+        const ::google::protobuf::EnumDescriptor* descriptor =
+            TMessageStatusRecord_EMessageStatus_descriptor();
+
+        for (int i = 0; i < MESSAGE_STATUS_COUNT; i++) {
+            const ::google::protobuf::EnumValueDescriptor* valueDescriptor =
+                descriptor->FindValueByName(ToString((EMessageStatus)i));
+            UNIT_ASSERT_UNEQUAL(valueDescriptor, nullptr);
+            UNIT_ASSERT_EQUAL(valueDescriptor->number(), i);
+        }
+        UNIT_ASSERT_EQUAL(MESSAGE_STATUS_COUNT, descriptor->value_count());
+    }
+}

library/cpp/messagebus/monitoring/mon_proto.proto

@@ -4,30 +4,30 @@ package NBus;
 
 option java_package = "ru.yandex.messagebus.monitoring.proto";
 
-message TMessageStatusRecord { 
-    enum EMessageStatus { 
-        MESSAGE_OK = 0; 
-        MESSAGE_CONNECT_FAILED = 1; 
-        MESSAGE_TIMEOUT = 2; 
-        MESSAGE_SERVICE_UNKNOWN = 3; 
-        MESSAGE_BUSY = 4; 
-        MESSAGE_UNKNOWN = 5; 
-        MESSAGE_DESERIALIZE_ERROR = 6; 
-        MESSAGE_HEADER_CORRUPTED = 7; 
-        MESSAGE_DECOMPRESS_ERROR = 8; 
-        MESSAGE_MESSAGE_TOO_LARGE = 9; 
-        MESSAGE_REPLY_FAILED = 10; 
-        MESSAGE_DELIVERY_FAILED = 11; 
-        MESSAGE_INVALID_VERSION = 12; 
-        MESSAGE_SERVICE_TOOMANY = 13; 
-        MESSAGE_SHUTDOWN = 14; 
-        MESSAGE_DONT_ASK = 15; 
-    } 
- 
-    optional EMessageStatus Status = 1; 
-    optional uint32 Count = 2; 
-} 
- 
+message TMessageStatusRecord {
+    enum EMessageStatus {
+        MESSAGE_OK = 0;
+        MESSAGE_CONNECT_FAILED = 1;
+        MESSAGE_TIMEOUT = 2;
+        MESSAGE_SERVICE_UNKNOWN = 3;
+        MESSAGE_BUSY = 4;
+        MESSAGE_UNKNOWN = 5;
+        MESSAGE_DESERIALIZE_ERROR = 6;
+        MESSAGE_HEADER_CORRUPTED = 7;
+        MESSAGE_DECOMPRESS_ERROR = 8;
+        MESSAGE_MESSAGE_TOO_LARGE = 9;
+        MESSAGE_REPLY_FAILED = 10;
+        MESSAGE_DELIVERY_FAILED = 11;
+        MESSAGE_INVALID_VERSION = 12;
+        MESSAGE_SERVICE_TOOMANY = 13;
+        MESSAGE_SHUTDOWN = 14;
+        MESSAGE_DONT_ASK = 15;
+    }
+
+    optional EMessageStatus Status = 1;
+    optional uint32 Count = 2;
+}
+
 message TConnectionStatusMonRecord {
     optional uint32 SendQueueSize = 1          [ (NMonProto.Metric).Type = GAUGE ];
     // client only
@@ -44,8 +44,8 @@ message TConnectionStatusMonRecord {
     optional uint64 ReadMessages = 22          [ (NMonProto.Metric).Type = RATE ];
     optional uint64 ReadSyscalls = 23;
     optional uint64 ReadActs = 24;
- 
-    repeated TMessageStatusRecord ErrorCountByStatus = 25; 
+
+    repeated TMessageStatusRecord ErrorCountByStatus = 25;
 }
 
 message TSessionStatusMonRecord {

library/cpp/messagebus/remote_connection_status.cpp

@@ -128,32 +128,32 @@ size_t TRemoteConnectionWriterStatus::GetInFlight() const {
     return SendQueueSize + AckMessagesSize;
 }
 
-TConnectionStatusMonRecord TRemoteConnectionStatus::GetStatusProtobuf() const { 
-    TConnectionStatusMonRecord status; 
- 
-    // TODO: fill unfilled fields 
-    status.SetSendQueueSize(WriterStatus.SendQueueSize); 
-    status.SetAckMessagesSize(WriterStatus.AckMessagesSize); 
-    // status.SetErrorCount(); 
-    // status.SetWriteBytes(); 
-    // status.SetWriteBytesCompressed(); 
-    // status.SetWriteMessages(); 
-    status.SetWriteSyscalls(WriterStatus.Incremental.NetworkOps); 
-    status.SetWriteActs(WriterStatus.Acts); 
-    // status.SetReadBytes(); 
-    // status.SetReadBytesCompressed(); 
-    // status.SetReadMessages(); 
-    status.SetReadSyscalls(ReaderStatus.Incremental.NetworkOps); 
-    status.SetReadActs(ReaderStatus.Acts); 
- 
-    TMessageStatusCounter sumStatusCounter; 
-    sumStatusCounter += WriterStatus.Incremental.StatusCounter; 
-    sumStatusCounter += ReaderStatus.Incremental.StatusCounter; 
-    sumStatusCounter.FillErrorsProtobuf(&status); 
- 
-    return status; 
-} 
- 
+TConnectionStatusMonRecord TRemoteConnectionStatus::GetStatusProtobuf() const {
+    TConnectionStatusMonRecord status;
+
+    // TODO: fill unfilled fields
+    status.SetSendQueueSize(WriterStatus.SendQueueSize);
+    status.SetAckMessagesSize(WriterStatus.AckMessagesSize);
+    // status.SetErrorCount();
+    // status.SetWriteBytes();
+    // status.SetWriteBytesCompressed();
+    // status.SetWriteMessages();
+    status.SetWriteSyscalls(WriterStatus.Incremental.NetworkOps);
+    status.SetWriteActs(WriterStatus.Acts);
+    // status.SetReadBytes();
+    // status.SetReadBytesCompressed();
+    // status.SetReadMessages();
+    status.SetReadSyscalls(ReaderStatus.Incremental.NetworkOps);
+    status.SetReadActs(ReaderStatus.Acts);
+
+    TMessageStatusCounter sumStatusCounter;
+    sumStatusCounter += WriterStatus.Incremental.StatusCounter;
+    sumStatusCounter += ReaderStatus.Incremental.StatusCounter;
+    sumStatusCounter.FillErrorsProtobuf(&status);
+
+    return status;
+}
+
 TString TRemoteConnectionStatus::PrintToString() const {
     TStringStream ss;
 

library/cpp/messagebus/remote_connection_status.h

@@ -11,10 +11,10 @@
 
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
 
-namespace NBus { 
-    class TConnectionStatusMonRecord; 
-} 
- 
+namespace NBus {
+    class TConnectionStatusMonRecord;
+}
+
 namespace NBus {
     namespace NPrivate {
 #define WRITER_STATE_MAP(XX) \

library/cpp/messagebus/session_impl.cpp

@@ -250,12 +250,12 @@ TString TBusSessionImpl::GetStatus(ui16 flags) {
 TConnectionStatusMonRecord TBusSessionImpl::GetStatusProtobuf() {
     Y_VERIFY(!Queue->GetExecutor()->IsInExecutorThread(),
              "GetStatus must not be called from executor thread");
- 
-    TGuard<TMutex> guard(StatusData.StatusDumpCachedMutex); 
- 
-    return StatusData.StatusDumpCached.ConnectionStatusSummary.GetStatusProtobuf(); 
-} 
- 
+
+    TGuard<TMutex> guard(StatusData.StatusDumpCachedMutex);
+
+    return StatusData.StatusDumpCached.ConnectionStatusSummary.GetStatusProtobuf();
+}
+
 TString TBusSessionImpl::GetStatusSingleLine() {
     TSessionDumpStatus status = GetStatusRecordInternal();
 

ydb/core/base/events.h

@@ -128,15 +128,15 @@ struct TKikimrEvents : TEvents {
         ES_SCHEME_BOARD_MON,
         ES_YQL_ANALYTICS_PROXY = NYq::TEventIds::ES_YQL_ANALYTICS_PROXY,
         ES_BLOB_CACHE,
-        ES_LONG_TX_SERVICE, 
-        ES_TEST_SHARD, 
-        ES_DATASTREAMS_PROXY, 
-        ES_IAM_TOKEN_SERVICE, 
+        ES_LONG_TX_SERVICE,
+        ES_TEST_SHARD,
+        ES_DATASTREAMS_PROXY,
+        ES_IAM_TOKEN_SERVICE,
         ES_HEALTH_CHECK,
         ES_DQ = NYql::NDq::TDqEvents::ES_DQ_COMPUTE, // 4212
         ES_YQ, // 4213
         ES_CHANGE_EXCHANGE,
-        ES_DATABASE_SERVICE, //4215 
+        ES_DATABASE_SERVICE, //4215
         ES_SEQUENCESHARD, // 4216
         ES_SEQUENCEPROXY, // 4217
         ES_CLOUD_STORAGE,

ydb/core/client/server/msgbus_server_pq_metarequest_ut.cpp

@@ -166,7 +166,7 @@ protected:
         request->Record.MutableTabletConfig()->SetCacheSize(10*1024*1024);
         request->Record.SetTxId(12345);
         auto tabletConfig = request->Record.MutableTabletConfig();
-        tabletConfig->SetTopicName(topic); 
+        tabletConfig->SetTopicName(topic);
         tabletConfig->SetVersion(version);
         auto config = tabletConfig->MutablePartitionConfig();
         config->SetMaxCountInPartition(20000000);

ydb/core/driver_lib/cli_base/cli_cmds_db.cpp

@@ -7,7 +7,7 @@
 
 #include <ydb/public/sdk/cpp/client/resources/ydb_resources.h>
 
- 
+
 #include <library/cpp/grpc/client/grpc_client_low.h>
 
 #include <ydb/public/api/grpc/ydb_table_v1.grpc.pb.h>
@@ -805,7 +805,7 @@ public:
 
 class TClientCommandSchemaTableOptions : public TClientCommand {
 public:
-    NGrpc::TGRpcClientConfig ClientConfig; 
+    NGrpc::TGRpcClientConfig ClientConfig;
 
     TClientCommandSchemaTableOptions()
         : TClientCommand("options", {}, "Describe table options")
@@ -923,7 +923,7 @@ public:
 
 class TClientCommandSchemaTableCopy : public TClientCommand {
 public:
-    NGrpc::TGRpcClientConfig ClientConfig; 
+    NGrpc::TGRpcClientConfig ClientConfig;
     TString DatabaseName;
     TVector<TString> SrcValues;
     TVector<TString> DstValues;