Merge branch 'postgrespro:master' into master

Author: Wenbo94

.gitignore

@@ -4,6 +4,7 @@
 results
 __pycache__
 *.pyc
+rum--*.sql
 tmp_install
 log
 

.travis.yml

@@ -35,10 +35,3 @@ env:
     - PG_VERSION=13 LEVEL=hardcore
     - PG_VERSION=12
     - PG_VERSION=12 LEVEL=hardcore
-    - PG_VERSION=11
-    - PG_VERSION=11 LEVEL=hardcore
-
-matrix:
-    allow_failures:
-        - env: PG_VERSION=11
-        - env: PG_VERSION=11 LEVEL=hardcore

Makefile

@@ -30,9 +30,20 @@ REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_ha
 
 TAP_TESTS = 1
 
+ISOLATION = predicate-rum predicate-rum-2
+ISOLATION_OPTS = --load-extension=rum
 EXTRA_CLEAN = pglist_tmp
 
 ifdef USE_PGXS
+
+# We cannot run isolation test for versions 12,13 in PGXS case
+# because 'pg_isolation_regress' is not copied to install
+# directory, see src/test/isolation/Makefile
+ifeq ($(MAJORVERSION),$(filter 12% 13%,$(MAJORVERSION)))
+undefine ISOLATION
+undefine ISOLATION_OPTS
+endif
+
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
@@ -60,6 +71,11 @@ wal-check: temp-install
 check: wal-check
 endif
 
+#
+# Make conditional targets to save backward compatibility with PG11, PG10 and PG9.6.
+#
+ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION)))
+
 install: installincludes
 
 installincludes:
@@ -83,3 +99,4 @@ isolationcheck: | submake-isolation submake-rum temp-install
 	$(pg_isolation_regress_check) \
 		--temp-config $(top_srcdir)/contrib/rum/logical.conf \
 		$(ISOLATIONCHECKS)
+endif

expected/predicate-rum-2.out

@@ -3,6 +3,9 @@
 # Does not support the PGXS infrastructure at this time. Please, compile as part
 # of the contrib source tree.
 
+extension = 'rum'
+extversion = '1.3'
+
 rum_sources = files(
   'src/btree_rum.c',
   'src/rum_arr_utils.c',
@@ -24,7 +27,7 @@ rum_sources = files(
 if host_system == 'windows'
   rum_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
     '--NAME', 'rum',
-    '--FILEDESC', 'rum - provides access method to work with the RUM indexes.',])
+    '--FILEDESC', 'RUM index access method',])
 endif
 
 rum = shared_module('rum',
@@ -33,15 +36,19 @@ rum = shared_module('rum',
 )
 contrib_targets += rum
 
+configure_file(
+  input: 'rum_init.sql',
+  output: extension + '--' + extversion + '.sql',
+  copy: true,
+  install: true,
+  install_dir: contrib_data_args['install_dir'],
+)
+
 install_data(
   'rum.control',
   'rum--1.0--1.1.sql',
-  'rum--1.0.sql',
   'rum--1.1--1.2.sql',
-  'rum--1.1.sql',
   'rum--1.2--1.3.sql',
-  'rum--1.2.sql',
-  'rum--1.3.sql',
   kwargs: contrib_data_args,
 )
 
@@ -87,10 +94,25 @@ tests += {
       'expr',
       'array',
     ],
+    'regress_args': [
+      '--temp-config', files('logical.conf')
+    ],
   },
   'tap': {
     'tests': [
       't/001_wal.pl',
+      't/002_pglist.pl',
+    ],
+    'test_kwargs': {'timeout': 3000},
+  },
+  'isolation': {
+    'specs': [
+      'predicate-rum',
+      'predicate-rum-2',
+    ],
+    'regress_args': [
+      '--temp-config', files('logical.conf'),
+      '--load-extension=rum',
     ],
   },
 }

expected/predicate-rum-2_1.out

