From 2dc392ed6c953da581651a2decc667b29136e356 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Thu, 10 Oct 2024 23:50:11 -0700
Subject: [PATCH] Updated GUC names [skip ci]

---
 src/hnsw.c                                    | 4 ++--
 src/ivfflat.c                                 | 2 +-
 test/t/041_ivfflat_iterative_search.pl        | 4 ++--
 test/t/042_ivfflat_iterative_search_recall.pl | 4 ++--
 test/t/043_hnsw_iterative_search.pl           | 6 +++---
 test/t/044_hnsw_iterative_search_recall.pl    | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/hnsw.c b/src/hnsw.c
index 57fcbdb..ca60455 100644
--- a/src/hnsw.c
+++ b/src/hnsw.c
@@ -20,8 +20,8 @@
 
 static const struct config_enum_entry hnsw_iterative_search_options[] = {
 	{"off", HNSW_ITERATIVE_SEARCH_OFF, false},
-	{"on", HNSW_ITERATIVE_SEARCH_RELAXED, false},
-	{"strict", HNSW_ITERATIVE_SEARCH_STRICT, false},
+	{"relaxed_order", HNSW_ITERATIVE_SEARCH_RELAXED, false},
+	{"strict_order", HNSW_ITERATIVE_SEARCH_STRICT, false},
 	{NULL, 0, false}
 };
 
diff --git a/src/ivfflat.c b/src/ivfflat.c
index 0b24875..1854fba 100644
--- a/src/ivfflat.c
+++ b/src/ivfflat.c
@@ -23,7 +23,7 @@ static relopt_kind ivfflat_relopt_kind;
 
 static const struct config_enum_entry ivfflat_iterative_search_options[] = {
 	{"off", IVFFLAT_ITERATIVE_SEARCH_OFF, false},
-	{"on", IVFFLAT_ITERATIVE_SEARCH_RELAXED, false},
+	{"relaxed_order", IVFFLAT_ITERATIVE_SEARCH_RELAXED, false},
 	{NULL, 0, false}
 };
 
diff --git a/test/t/041_ivfflat_iterative_search.pl b/test/t/041_ivfflat_iterative_search.pl
index 231c49e..2b1add3 100644
--- a/test/t/041_ivfflat_iterative_search.pl
+++ b/test/t/041_ivfflat_iterative_search.pl
@@ -23,7 +23,7 @@ $node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops
 my $count = $node->safe_psql("postgres", qq(
 	SET enable_seqscan = off;
 	SET ivfflat.probes = 10;
-	SET ivfflat.iterative_search = on;
+	SET ivfflat.iterative_search = relaxed_order;
 	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
 ));
 is($count, 10);
@@ -39,7 +39,7 @@ foreach ((30, 50, 70))
 		$count = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
 			SET ivfflat.probes = 10;
-			SET ivfflat.iterative_search = on;
+			SET ivfflat.iterative_search = relaxed_order;
 			SET ivfflat.iterative_search_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;
 		));
diff --git a/test/t/042_ivfflat_iterative_search_recall.pl b/test/t/042_ivfflat_iterative_search_recall.pl
index 6bdddd0..5cdcd71 100644
--- a/test/t/042_ivfflat_iterative_search_recall.pl
+++ b/test/t/042_ivfflat_iterative_search_recall.pl
@@ -19,7 +19,7 @@ sub test_recall
 	my $explain = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
 		SET ivfflat.probes = $probes;
-		SET ivfflat.iterative_search = on;
+		SET ivfflat.iterative_search = relaxed_order;
 		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
 	));
 	like($explain, qr/Index Scan using idx on tst/);
@@ -29,7 +29,7 @@ sub test_recall
 		my $actual = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
 			SET ivfflat.probes = $probes;
-			SET ivfflat.iterative_search = on;
+			SET ivfflat.iterative_search = relaxed_order;
 			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
 		));
 		my @actual_ids = split("\n", $actual);
diff --git a/test/t/043_hnsw_iterative_search.pl b/test/t/043_hnsw_iterative_search.pl
index 6905fc4..6ccef21 100644
--- a/test/t/043_hnsw_iterative_search.pl
+++ b/test/t/043_hnsw_iterative_search.pl
@@ -26,7 +26,7 @@ $node->safe_psql("postgres", qq(
 
 my $count = $node->safe_psql("postgres", qq(
 	SET enable_seqscan = off;
-	SET hnsw.iterative_search = on;
+	SET hnsw.iterative_search = relaxed_order;
 	SET work_mem = '8MB';
 	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
 ));
@@ -42,7 +42,7 @@ foreach ((30000, 50000, 70000))
 	{
 		$count = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
-			SET hnsw.iterative_search = on;
+			SET hnsw.iterative_search = relaxed_order;
 			SET hnsw.iterative_search_max_tuples = $max_tuples;
 			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;
@@ -57,7 +57,7 @@ foreach ((30000, 50000, 70000))
 
 my ($ret, $stdout, $stderr) = $node->psql("postgres", qq(
 	SET enable_seqscan = off;
-	SET hnsw.iterative_search = on;
+	SET hnsw.iterative_search = relaxed_order;
 	SET client_min_messages = debug1;
 	SET work_mem = '2MB';
 	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
diff --git a/test/t/044_hnsw_iterative_search_recall.pl b/test/t/044_hnsw_iterative_search_recall.pl
index 8bedc32..cec42f8 100644
--- a/test/t/044_hnsw_iterative_search_recall.pl
+++ b/test/t/044_hnsw_iterative_search_recall.pl
@@ -21,7 +21,7 @@ sub test_recall
 	my $explain = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
 		SET hnsw.ef_search = $ef_search;
-		SET hnsw.iterative_search = on;
+		SET hnsw.iterative_search = relaxed_order;
 		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
 	));
 	like($explain, qr/Index Scan using idx on tst/);
@@ -31,7 +31,7 @@ sub test_recall
 		my $actual = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
 			SET hnsw.ef_search = $ef_search;
-			SET hnsw.iterative_search = on;
+			SET hnsw.iterative_search = relaxed_order;
 			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
 		));
 		my @actual_ids = split("\n", $actual);