Consistently call reserve() before append_row()

Author: judith-ipac

src/Table/Table.cxx

@@ -65,7 +65,6 @@ void Table::append_rows(const Table &table2) {
     const auto &offsets = get_offsets();
     const auto &table2_offsets = table2.get_offsets();
 
-
     for (size_t col_idx = 0; col_idx < num_columns; ++col_idx) {
         const auto &column = columns.at(col_idx);
         const auto &table2_column = table2_columns.at(col_idx);
@@ -89,7 +88,7 @@ void Table::append_rows(const Table &table2) {
             }
         }
     }
-
+	get_data().reserve(get_data().size() + table2.get_data().size());
     tablator::append_rows(get_data(), table2.get_data());
 }
 

src/Table/read_dsv/read_dsv_rows.cxx

@@ -5,9 +5,10 @@ std::vector<uint8_t> tablator::Table::read_dsv_rows(
         const std::list<std::vector<std::string> > &dsv) {
     bool skipped(false);
 
+	size_t row_size = tablator::get_row_size(offsets);
+    Row single_row(row_size);
     std::vector<uint8_t> data;
-
-    Row single_row(tablator::get_row_size(offsets));
+	data.reserve(row_size * dsv.size());
 
     for (auto &dsv_row : dsv) {
         if (!skipped) {

src/Table/read_ipac_table/read_ipac_table.cxx

@@ -45,10 +45,10 @@ void tablator::Table::read_ipac_table(std::istream &input_stream) {
     std::vector<size_t> minimum_column_widths(num_tablator_columns, 1);
     std::string line;
     std::getline(input_stream, line);
-
     Row single_row(tablator::get_row_size(offsets));
 
     std::vector<uint8_t> data;
+	// JTODO reserve()?
     while (input_stream) {
         if (line.find_first_not_of(" \t") != std::string::npos) {
             single_row.fill_with_zeros();

src/Table_Ops.cxx

@@ -32,12 +32,14 @@ Table add_counter_column(const Table &src_table, const std::string &col_name) {
 
 
     size_t src_nulls_size(src_offsets.at(1));
-    size_t dest_nulls_size(dest_offsets.at(1));
     size_t src_row_size = src_table.get_row_size();
-    size_t dest_row_size = dest_table.get_row_size();
-
+	size_t num_rows = src_table.get_num_rows();
     const auto &src_data = src_table.get_data();
 
+    size_t dest_nulls_size(dest_offsets.at(1));
+    size_t dest_row_size = dest_table.get_row_size();
+	dest_table.reserve_data(num_rows);
+
     tablator::Row row(dest_row_size);
     uint64_t cntr(1);
 

src/ptree_readers/read_resource_element/read_table_element/read_data_element/read_binary2/read_binary2.cxx

@@ -53,10 +53,12 @@ Data_Element ptree_readers::read_binary2(const boost::property_tree::ptree &bina
     }
 
     std::vector<size_t> rows_per_stream;
+	size_t total_num_rows = 0;
     for (auto &stream : streams) {
         size_t num_rows;
         compute_column_array_sizes(stream, fields, column_array_sizes, num_rows);
         rows_per_stream.push_back(num_rows);
+		total_num_rows += num_rows;
     }
 
     std::vector<Column> columns;
@@ -69,6 +71,10 @@ Data_Element ptree_readers::read_binary2(const boost::property_tree::ptree &bina
                       column_array_sizes[c], field.get_field_properties(),
                       field.get_dynamic_array_flag());
     }
+
+	size_t row_size = *offsets.rbegin();
+	data.reserve(row_size * total_num_rows);
+
     for (std::size_t stream = 0; stream < streams.size(); ++stream) {
         append_data_from_stream(data, columns, offsets, streams[stream], fields,
                                 rows_per_stream[stream]);

src/ptree_readers/read_resource_element/read_table_element/read_data_element/read_tabledata/read_tabledata.cxx

@@ -71,7 +71,6 @@ tablator::Data_Element tablator::ptree_readers::read_tabledata(
 
     std::vector<Column> columns;
     std::vector<size_t> offsets = {0};
-    std::vector<uint8_t> data;
 
     for (std::size_t c = 0; c < num_fields; ++c) {
         const auto &field = fields.at(c);
@@ -80,11 +79,15 @@ tablator::Data_Element tablator::ptree_readers::read_tabledata(
                       field.get_dynamic_array_flag());
     }
 
-    Row single_row(*offsets.rbegin());
+	size_t row_size = *offsets.rbegin();
+	size_t num_rows = element_lists_by_row.size();
+    std::vector<uint8_t> data;
+	data.reserve(row_size * num_rows);
 
+    Row single_row(row_size);
     // JTODO Are we allowing for non-CHAR dynamic arrays?  Should all arrays end in
     // '\0'?
-    for (size_t row_idx = 0; row_idx < element_lists_by_row.size(); ++row_idx) {
+    for (size_t row_idx = 0; row_idx < num_rows; ++row_idx) {
         auto &element_list = element_lists_by_row[row_idx];
         single_row.fill_with_zeros();
         for (size_t col_idx = 1; col_idx < num_fields; ++col_idx) {