@@ -6,24 +6,29 @@
 
 setup
 {
- CREATE EXTENSION rum;
-
  CREATE TABLE rum_tbl (id serial, tsv tsvector);
 
  CREATE TABLE text_table (id1 serial, t text[]);
 
- SELECT SETSEED(0.5);
-
  INSERT INTO text_table(t) SELECT array[chr(i) || chr(j)] FROM generate_series(65,90) i,
  generate_series(65,90) j ; 
 
- INSERT INTO rum_tbl(tsv) SELECT to_tsvector('simple', t[1] ) FROM  text_table; 
-
+ -- We need to use pseudorandom to generate values for test table
+ -- In this case we use linear congruential generator because random() 
+ -- function may generate different outputs with different systems
  DO $$
+  DECLARE 
+	c integer := 17;
+	a integer := 261;
+	m integer := 6760;
+	Xi integer := 228;
  BEGIN
- FOR j in 1..10 LOOP
- UPDATE rum_tbl SET tsv = tsv || q.t1 FROM (SELECT id1,to_tsvector('simple', t[1] )
- as t1 FROM text_table) as q WHERE id = (random()*q.id1)::integer;
+ FOR i in 1..338 LOOP
+	INSERT INTO rum_tbl(tsv) VALUES ('');
+	FOR j in 1..10 LOOP 
+		UPDATE rum_tbl SET tsv = tsv || (SELECT to_tsvector('simple', t[1]) FROM text_table WHERE id1 = Xi % 676 + 1) WHERE id = i;
+		Xi = (a * Xi + c) % m;
+ 	END LOOP;
  END LOOP;
  END;
  $$;
@@ -35,7 +40,6 @@ teardown
 {
  DROP TABLE text_table;
  DROP TABLE rum_tbl;
- DROP EXTENSION rum;
 }
 
 session "s1"

expected/predicate-rum.out

@@ -6,24 +6,29 @@
 
 setup
 {
- CREATE EXTENSION rum;
-
  CREATE TABLE rum_tbl (id serial, tsv tsvector);
 
  CREATE TABLE text_table (id1 serial, t text[]);
 
- SELECT SETSEED(0.5);
-
  INSERT INTO text_table(t) SELECT array[chr(i) || chr(j)] FROM generate_series(65,90) i,
  generate_series(65,90) j ; 
 
- INSERT INTO rum_tbl(tsv) SELECT to_tsvector('simple', t[1] ) FROM  text_table; 
-
+ -- We need to use pseudorandom to generate values for test table
+ -- In this case we use linear congruential generator because random() 
+ -- function may generate different outputs with different systems
  DO $$
+  DECLARE 
+	c integer := 17;
+	a integer := 261;
+	m integer := 6760;
+	Xi integer := 228;
  BEGIN
- FOR j in 1..10 LOOP
- UPDATE rum_tbl SET tsv = tsv || q.t1 FROM (SELECT id1,to_tsvector('simple', t[1] )
- as t1 FROM text_table) as q WHERE id = (random()*q.id1)::integer;
+ FOR i in 1..338 LOOP
+	INSERT INTO rum_tbl(tsv) VALUES ('');
+	FOR j in 1..10 LOOP 
+		UPDATE rum_tbl SET tsv = tsv || (SELECT to_tsvector('simple', t[1]) FROM text_table WHERE id1 = Xi % 676 + 1) WHERE id = i;
+		Xi = (a * Xi + c) % m;
+ 	END LOOP;
  END LOOP;
  END;
  $$;
@@ -35,7 +40,6 @@ teardown
 {
  DROP TABLE text_table;
  DROP TABLE rum_tbl;
- DROP EXTENSION rum;
 }
 
 session "s1"

expected/predicate-rum_1.out

@@ -1748,7 +1748,11 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumItem * item, Snapshot
 	{
 		if (compareRumItemScanDirection(rumstate, entry->attnumOrig,
 							entry->scanDirection,
-							&entry->curItem, item) >= 0)
+							&entry->curItem, item) >= 0 &&
+							entry->offset >= 0 &&
+							entry->offset < entry->nlist &&
+							rumCompareItemPointers(&entry->curItem.iptr,
+												   &entry->list[entry->offset].iptr) == 0)
 			return;
 		while (entry->offset >= 0 && entry->offset < entry->nlist)
 		{