|
18 | 18 | #defineMarkGUCPrefixReserved(x) EmitWarningsOnPlaceholders(x) |
19 | 19 | #endif |
20 | 20 |
|
21 | | -staticconststructconfig_enum_entryhnsw_iterative_search_options[]= { |
22 | | -{"off",HNSW_ITERATIVE_SEARCH_OFF, false}, |
23 | | -{"relaxed_order",HNSW_ITERATIVE_SEARCH_RELAXED, false}, |
24 | | -{"strict_order",HNSW_ITERATIVE_SEARCH_STRICT, false}, |
| 21 | +staticconststructconfig_enum_entryhnsw_iterative_scan_options[]= { |
| 22 | +{"off",HNSW_ITERATIVE_SCAN_OFF, false}, |
| 23 | +{"relaxed_order",HNSW_ITERATIVE_SCAN_RELAXED, false}, |
| 24 | +{"strict_order",HNSW_ITERATIVE_SCAN_STRICT, false}, |
25 | 25 | {NULL,0, false} |
26 | 26 | }; |
27 | 27 |
|
28 | 28 | inthnsw_ef_search; |
29 | | -inthnsw_iterative_search; |
30 | | -inthnsw_max_search_tuples; |
31 | | -doublehnsw_search_mem_multiplier; |
| 29 | +inthnsw_iterative_scan; |
| 30 | +inthnsw_max_scan_tuples; |
| 31 | +doublehnsw_scan_mem_multiplier; |
32 | 32 | inthnsw_lock_tranche_id; |
33 | 33 | staticrelopt_kindhnsw_relopt_kind; |
34 | 34 |
|
@@ -79,18 +79,18 @@ HnswInit(void) |
79 | 79 | "Valid range is 1..1000.",&hnsw_ef_search, |
80 | 80 | HNSW_DEFAULT_EF_SEARCH,HNSW_MIN_EF_SEARCH,HNSW_MAX_EF_SEARCH,PGC_USERSET,0,NULL,NULL,NULL); |
81 | 81 |
|
82 | | -DefineCustomEnumVariable("hnsw.iterative_search","Sets theiterative search mode", |
83 | | -NULL,&hnsw_iterative_search, |
84 | | -HNSW_ITERATIVE_SEARCH_OFF,hnsw_iterative_search_options,PGC_USERSET,0,NULL,NULL,NULL); |
| 82 | +DefineCustomEnumVariable("hnsw.iterative_scan","Sets themode for iterative scans", |
| 83 | +NULL,&hnsw_iterative_scan, |
| 84 | +HNSW_ITERATIVE_SCAN_OFF,hnsw_iterative_scan_options,PGC_USERSET,0,NULL,NULL,NULL); |
85 | 85 |
|
86 | 86 | /* This is approximate and does not apply to the initial scan */ |
87 | | -DefineCustomIntVariable("hnsw.max_search_tuples","Sets the max number ofcandidates to visit for iterativesearch", |
88 | | -NULL,&hnsw_max_search_tuples, |
| 87 | +DefineCustomIntVariable("hnsw.max_scan_tuples","Sets the max number oftuples to visit for iterativescans", |
| 88 | +NULL,&hnsw_max_scan_tuples, |
89 | 89 | 20000,1,INT_MAX,PGC_USERSET,0,NULL,NULL,NULL); |
90 | 90 |
|
91 | 91 | /* Same range and default as hash_mem_multiplier */ |
92 | | -DefineCustomRealVariable("hnsw.search_mem_multiplier","Sets the multiple of work_mem to use for iterativesearch", |
93 | | -NULL,&hnsw_search_mem_multiplier, |
| 92 | +DefineCustomRealVariable("hnsw.scan_mem_multiplier","Sets the multiple of work_mem to use for iterativescans", |
| 93 | +NULL,&hnsw_scan_mem_multiplier, |
94 | 94 | 2,1,1000,PGC_USERSET,0,NULL,NULL,NULL); |
95 | 95 |
|
96 | 96 | MarkGUCPrefixReserved("hnsw"); |
|