Skip to content

Commit ba69089

Browse files
committed
fix: permission and sql for query sample
Signed-off-by: cutecutecat <junyuchen@tensorchord.ai>
1 parent 02e72dc commit ba69089

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/index/gucs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ pub fn init() {
170170
c"`query_sampling_enable` argument of vchordrq.",
171171
&VCHORDRQ_QUERY_SAMPLING_ENABLE,
172172
GucContext::Userset,
173-
GucFlags::default(),
173+
GucFlags::default().intersection(GucFlags::SUPERUSER_ONLY),
174174
);
175175
GucRegistry::define_int_guc(
176176
c"vchordrq.query_sampling_max_records",
@@ -180,7 +180,7 @@ pub fn init() {
180180
0,
181181
10000,
182182
GucContext::Userset,
183-
GucFlags::default(),
183+
GucFlags::default().intersection(GucFlags::SUPERUSER_ONLY),
184184
);
185185
GucRegistry::define_float_guc(
186186
c"vchordrq.query_sampling_rate",
@@ -190,7 +190,7 @@ pub fn init() {
190190
0.0,
191191
1.0,
192192
GucContext::Userset,
193-
GucFlags::default(),
193+
GucFlags::default().intersection(GucFlags::SUPERUSER_ONLY),
194194
);
195195
unsafe {
196196
#[cfg(any(feature = "pg13", feature = "pg14"))]

src/sql/finalize.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ RETURNS TABLE(
152152
index_name NAME,
153153
table_name NAME,
154154
column_name NAME,
155-
operator TEXT,
155+
operator NAME,
156156
value TEXT
157157
)
158158
LANGUAGE plpgsql
@@ -179,12 +179,7 @@ BEGIN
179179
I.relname AS index_name,
180180
C.relname AS table_name,
181181
PA.attname AS column_name,
182-
CASE
183-
WHEN OP.opcname LIKE '%%l2%%' THEN '<->'
184-
WHEN OP.opcname LIKE '%%ip%%' THEN '<#>'
185-
WHEN OP.opcname LIKE '%%cosine%%' THEN '<=>'
186-
ELSE ''
187-
END AS operator
182+
OP.oprname AS operator
188183
FROM
189184
pg_catalog.pg_index X
190185
JOIN
@@ -196,11 +191,16 @@ BEGIN
196191
JOIN
197192
pg_catalog.pg_am A ON A.oid = I.relam
198193
LEFT JOIN
199-
pg_catalog.pg_opclass AS OP ON OP.oid = X.indclass[0]
194+
pg_catalog.pg_opclass AS OPC ON OPC.oid = X.indclass[0]
195+
LEFT JOIN
196+
pg_catalog.pg_amop AO ON OPC.opcfamily = AO.amopfamily
197+
LEFT JOIN
198+
pg_catalog.pg_operator OP ON OP.oid = AO.amopopr
200199
LEFT JOIN
201200
pg_catalog.pg_attribute PA ON PA.attrelid = X.indrelid AND PA.attnum = X.indkey[0]
202201
WHERE
203202
A.amname = 'vchordrq'
203+
AND AO.amoplefttype = AO.amoprighttype
204204
AND C.relkind = 'r'
205205
AND X.indnatts = 1
206206
AND X.indexrelid = %1$s

tests/vchordrq/recall.slt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ FROM (
114114
SELECT
115115
vchordrq_evaluate_query_recall(
116116
query => format(
117-
'SELECT ctid FROM %I.%I ORDER BY %I %s ''%s'' LIMIT 10',
117+
'SELECT ctid FROM %I.%I ORDER BY %I %s %L LIMIT 10',
118118
lq.schema_name,
119119
lq.table_name,
120120
lq.column_name,

0 commit comments

Comments
 (0)