dbcopy: make output nicer

bareos · Jan 31, 2020 · 0a18b2a · 0a18b2a
1 parent 9d5dc85
commit 0a18b2a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/core/src/dird/dbcopy/database_column_descriptions.cc b/core/src/dird/dbcopy/database_column_descriptions.cc
@@ -73,8 +73,7 @@ DatabaseColumnDescriptionsPostgresql::DatabaseColumnDescriptionsPostgresql(
   query += table_name;
   query += "'";
 
-  std::cout << "Collecting column descriptions for: " << table_name
-            << std::endl;
+  std::cout << "--> " << table_name << std::endl;
 
   SelectColumnDescriptions(query, ResultHandler);
 }

diff --git a/core/src/dird/dbcopy/database_export_postgresql.cc b/core/src/dird/dbcopy/database_export_postgresql.cc
@@ -114,7 +114,9 @@ static void UpdateSequences(
     const DatabaseExportPostgresql::SequenceSchemaVector&
         sequence_schema_vector)
 {
+  std::cout << "Updating sequence for tables: " << std::endl;
   for (const auto& s : sequence_schema_vector) {
+    std::cout << "--> " << s.table_name << std::endl;
     std::string sequence_schema_query{"select setval(' "};
     sequence_schema_query += s.sequence_name;
     sequence_schema_query += "', (select max(";
@@ -126,7 +128,6 @@ static void UpdateSequences(
       throw std::runtime_error(
           "DatabaseExportPostgresql: Could not set sequence");
     }
-    std::cout << "Updating sequence for table: " << s.table_name << std::endl;
   }
 }
 

diff --git a/core/src/dird/dbcopy/database_import_mysql.cc b/core/src/dird/dbcopy/database_import_mysql.cc
@@ -95,7 +95,7 @@ void DatabaseImportMysql::RunQuerySelectAllRows(
 {
   for (const auto& t : table_descriptions_->tables) {
     if (!exporter.StartTable(t.table_name)) {
-      std::cout << "--> skipping" << std::endl;
+      std::cout << "--> *** skipping ***" << std::endl;
       continue;
     }
 
@@ -198,7 +198,7 @@ void DatabaseImportMysql::FillRowWithDatabaseResult(ResultHandlerContext* r,
         "Number of database fields does not match description");
   }
 
-    RowData& row_data = r->row_data;
+  RowData& row_data = r->row_data;
 
   if (r->is_restore_object) {
     std::size_t field_index_longblob = fields - 1;

diff --git a/core/src/dird/dbcopy/database_table_descriptions.cc b/core/src/dird/dbcopy/database_table_descriptions.cc
@@ -64,6 +64,7 @@ DatabaseTablesPostgresql::DatabaseTablesPostgresql(BareosDb* db)
   std::vector<std::string> table_names;
   SelectTableNames(query, table_names);
 
+  std::cout << "getting column descriptions..." << std::endl;
   for (auto t : table_names) {
     DatabaseColumnDescriptionsPostgresql p(db, t);
     tables.emplace_back(std::move(t), std::move(p.column_descriptions));