MB-53235 leave item quota management to producer for serialized opera…

…tors Change-Id: Ie095b2ff1e22a32db5e092ac6e1442bbf8832185 Reviewed-on: https://review.couchbase.org/c/query/+/178386 Reviewed-by: Donald Haggart <donald.haggart@couchbase.com> Tested-by: Marco Greco <marco.greco@couchbase.com>
couchbase · Aug 3, 2022 · 422c73f · 422c73f
1 parent b2ca880
commit 422c73f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/execution/limit.go b/execution/limit.go
@@ -84,10 +84,14 @@ func (this *Limit) processItem(item value.AnnotatedValue, context *Context) bool
 		this.limit--
 		return this.sendItem(item)
 	} else {
-		if context.UseRequestQuota() {
-			context.ReleaseValueSize(item.Size())
+
+		// MB-53235 for serialized operators item management rests with the producer
+		if !this.serialized {
+			if context.UseRequestQuota() {
+				context.ReleaseValueSize(item.Size())
+			}
+			item.Recycle()
 		}
-		item.Recycle()
 		return false
 	}
 }

diff --git a/execution/stream.go b/execution/stream.go
@@ -73,11 +73,15 @@ func (this *Stream) processItem(item value.AnnotatedValue, context *Context) boo
 		this.addOutDocs(1)
 	}
 
-	// item not used past this point
-	if context.UseRequestQuota() {
-		context.ReleaseValueSize(item.Size())
+	// MB-53235 for serialized operators item management rests with the producer
+	if ok || !this.serialized {
+
+		// item not used past this point
+		if context.UseRequestQuota() {
+			context.ReleaseValueSize(item.Size())
+		}
+		item.Recycle()
 	}
-	item.Recycle()
 	return ok
 }