Fix bad conflicts resolving

Avogar · Avogar · commit 2541ad69d540 · 2023-05-22T18:23:39.000Z
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
@@ -4,6 +4,8 @@
 
 namespace ProfileEvents
 {
+    extern const Event DistributedConnectionTries;
+    extern const Event DistributedConnectionUsable;
     extern const Event DistributedConnectionMissingTable;
     extern const Event DistributedConnectionStaleReplica;
 }
@@ -35,6 +37,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
     SCOPE_EXIT(is_finished = true);
     try
     {
+        ProfileEvents::increment(ProfileEvents::DistributedConnectionTries);
         result.entry = pool->get(*timeouts, settings, /* force_connected = */ false);
         AsyncCallbackSetter async_setter(&*result.entry, std::move(async_callback));
 
@@ -45,6 +48,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
         if (!table_to_check || server_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)
         {
             result.entry->forceConnected(*timeouts);
+            ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);
             result.is_usable = true;
             result.is_up_to_date = true;
             return;
@@ -65,6 +69,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
             return;
         }
 
+        ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);
         result.is_usable = true;
 
         UInt64 max_allowed_delay = settings ? UInt64(settings->max_replica_delay_for_distributed_queries) : 0;

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace ProfileEvents`
`6`	`6`	`{`
	`7`	`+ extern const Event DistributedConnectionTries;`
	`8`	`+ extern const Event DistributedConnectionUsable;`
`7`	`9`	`extern const Event DistributedConnectionMissingTable;`
`8`	`10`	`extern const Event DistributedConnectionStaleReplica;`
`9`	`11`	`}`
`@@ -35,6 +37,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::`
`35`	`37`	`SCOPE_EXIT(is_finished = true);`
`36`	`38`	`try`
`37`	`39`	`{`
	`40`	`+ ProfileEvents::increment(ProfileEvents::DistributedConnectionTries);`
`38`	`41`	`result.entry = pool->get(timeouts, settings, / force_connected = */ false);`
`39`	`42`	`AsyncCallbackSetter async_setter(&*result.entry, std::move(async_callback));`
`40`	`43`
`@@ -45,6 +48,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::`
`45`	`48`	`if (!table_to_check \|\| server_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)`
`46`	`49`	`{`
`47`	`50`	`result.entry->forceConnected(*timeouts);`
	`51`	`+ ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);`
`48`	`52`	`result.is_usable = true;`
`49`	`53`	`result.is_up_to_date = true;`
`50`	`54`	`return;`
`@@ -65,6 +69,7 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::`
`65`	`69`	`return;`
`66`	`70`	`}`
`67`	`71`
	`72`	`+ ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);`
`68`	`73`	`result.is_usable = true;`
`69`	`74`
`70`	`75`	`UInt64 max_allowed_delay = settings ? UInt64(settings->max_replica_delay_for_distributed_queries) : 0;`