From 51d888c680c3ae94f2c81e29c7b0261e6d67b8de Mon Sep 17 00:00:00 2001
From: vaclavt <vt@stocksriddle.com>
Date: Tue, 11 Jan 2022 23:35:22 +0100
Subject: [PATCH] slowly getting ready for parallel processing

---
 table.cpp | 72 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/table.cpp b/table.cpp
index f04e18b..5262dfb 100644
--- a/table.cpp
+++ b/table.cpp
@@ -43,11 +43,44 @@ ColDefNode Table::get_column_def(int col_index) {
 	}
 }
 
+// std::mutex insert_guard;
 Row& Table::create_empty_row() {
+//	std::unique_lock guard(insert_guard);
+
 	m_rows.emplace_back(columns_count(), false);
 	return m_rows.back();
 }
 
+void Table::create_row_from_vector(const std::vector<ColDefNode> &colDefs, const std::vector<std::string> &csv_line) {
+//	std::unique_lock guard(insert_guard);
+
+	// prepare empty new_row
+	Row& new_row = create_empty_row();
+
+	// copy values
+	for (size_t i = 0; i < std::min<size_t>(columns_count(), csv_line.size()); i++) {
+		const ColDefNode & col_def = colDefs[i];
+
+		if (csv_line[i].empty()) {
+			new_row.setColumnNull(col_def.order);
+		} else if (col_def.type == ColumnType::integer_type) {
+			new_row.setIntColumnValue(col_def.order, Settings::string_to_long(csv_line[i]));
+		} else if (col_def.type == ColumnType::float_type) {
+			new_row.setFloatColumnValue(col_def.order, Settings::string_to_double(csv_line[i]));
+		} else if (col_def.type == ColumnType::varchar_type) {
+			new_row.setStringColumnValue(col_def.order, csv_line[i]);
+		} else if (col_def.type == ColumnType::date_type) {
+			new_row.setDateColumnValue(col_def.order, csv_line[i]);
+		} else if (col_def.type == ColumnType::bool_type) {
+			new_row.setBoolColumnValue(col_def.order, csv_line[i]);
+		} else
+			throw Exception("unsupported column type");
+	}
+
+	// append new_row
+	commit_row(new_row);
+}
+
 std::string Table::csv_string() {
 	const size_t k_row_size_est = m_col_defs.size() * 16;
 
@@ -85,7 +118,7 @@ int Table::load_csv_string(const std::string &content) {
 	std::vector<ColDefNode> &colDefs = m_col_defs;
 
 	CsvReader csvparser{};
-	int row_cnt = csvparser.parseCSV2(content, colDefs, *this);
+	int row_cnt = csvparser.parseCSVString(content, colDefs, *this);
 
 	return row_cnt;
 }
@@ -114,39 +147,11 @@ int Table::load_csv_file(const std::string &filename) {
 
 	// load rows
 	CsvReader csvparser{};
-	int row_cnt = csvparser.parseCSV(filename, colDefs, *this);
+	int row_cnt = csvparser.parseCSVFile(filename, colDefs, *this);
 
 	return row_cnt;
 }
 
-void Table::create_row_from_vector(const std::vector<ColDefNode> &colDefs, const std::vector<std::string> &csv_line) {
-	// prepare empty new_row
-	Row& new_row = create_empty_row();
-
-	// copy values
-	for (size_t i = 0; i < std::min<size_t>(columns_count(), csv_line.size()); i++) {
-		const ColDefNode & col_def = colDefs[i];
-
-		if (csv_line[i].empty()) {
-			new_row.setColumnNull(col_def.order);
-		} else if (col_def.type == ColumnType::integer_type) {
-			new_row.setIntColumnValue(col_def.order, Settings::string_to_long(csv_line[i]));
-		} else if (col_def.type == ColumnType::float_type) {
-			new_row.setFloatColumnValue(col_def.order, Settings::string_to_double(csv_line[i]));
-		} else if (col_def.type == ColumnType::varchar_type) {
-			new_row.setStringColumnValue(col_def.order, csv_line[i]);
-		} else if (col_def.type == ColumnType::date_type) {
-			new_row.setDateColumnValue(col_def.order, csv_line[i]);
-		} else if (col_def.type == ColumnType::bool_type) {
-			new_row.setBoolColumnValue(col_def.order, csv_line[i]);
-		} else
-			throw Exception("unsupported column type");
-	}
-
-	// append new_row
-	commit_row(new_row);
-}
-
 void Table::print() {
 	std::string out{"| "};
 	std::string out2{"+-"};
@@ -226,12 +231,11 @@ void Table::validate_column(const ColDefNode *col_def, ValueNode *col_val) {
 }
 
 void Table::validate_column(const ColDefNode *col_def, ColValue &col_val) {
-	if (!col_def->null && col_val.isNull()) {
+	if (!col_def->null && col_val.isNull())
 		throw Exception("Column " + col_def->name + " cannot be null");
-	}
-	if (col_def->type == ColumnType::varchar_type && !col_val.isNull() && col_val.getStringValue().size() > col_def->length) {
+
+	if (col_def->type == ColumnType::varchar_type && !col_val.isNull() && col_val.getStringValue().size() > col_def->length)
 		throw Exception("Column value of " + col_def->name + " is too long (" + col_val.getStringValue() + ")");
-	}
 }
 
 void Table::validate_row(Row &row) {