Commita2a0b37

committed

Removed memory limit debug message from HNSW index scans (EXPLAIN ANALYZE can be used instead)

1 parent2f77030 commita2a0b37Copy full SHA for a2a0b37

File tree

-29

lines changed

-29

lines changed

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
@@ -537,18 +537,7 @@ Specify the max amount of memory to use, as a multiple of `work_mem` (1 by defau
`537`	`537`	`SEThnsw.scan_mem_multiplier=2;`
`538`	`538`	```
`539`	`539`
`540`		`-You can see when increasing this is needed by enabling debug messages`
`541`		`-`
`542`		-```sql
`543`		`-SET client_min_messages= debug1;`
`544`		-```
`545`		`-`
`546`		`-which will show when a scan reaches the memory limit`
`547`		`-`
`548`		-```text
`549`		`-DEBUG: hnsw index scan reached memory limit after 20000 tuples`
`550`		`-HINT: Increase hnsw.scan_mem_multiplier to scan more tuples.`
`551`		-```
	`540`	+Note: Try increasing this if increasing`hnsw.max_scan_tuples` does not improve recall
`552`	`541`
`553`	`542`	`####IVFFlat`
`554`	`543`

Lines changed: 2 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,30 +240,15 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)`
`240`	`240`	`if (so->discarded==NULL)`
`241`	`241`	`break;`
`242`	`242`
`243`		`-/* Reached max number of tuples */`
`244`		`-if (so->tuples >=hnsw_max_scan_tuples)`
	`243`	`+/* Reached max number of tuplesor memory limit*/`
	`244`	`+if (so->tuples >=hnsw_max_scan_tuples\|\|MemoryContextMemAllocated(so->tmpCtx, false)>so->maxMemory)`
`245`	`245`	`{`
`246`	`246`	`if (pairingheap_is_empty(so->discarded))`
`247`	`247`	`break;`
`248`	`248`
`249`	`249`	`/* Return remaining tuples */`
`250`	`250`	`so->w=lappend(so->w,HnswGetSearchCandidate(w_node,pairingheap_remove_first(so->discarded)));`
`251`	`251`	`}`
`252`		`-/* Prevent scans from consuming too much memory */`
`253`		`-elseif (MemoryContextMemAllocated(so->tmpCtx, false)>so->maxMemory)`
`254`		`-{`
`255`		`-if (pairingheap_is_empty(so->discarded))`
`256`		`-{`
`257`		`-ereport(DEBUG1,`
`258`		`-(errmsg("hnsw index scan reached memory limit after "INT64_FORMAT" tuples",so->tuples),`
`259`		`-errhint("Increase hnsw.scan_mem_multiplier to scan more tuples.")));`
`260`		`-`
`261`		`-break;`
`262`		`-}`
`263`		`-`
`264`		`-/* Return remaining tuples */`
`265`		`-so->w=lappend(so->w,HnswGetSearchCandidate(w_node,pairingheap_remove_first(so->discarded)));`
`266`		`-}`
`267`	`252`	`else`
`268`	`253`	`{`
`269`	`254`	`/*`

Comments

(0)