Merge pull request ClickHouse#78284 from PedroTadim/buzzhouse-update

Buzzhouse update

Author: PedroTadim

programs/client/FuzzLoop.cpp

@@ -594,7 +594,6 @@ bool Client::buzzHouse()
         fuzz_config->loadServerConfigurations();
         loadFuzzerServerSettings(*fuzz_config);
         loadFuzzerTableSettings(*fuzz_config);
-        loadFuzzerOracleSettings(*fuzz_config);
         loadSystemTables(*fuzz_config);
 
         full_query2.reserve(8192);
@@ -633,9 +632,8 @@ bool Client::buzzHouse()
             {
                 const uint32_t correctness_oracle = 30;
                 const uint32_t settings_oracle = 30;
-                const uint32_t dump_oracle = 15
-                    * static_cast<uint32_t>(fuzz_config->use_dump_table_oracle
-                                            && gen.collectionHas<BuzzHouse::SQLTable>(gen.attached_tables_for_dump_table_oracle));
+                const uint32_t dump_oracle
+                    = 30 * static_cast<uint32_t>(gen.collectionHas<BuzzHouse::SQLTable>(gen.attached_tables_to_test_format));
                 const uint32_t peer_oracle
                     = 30 * static_cast<uint32_t>(gen.collectionHas<BuzzHouse::SQLTable>(gen.attached_tables_for_table_peer_oracle));
                 const uint32_t run_query = 910;
@@ -695,43 +693,62 @@ bool Client::buzzHouse()
                 }
                 else if (dump_oracle && nopt < (correctness_oracle + settings_oracle + dump_oracle + 1))
                 {
-                    const BuzzHouse::SQLTable & t
-                        = rg.pickRandomly(gen.filterCollection<BuzzHouse::SQLTable>(gen.attached_tables_for_dump_table_oracle));
-
                     /// Test in and out formats
-                    full_query2.resize(0);
-                    qo.dumpTableContent(rg, gen, t, sq1);
-                    BuzzHouse::SQLQueryToString(full_query2, sq1);
-                    outf << full_query2 << std::endl;
-                    server_up &= processBuzzHouseQuery(full_query2);
-                    qo.processFirstOracleQueryResult(!have_error, *external_integrations);
+                    /// When testing content, we have to export and import to the same table
+                    const bool test_content = fuzz_config->dump_table_oracle_compare_content && rg.nextBool()
+                        && gen.collectionHas<BuzzHouse::SQLTable>(gen.attached_tables_to_compare_content);
+                    const auto & t1 = rg.pickRandomly(gen.filterCollection<BuzzHouse::SQLTable>(
+                        test_content ? gen.attached_tables_to_compare_content : gen.attached_tables_to_test_format));
+                    const auto & t2 = test_content
+                        ? t1
+                        : rg.pickRandomly(gen.filterCollection<BuzzHouse::SQLTable>(gen.attached_tables_to_test_format));
+
+                    if (test_content)
+                    {
+                        /// Dump table content and read it later to look for correctness
+                        full_query2.resize(0);
+                        qo.dumpTableContent(rg, gen, t1, sq1);
+                        BuzzHouse::SQLQueryToString(full_query2, sq1);
+                        outf << full_query2 << std::endl;
+                        server_up &= processBuzzHouseQuery(full_query2);
+                        qo.processFirstOracleQueryResult(!have_error, *external_integrations);
+                    }
 
                     sq2.Clear();
-                    qo.generateExportQuery(rg, gen, t, sq2);
+                    qo.generateExportQuery(rg, gen, test_content, t1, sq2);
                     BuzzHouse::SQLQueryToString(full_query, sq2);
                     outf << full_query << std::endl;
                     server_up &= processBuzzHouseQuery(full_query);
-                    qo.setIntermediateStepSuccess(!have_error);
 
-                    sq3.Clear();
-                    full_query.resize(0);
-                    qo.generateClearQuery(t, sq3);
-                    BuzzHouse::SQLQueryToString(full_query, sq3);
-                    outf << full_query << std::endl;
-                    server_up &= processBuzzHouseQuery(full_query);
-                    qo.setIntermediateStepSuccess(!have_error);
+                    if (test_content)
+                    {
+                        /// Clear table, before inserting data again, when testing for correctness
+                        qo.setIntermediateStepSuccess(!have_error);
+
+                        sq3.Clear();
+                        full_query.resize(0);
+                        qo.generateClearQuery(t1, sq3);
+                        BuzzHouse::SQLQueryToString(full_query, sq3);
+                        outf << full_query << std::endl;
+                        server_up &= processBuzzHouseQuery(full_query);
+                        qo.setIntermediateStepSuccess(!have_error);
+                    }
 
                     sq4.Clear();
                     full_query.resize(0);
-                    qo.generateImportQuery(rg, gen, t, sq2, sq4);
+                    qo.generateImportQuery(rg, gen, t2, sq2, sq4);
                     BuzzHouse::SQLQueryToString(full_query, sq4);
                     outf << full_query << std::endl;
                     server_up &= processBuzzHouseQuery(full_query);
-                    qo.setIntermediateStepSuccess(!have_error);
 
-                    outf << full_query2 << std::endl;
-                    server_up &= processBuzzHouseQuery(full_query2);
-                    qo.processSecondOracleQueryResult(!have_error, *external_integrations, "Dump and read table");
+                    if (test_content)
+                    {
+                        qo.setIntermediateStepSuccess(!have_error);
+
+                        outf << full_query2 << std::endl;
+                        server_up &= processBuzzHouseQuery(full_query2);
+                        qo.processSecondOracleQueryResult(!have_error, *external_integrations, "Dump and read table");
+                    }
                 }
                 else if (peer_oracle && nopt < (correctness_oracle + settings_oracle + dump_oracle + peer_oracle + 1))
                 {