Merge pull request ClickHouse#78910 from PedroTadim/next-update

Next BuzzHouse update

Author: PedroTadim

programs/client/FuzzLoop.cpp

@@ -42,6 +42,8 @@ namespace ErrorCodes
 extern const int NOT_IMPLEMENTED;
 extern const int SYNTAX_ERROR;
 extern const int TOO_DEEP_RECURSION;
+extern const int TIMEOUT_EXCEEDED;
+extern const int SOCKET_TIMEOUT;
 extern const int BUZZHOUSE;
 }
 
@@ -499,8 +501,16 @@ bool Client::processBuzzHouseQuery(const String & full_query)
         // Query completed with error, keep the previous starting AST.
         // Also discard the exception that we now know to be non-fatal,
         // so that it doesn't influence the exit code.
+        const auto * exception = server_exception ? server_exception.get() : (client_exception ? client_exception.get() : nullptr);
+        const bool throw_timeout_error = fuzz_config->fail_on_timeout && exception
+            && (exception->code() == ErrorCodes::TIMEOUT_EXCEEDED || exception->code() == ErrorCodes::SOCKET_TIMEOUT);
+
         server_exception.reset();
         client_exception.reset();
+        if (throw_timeout_error)
+        {
+            throw Exception(ErrorCodes::BUZZHOUSE, "BuzzHouse exception on timeout");
+        }
     }
     return server_up;
 }
@@ -665,12 +675,16 @@ bool Client::buzzHouse()
                 }
                 else if (settings_oracle && nopt < (correctness_oracle + settings_oracle + 1))
                 {
-                    /// Test running query with different settings
+                    /// Test running query with different settings, but some times, call system commands
                     qo.generateFirstSetting(rg, sq1);
-                    BuzzHouse::SQLQueryToString(full_query, sq1);
-                    outf << full_query << std::endl;
-                    server_up &= processBuzzHouseQuery(full_query);
-                    qo.setIntermediateStepSuccess(!have_error);
+                    if (sq1.has_explain())
+                    {
+                        /// Run query only when something was generated
+                        BuzzHouse::SQLQueryToString(full_query, sq1);
+                        outf << full_query << std::endl;
+                        server_up &= processBuzzHouseQuery(full_query);
+                        qo.setIntermediateStepSuccess(!have_error);
+                    }
 
                     sq2.Clear();
                     full_query2.resize(0);
@@ -682,7 +696,7 @@ bool Client::buzzHouse()
 
                     sq3.Clear();
                     full_query.resize(0);
-                    qo.generateSecondSetting(sq1, sq3);
+                    qo.generateSecondSetting(rg, gen, sq1, sq3);
                     BuzzHouse::SQLQueryToString(full_query, sq3);
                     outf << full_query << std::endl;
                     server_up &= processBuzzHouseQuery(full_query);