Merge pull request #1907 from joto/insert-and-error-counter

Add row insert and not-null error counter to tables

Author: lonvia

src/flex-table.cpp

@@ -421,4 +421,7 @@ void table_connection_t::task_wait()
     auto const run_time = m_task_result.wait();
     log_info("All postprocessing on table '{}' done in {}.", table().name(),
              util::human_readable_duration(run_time));
+    log_debug("Inserted {} rows into table '{}' ({} not inserted due to"
+              " NOT NULL constraints).",
+              m_count_insert, table().name(), m_count_not_null_error);
 }

src/flex-table.hpp

@@ -273,6 +273,13 @@ class table_connection_t
 
     void task_wait();
 
+    void increment_insert_counter() noexcept { ++m_count_insert; }
+
+    void increment_not_null_error_counter() noexcept
+    {
+        ++m_count_not_null_error;
+    }
+
 private:
     std::shared_ptr<reprojection> m_proj;
 
@@ -291,6 +298,9 @@ class table_connection_t
 
     task_result_t m_task_result;
 
+    std::size_t m_count_insert = 0;
+    std::size_t m_count_not_null_error = 0;
+
     /// Has the Id index already been created?
     bool m_id_index_created = false;
 

src/output-flex.cpp

@@ -693,13 +693,15 @@ int output_flex_t::table_insert()
                 flex_write_column(lua_state(), copy_mgr, column, &m_expire);
             }
         }
+        table_connection.increment_insert_counter();
     } catch (not_null_exception const &e) {
         copy_mgr->rollback_line();
         lua_pushboolean(lua_state(), false);
         lua_pushstring(lua_state(), "null value in not null column.");
         lua_pushstring(lua_state(), e.column().name().c_str());
         push_osm_object_to_lua_stack(lua_state(), object,
                                      get_options()->extra_attributes);
+        table_connection.increment_not_null_error_counter();
         return 4;
     }