Database backends: fix bug, and small speedup

est31 · est31 · commit 8a46c5df1c1b · 2015-12-29T00:39:42.000+01:00
-&gt; Redis backend: break from switch to fix bug
-&gt; Dummy and redis backends: reserve the count so that creating the list is faster
diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
@@ -47,6 +47,7 @@ bool Database_Dummy::deleteBlock(const v3s16 &pos)
 
 void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
+	dst.reserve(m_database.size());
 	for (std::map<s64, std::string>::const_iterator x = m_database.begin();
 			x != m_database.end(); ++x) {
 		dst.push_back(getIntegerAsBlock(x->first));
diff --git a/src/database-redis.cpp b/src/database-redis.cpp
@@ -169,10 +169,12 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
 	}
 	switch (reply->type) {
 	case REDIS_REPLY_ARRAY:
+		dst.reserve(reply->elements);
 		for (size_t i = 0; i < reply->elements; i++) {
 			assert(reply->element[i]->type == REDIS_REPLY_STRING);
 			dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
 		}
+		break;
 	case REDIS_REPLY_ERROR:
 		throw FileNotGoodException(std::string(
 			"Failed to get keys from database: ") + reply->str);

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ bool Database_Dummy::deleteBlock(const v3s16 &pos)`
`47`	`47`
`48`	`48`	`void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)`
`49`	`49`	`{`
	`50`	`+ dst.reserve(m_database.size());`
`50`	`51`	`for (std::map<s64, std::string>::const_iterator x = m_database.begin();`
`51`	`52`	`x != m_database.end(); ++x) {`
`52`	`53`	`dst.push_back(getIntegerAsBlock(x->first));`
Original file line number	Diff line number	Diff line change
`@@ -169,10 +169,12 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)`
`169`	`169`	`}`
`170`	`170`	`switch (reply->type) {`
`171`	`171`	`case REDIS_REPLY_ARRAY:`
	`172`	`+ dst.reserve(reply->elements);`
`172`	`173`	`for (size_t i = 0; i < reply->elements; i++) {`
`173`	`174`	`assert(reply->element[i]->type == REDIS_REPLY_STRING);`
`174`	`175`	`dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));`
`175`	`176`	`}`
	`177`	`+ break;`
`176`	`178`	`case REDIS_REPLY_ERROR:`
`177`	`179`	`throw FileNotGoodException(std::string(`
`178`	`180`	`"Failed to get keys from database: ") + reply->str);`