Unverified Commit b3fe4f31 authored by Oran Agra's avatar Oran Agra Committed by GitHub
Browse files

dismiss COW of client output buffer now that it's dynamic (#10371)

since #9822, the static reply buffer is no longer part of the client structure, so we need to dismiss it.
parent 4f19b4d0
...@@ -6417,7 +6417,8 @@ void dismissMemory(void* ptr, size_t size_hint) { ...@@ -6417,7 +6417,8 @@ void dismissMemory(void* ptr, size_t size_hint) {
/* Dismiss big chunks of memory inside a client structure, see dismissMemory() */ /* Dismiss big chunks of memory inside a client structure, see dismissMemory() */
void dismissClientMemory(client *c) { void dismissClientMemory(client *c) {
/* Dismiss client query buffer. */ /* Dismiss client query buffer and static reply buffer. */
dismissSds(c->buf);
dismissSds(c->querybuf); dismissSds(c->querybuf);
dismissSds(c->pending_querybuf); dismissSds(c->pending_querybuf);
/* Dismiss argv array only if we estimate it contains a big buffer. */ /* Dismiss argv array only if we estimate it contains a big buffer. */
...@@ -6443,9 +6444,6 @@ void dismissClientMemory(client *c) { ...@@ -6443,9 +6444,6 @@ void dismissClientMemory(client *c) {
if (bulk) dismissMemory(bulk, bulk->size); if (bulk) dismissMemory(bulk, bulk->size);
} }
} }
/* The client struct has a big static reply buffer in it. */
dismissMemory(c, 0);
} }
/* In the child process, we don't need some buffers anymore, and these are /* In the child process, we don't need some buffers anymore, and these are
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment