liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-16 01:26:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified GUC names [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-10-11 11:18:01 -07:00
parent b26a21b848
commit a3a20f9816
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hnsw.c
View File

@@ -26,7 +26,7 @@ static const struct config_enum_entry hnsw_iterative_search_options[] = {
}; };
int hnsw_ef_search; int hnsw_ef_search;
int hnsw_iterative_search_max_tuples; int hnsw_max_search_tuples;
int hnsw_iterative_search; int hnsw_iterative_search;
int hnsw_lock_tranche_id; int hnsw_lock_tranche_id;
static relopt_kind hnsw_relopt_kind; static relopt_kind hnsw_relopt_kind;
@@ -78,13 +78,13 @@ HnswInit(void)
"Valid range is 1..1000.", &hnsw_ef_search, "Valid range is 1..1000.", &hnsw_ef_search,
HNSW_DEFAULT_EF_SEARCH, HNSW_MIN_EF_SEARCH, HNSW_MAX_EF_SEARCH, PGC_USERSET, 0, NULL, NULL, NULL); HNSW_DEFAULT_EF_SEARCH, HNSW_MIN_EF_SEARCH, HNSW_MAX_EF_SEARCH, PGC_USERSET, 0, NULL, NULL, NULL);
DefineCustomEnumVariable("hnsw.iterative_search", "Sets iterative search", DefineCustomEnumVariable("hnsw.iterative_search", "Sets iterative search mode",
NULL, &hnsw_iterative_search, NULL, &hnsw_iterative_search,
HNSW_ITERATIVE_SEARCH_OFF, hnsw_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL); HNSW_ITERATIVE_SEARCH_OFF, hnsw_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL);
/* TODO Ensure ivfflat.max_probes uses same value for "all" */ /* TODO Ensure ivfflat.max_probes uses same value for no limit */
DefineCustomIntVariable("hnsw.iterative_search_max_tuples", "Sets the max number of candidates to visit for iterative search", DefineCustomIntVariable("hnsw.max_search_tuples", "Sets the max number of candidates to visit for iterative search",
"-1 means all", &hnsw_iterative_search_max_tuples, "-1 means no limit", &hnsw_max_search_tuples,
-1, -1, INT_MAX, PGC_USERSET, 0, NULL, NULL, NULL); -1, -1, INT_MAX, PGC_USERSET, 0, NULL, NULL, NULL);
MarkGUCPrefixReserved("hnsw"); MarkGUCPrefixReserved("hnsw");

2
src/hnsw.h
View File

@@ -110,7 +110,7 @@
/* Variables */ /* Variables */
extern int hnsw_ef_search; extern int hnsw_ef_search;
extern int hnsw_iterative_search; extern int hnsw_iterative_search;
extern int hnsw_iterative_search_max_tuples; extern int hnsw_max_search_tuples;
extern int hnsw_lock_tranche_id; extern int hnsw_lock_tranche_id;
typedef enum HnswIterativeSearchType typedef enum HnswIterativeSearchType

2
src/hnswscan.c
View File

@@ -230,7 +230,7 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
break; break;
/* Reached max number of tuples */ /* Reached max number of tuples */
if (hnsw_iterative_search_max_tuples != -1 && so->tuples >= hnsw_iterative_search_max_tuples) if (hnsw_max_search_tuples != -1 && so->tuples >= hnsw_max_search_tuples)
{ {
if (pairingheap_is_empty(so->discarded)) if (pairingheap_is_empty(so->discarded))
break; break;

6
src/ivfflat.c
View File

@@ -18,7 +18,7 @@
int ivfflat_probes; int ivfflat_probes;
int ivfflat_iterative_search; int ivfflat_iterative_search;
int ivfflat_iterative_search_max_probes; int ivfflat_max_probes;
static relopt_kind ivfflat_relopt_kind; static relopt_kind ivfflat_relopt_kind;
static const struct config_enum_entry ivfflat_iterative_search_options[] = { static const struct config_enum_entry ivfflat_iterative_search_options[] = {
@@ -45,8 +45,8 @@ IvfflatInit(void)
NULL, &ivfflat_iterative_search, NULL, &ivfflat_iterative_search,
IVFFLAT_ITERATIVE_SEARCH_OFF, ivfflat_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL); IVFFLAT_ITERATIVE_SEARCH_OFF, ivfflat_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL);
DefineCustomIntVariable("ivfflat.iterative_search_max_probes", "Sets the max number of probes for iterative search", DefineCustomIntVariable("ivfflat.max_probes", "Sets the max number of probes for iterative search",
"Zero sets to the number of lists", &ivfflat_iterative_search_max_probes, "Zero sets to the number of lists", &ivfflat_max_probes,
0, 0, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL); 0, 0, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL);
MarkGUCPrefixReserved("ivfflat"); MarkGUCPrefixReserved("ivfflat");

2
src/ivfflat.h
View File

@@ -81,7 +81,7 @@
/* Variables */ /* Variables */
extern int ivfflat_probes; extern int ivfflat_probes;
extern int ivfflat_iterative_search; extern int ivfflat_iterative_search;
extern int ivfflat_iterative_search_max_probes; extern int ivfflat_max_probes;
typedef enum IvfflatIterativeSearchType typedef enum IvfflatIterativeSearchType
{ {

4
src/ivfscan.c
View File

@@ -264,10 +264,10 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
if (ivfflat_iterative_search != IVFFLAT_ITERATIVE_SEARCH_OFF) if (ivfflat_iterative_search != IVFFLAT_ITERATIVE_SEARCH_OFF)
{ {
if (ivfflat_iterative_search_max_probes == 0) if (ivfflat_max_probes == 0)
maxProbes = lists; maxProbes = lists;
else else
maxProbes = Min(ivfflat_iterative_search_max_probes, lists); maxProbes = Min(ivfflat_max_probes, lists);
} }
else else
maxProbes = probes; maxProbes = probes;

10
test/expected/hnsw_vector.out
View File

@@ -174,12 +174,12 @@ SHOW hnsw.iterative_search;
SET hnsw.iterative_search = on; SET hnsw.iterative_search = on;
ERROR: invalid value for parameter "hnsw.iterative_search": "on" ERROR: invalid value for parameter "hnsw.iterative_search": "on"
HINT: Available values: off, relaxed_order, strict_order. HINT: Available values: off, relaxed_order, strict_order.
SHOW hnsw.iterative_search_max_tuples; SHOW hnsw.max_search_tuples;
hnsw.iterative_search_max_tuples hnsw.max_search_tuples
---------------------------------- ------------------------
-1 -1
(1 row) (1 row)
SET hnsw.iterative_search_max_tuples = -2; SET hnsw.max_search_tuples = -2;
ERROR: -2 is outside the valid range for parameter "hnsw.iterative_search_max_tuples" (-1 .. 2147483647) ERROR: -2 is outside the valid range for parameter "hnsw.max_search_tuples" (-1 .. 2147483647)
DROP TABLE t; DROP TABLE t;

14
test/expected/ivfflat_vector.out
View File

@@ -137,14 +137,14 @@ SHOW ivfflat.iterative_search;
SET ivfflat.iterative_search = on; SET ivfflat.iterative_search = on;
ERROR: invalid value for parameter "ivfflat.iterative_search": "on" ERROR: invalid value for parameter "ivfflat.iterative_search": "on"
HINT: Available values: off, relaxed_order. HINT: Available values: off, relaxed_order.
SHOW ivfflat.iterative_search_max_probes; SHOW ivfflat.max_probes;
ivfflat.iterative_search_max_probes ivfflat.max_probes
------------------------------------- --------------------
0 0
(1 row) (1 row)
SET ivfflat.iterative_search_max_probes = -1; SET ivfflat.max_probes = -1;
ERROR: -1 is outside the valid range for parameter "ivfflat.iterative_search_max_probes" (0 .. 32768) ERROR: -1 is outside the valid range for parameter "ivfflat.max_probes" (0 .. 32768)
SET ivfflat.iterative_search_max_probes = 32769; SET ivfflat.max_probes = 32769;
ERROR: 32769 is outside the valid range for parameter "ivfflat.iterative_search_max_probes" (0 .. 32768) ERROR: 32769 is outside the valid range for parameter "ivfflat.max_probes" (0 .. 32768)
DROP TABLE t; DROP TABLE t;

4
test/sql/hnsw_vector.sql
View File

@@ -102,8 +102,8 @@ SHOW hnsw.iterative_search;
SET hnsw.iterative_search = on; SET hnsw.iterative_search = on;
SHOW hnsw.iterative_search_max_tuples; SHOW hnsw.max_search_tuples;
SET hnsw.iterative_search_max_tuples = -2; SET hnsw.max_search_tuples = -2;
DROP TABLE t; DROP TABLE t;

6
test/sql/ivfflat_vector.sql
View File

@@ -81,9 +81,9 @@ SHOW ivfflat.iterative_search;
SET ivfflat.iterative_search = on; SET ivfflat.iterative_search = on;
SHOW ivfflat.iterative_search_max_probes; SHOW ivfflat.max_probes;
SET ivfflat.iterative_search_max_probes = -1; SET ivfflat.max_probes = -1;
SET ivfflat.iterative_search_max_probes = 32769; SET ivfflat.max_probes = 32769;
DROP TABLE t; DROP TABLE t;

2
test/t/041_ivfflat_iterative_search.pl
View File

@@ -40,7 +40,7 @@ foreach ((30, 50, 70))
SET enable_seqscan = off; SET enable_seqscan = off;
SET ivfflat.probes = 10; SET ivfflat.probes = 10;
SET ivfflat.iterative_search = relaxed_order; SET ivfflat.iterative_search = relaxed_order;
SET ivfflat.iterative_search_max_probes = $max_probes; SET ivfflat.max_probes = $max_probes;
SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t; SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
)); ));
$sum += $count; $sum += $count;

2
test/t/043_hnsw_iterative_search.pl
View File

@@ -43,7 +43,7 @@ foreach ((30000, 50000, 70000))
$count = $node->safe_psql("postgres", qq( $count = $node->safe_psql("postgres", qq(
SET enable_seqscan = off; SET enable_seqscan = off;
SET hnsw.iterative_search = relaxed_order; SET hnsw.iterative_search = relaxed_order;
SET hnsw.iterative_search_max_tuples = $max_tuples; SET hnsw.max_search_tuples = $max_tuples;
SET work_mem = '8MB'; SET work_mem = '8MB';
SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t; SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
)); ));