Fix redis erroring on non found blocks

est31 · est31 · commit 4338f100f841 · 2015-09-26T23:42:55.000+02:00
Thanks to @netinetwalker for spotting the error, proposing a fix, and testing it. Error due to @est31's merging changes to PR #3202 to add more error reporting for invalid reply types, commit: 524a765 "redis: throw error if block request failed" Now we branch out on the valid reply type "not found".
diff --git a/src/database-redis.cpp b/src/database-redis.cpp
@@ -126,6 +126,11 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
 		throw FileNotGoodException(std::string(
 			"Redis command 'HGET %s %s' errored: ") + errstr);
 	}
+	case REDIS_REPLY_NIL: {
+		// block not found in database
+		freeReplyObject(reply);
+		return "";
+	}
 	}
 	errorstream << "loadBlock: loading block " << PP(pos)
 		<< " returned invalid reply type " << reply->type

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,11 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)`
`126`	`126`	`throw FileNotGoodException(std::string(`
`127`	`127`	`"Redis command 'HGET %s %s' errored: ") + errstr);`
`128`	`128`	`}`
	`129`	`+ case REDIS_REPLY_NIL: {`
	`130`	`+ // block not found in database`
	`131`	`+ freeReplyObject(reply);`
	`132`	`+ return "";`
	`133`	`+ }`
`129`	`134`	`}`
`130`	`135`	`errorstream << "loadBlock: loading block " << PP(pos)`
`131`	`136`	`<< " returned invalid reply type " << reply->type`