[refactor] Remove +1 from db_index in db_name construction

Author: NikosLasithiotakis

src/fdb5/parallax/ParallaxArray.cpp

@@ -32,7 +32,7 @@ uint64_t ParallaxArray::read(void *buffer, uint64_t length, const eckit::Offset
 	size_t hash = std::hash<std::string>{}(key.c_str());
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 
 	par_handle db_handle = par_get_db(db_name);
 	const char *error_msg = NULL;

src/fdb5/parallax/ParallaxCatalogue.cpp

@@ -55,7 +55,7 @@ void ParallaxCatalogue::loadSchema()
 	size_t hash = std::hash<std::string>{}(key_str.c_str());
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 	par_handle db_handle = par_get_db(db_name);
 	const char *error_msg = nullptr;
 

src/fdb5/parallax/ParallaxCatalogueReader.cpp

@@ -45,7 +45,7 @@ bool ParallaxCatalogueReader::selectIndex(const Key &key)
 		size_t hash = std::hash<std::string>{}(keyStr.c_str());
 		int db_index = hash % PARALLAX_DB_COUNT;
 
-		std::string db_name = "par_db" + std::to_string(db_index + 1);
+		std::string db_name = "par_db" + std::to_string(db_index);
 		par_handle db_handle = par_get_db(db_name);
 
 		par_get(db_handle, &keyData, &valueData, &error_msg);

src/fdb5/parallax/ParallaxCatalogueWriter.cpp

@@ -42,7 +42,7 @@ ParallaxCatalogueWriter::ParallaxCatalogueWriter(const Key &key, const fdb5::Con
 	size_t hash = std::hash<std::string>{}(key_str.c_str());
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 	par_handle db_handle = par_get_db(db_name);
 	const char *error_msg = NULL;
 
@@ -93,7 +93,7 @@ bool ParallaxCatalogueWriter::selectIndex(const Key &key)
 		size_t hash = std::hash<std::string>{}(keyStr.c_str());
 		int db_index = hash % PARALLAX_DB_COUNT;
 
-		std::string db_name = "par_db" + std::to_string(db_index + 1);
+		std::string db_name = "par_db" + std::to_string(db_index);
 		par_handle db_handle = par_get_db(db_name);
 		const char *error_msg = nullptr;
 
@@ -115,7 +115,7 @@ bool ParallaxCatalogueWriter::selectIndex(const Key &key)
 			size_t hash = std::hash<std::string>{}(keyStr.c_str());
 			int db_index = hash % PARALLAX_DB_COUNT;
 
-			std::string db_name = "par_db" + std::to_string(db_index + 1);
+			std::string db_name = "par_db" + std::to_string(db_index);
 			db_handle = par_get_db(db_name);
 
 			par_put(db_handle, &kv, &error_msg);
@@ -214,7 +214,7 @@ void ParallaxCatalogueWriter::archive(const Key &key, std::unique_ptr<FieldLocat
 		hash = std::hash<std::string>{}(indexKeyWithAxes.c_str());
 		db_index = hash % PARALLAX_DB_COUNT;
 
-		db_name = "par_db" + std::to_string(db_index + 1);
+		db_name = "par_db" + std::to_string(db_index);
 		db_handle = par_get_db(db_name);
 
 		par_put(db_handle, &kv, &error_message);
@@ -246,7 +246,7 @@ void ParallaxCatalogueWriter::archive(const Key &key, std::unique_ptr<FieldLocat
 		hash = std::hash<std::string>{}(axisKey.c_str());
 		db_index = hash % PARALLAX_DB_COUNT;
 
-		db_name = "par_db" + std::to_string(db_index + 1);
+		db_name = "par_db" + std::to_string(db_index);
 		db_handle = par_get_db(db_name);
 
 		par_get(db_handle, &existing_key, &existing_value, &error_message2);
@@ -278,7 +278,7 @@ void ParallaxCatalogueWriter::archive(const Key &key, std::unique_ptr<FieldLocat
 		size_t hash = std::hash<std::string>{}(axisKey.c_str());
 		int db_index = hash % PARALLAX_DB_COUNT;
 
-		std::string db_name = "par_db" + std::to_string(db_index + 1);
+		std::string db_name = "par_db" + std::to_string(db_index);
 		db_handle = par_get_db(db_name);
 		par_put(db_handle, &kv2, &error_message2);
 		if (error_message2) {

src/fdb5/parallax/ParallaxIndex.cpp

@@ -50,7 +50,7 @@ void ParallaxIndex::updateAxes()
 	hash = std::hash<std::string>{}(keyStr.c_str());
 	db_index = hash % PARALLAX_DB_COUNT;
 
-	db_name = "par_db" + std::to_string(db_index + 1);
+	db_name = "par_db" + std::to_string(db_index);
 	db_handle = par_get_db(db_name);
 	par_get(db_handle, &axes_key, &axes_value, &error_msg);
 
@@ -76,7 +76,7 @@ void ParallaxIndex::updateAxes()
 		hash = std::hash<std::string>{}(axisKeyStr.c_str());
 		db_index = hash % PARALLAX_DB_COUNT;
 
-		db_name = "par_db" + std::to_string(db_index + 1);
+		db_name = "par_db" + std::to_string(db_index);
 		db_handle = par_get_db(db_name);
 
 		par_get(db_handle, &axis_key, &axis_value, &error_msg);
@@ -112,7 +112,7 @@ bool ParallaxIndex::get(const Key &key, const Key &remapKey, Field &field) const
 	size_t hash = std::hash<std::string>{}(query.c_str());
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 	par_handle db_handle = par_get_db(db_name);
 	const char *error_msg = nullptr;
 
@@ -169,7 +169,7 @@ void ParallaxIndex::add(const Key &key, const Field &field)
 	size_t hash = std::hash<std::string>{}(keyStr);
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 	par_handle db_handle = par_get_db(db_name);
 	const char *error_msg = nullptr;
 

src/fdb5/parallax/ParallaxStore.cpp

@@ -32,7 +32,7 @@ std::unique_ptr<FieldLocation> ParallaxStore::archive(const Key &key, const void
 	size_t hash = std::hash<std::string>{}(internalKey);
 	int db_index = hash % PARALLAX_DB_COUNT;
 
-	std::string db_name = "par_db" + std::to_string(db_index + 1);
+	std::string db_name = "par_db" + std::to_string(db_index);
 	par_handle db_handle = par_get_db(db_name);
 
 	const char *error_msg = nullptr;