From 1bf54776023f648a1bc8849fa99854e85222b92e Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 7 Apr 2021 15:25:22 +0000
Subject: [PATCH] Fix build break from merge conflicts

Former-commit-id: 5052388bd43b0e42430fd741fb2b403544684246
---
 src/db.cpp         | 2 +-
 src/networking.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/db.cpp b/src/db.cpp
index e4f1a5f99..994ee2b41 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -3029,7 +3029,7 @@ bool redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
             }
         }
 #endif
-        return;
+        return false;
     }
 
     AeLocker lock;
diff --git a/src/networking.cpp b/src/networking.cpp
index fce10c52d..82b731e19 100644
--- a/src/networking.cpp
+++ b/src/networking.cpp
@@ -2369,7 +2369,7 @@ void parseClientCommandBuffer(client *c) {
         }
 
         /* Prefetch outside the lock for better perf */
-        if (cqueries < c->vecqueuedcmd.size() && !GlobalLocksAcquired()) {
+        if (cqueriesStart < c->vecqueuedcmd.size() && !GlobalLocksAcquired()) {
             auto &query = c->vecqueuedcmd.back();
             if (query.argc > 0 && query.argc == query.argcMax) {
                 if (c->db->prefetchKeysAsync(c, query, c->vecqueuedcmd.size() == 1)) {