Merge remote-tracking branch 'origin/PGPRO-8894'

Marina Polyakova · Marina Polyakova · commit 3b26d4daaeb9 · 2023-10-25T20:38:04.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,8 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=16
+    - PG_VERSION=16 LEVEL=hardcore
     - PG_VERSION=15
     - PG_VERSION=15 LEVEL=hardcore
     - PG_VERSION=14
@@ -33,5 +35,3 @@ env:
     - PG_VERSION=12 LEVEL=hardcore
     - PG_VERSION=11
     - PG_VERSION=11 LEVEL=hardcore
-    - PG_VERSION=10
-    - PG_VERSION=10 LEVEL=hardcore
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_ha
 	int2 int4 int8 float4 float8 money oid \
     time timetz date interval \
     macaddr inet cidr text varchar char bytea bit varbit \
-	numeric rum_weight
+	numeric rum_weight expr
 
 TAP_TESTS = 1
 
diff --git a/expected/expr.out b/expected/expr.out
@@ -0,0 +1,26 @@
+CREATE TABLE documents (
+    en text not null,
+    score float not null,
+    textsearch_index_en_col tsvector
+);
+INSERT INTO documents VALUES ('the pet cat is in the shed', 56, to_tsvector('english', 'the pet cat is in the shed'));
+CREATE INDEX textsearch_index_en ON documents
+    USING rum (textsearch_index_en_col rum_tsvector_addon_ops, score)
+    WITH (attach = 'score', to = 'textsearch_index_en_col');
+SET enable_seqscan=off;
+-- should be 1 row
+SELECT * FROM documents WHERE textsearch_index_en_col @@ ('pet'::tsquery <-> ('dog'::tsquery || 'cat'::tsquery));
+             en             | score | textsearch_index_en_col  
+----------------------------+-------+--------------------------
+ the pet cat is in the shed |    56 | 'cat':3 'pet':2 'shed':7
+(1 row)
+
+SET enable_seqscan=on;
+-- 1 row
+SELECT * FROM documents WHERE textsearch_index_en_col @@ ('pet'::tsquery <-> ('dog'::tsquery || 'cat'::tsquery));
+             en             | score | textsearch_index_en_col  
+----------------------------+-------+--------------------------
+ the pet cat is in the shed |    56 | 'cat':3 'pet':2 'shed':7
+(1 row)
+
+DROP TABLE documents;
diff --git a/sql/expr.sql b/sql/expr.sql
@@ -0,0 +1,21 @@
+CREATE TABLE documents (
+    en text not null,
+    score float not null,
+    textsearch_index_en_col tsvector
+);
+
+INSERT INTO documents VALUES ('the pet cat is in the shed', 56, to_tsvector('english', 'the pet cat is in the shed'));
+
+CREATE INDEX textsearch_index_en ON documents
+    USING rum (textsearch_index_en_col rum_tsvector_addon_ops, score)
+    WITH (attach = 'score', to = 'textsearch_index_en_col');
+
+SET enable_seqscan=off;
+-- should be 1 row
+SELECT * FROM documents WHERE textsearch_index_en_col @@ ('pet'::tsquery <-> ('dog'::tsquery || 'cat'::tsquery));
+
+SET enable_seqscan=on;
+-- 1 row
+SELECT * FROM documents WHERE textsearch_index_en_col @@ ('pet'::tsquery <-> ('dog'::tsquery || 'cat'::tsquery));
+
+DROP TABLE documents;
diff --git a/src/rum_ts_utils.c b/src/rum_ts_utils.c
@@ -284,7 +284,14 @@ checkcondition_rum(void *checkval, QueryOperand *val, ExecPhraseData *data)
 		 * addInfo
 		 */
 		if (gcv->recheckPhrase)
-			return ((val->weight) ? TS_MAYBE : TS_YES);
+		{
+			/*
+			 * We cannot return TS_YES here (if "val->weight > 0"), because
+			 * data->npos = 0 and we have incorrect porocessing of this result
+			 * at the upper levels. So return TS_MAYBE.
+			 */
+			return TS_MAYBE;
+		}
 
 		positions = DatumGetByteaP(gcv->addInfo[j]);
 		ptrt = (char *) VARDATA_ANY(positions);
diff --git a/travis/Dockerfile.in b/travis/Dockerfile.in
@@ -4,10 +4,10 @@ FROM postgres:${PG_VERSION}-alpine
 RUN apk add --no-cache \
 	linux-headers \
 	openssl curl \
-	perl perl-ipc-run \
+	perl perl-ipc-run perl-dev perl-app-cpanminus perl-dbi \
 	make musl-dev gcc bison flex coreutils \
 	zlib-dev libedit-dev \
-	clang clang-analyzer;
+	pkgconf icu-dev clang clang15 clang-analyzer;
 
 # Environment
 ENV LANG=C.UTF-8 PGDATA=/pg/data
