[PGPRO-9336] Fix of isolation tests and beautify makefile

Author: VadimMinigaliev

.travis.yml

@@ -33,5 +33,3 @@ env:
     - PG_VERSION=13 LEVEL=hardcore
     - PG_VERSION=12
     - PG_VERSION=12 LEVEL=hardcore
-    - PG_VERSION=11
-    - PG_VERSION=11 LEVEL=hardcore

Makefile

@@ -34,6 +34,10 @@ 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
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -51,6 +55,14 @@ else
 REGRESS += array
 endif
 
+# 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
+
 # For 9.6-11 we have to make specific target with tap tests
 ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION)))
 wal-check: temp-install
@@ -69,8 +81,10 @@ rum--$(EXTVERSION).sql: $(DATA_first) $(DATA_updates)
 rum--%.sql: gen_rum_sql--%.pl
 	perl $< > $@
 
-install: installincludes
-
+#
+# Make conditional targets to save backward compatibility with PG11, PG10 and PG9.6.
+#
+ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION)))
 installincludes:
 	$(INSTALL) -d '$(DESTDIR)$(includedir_server)/'
 	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(RELATIVE_INCLUDES)) '$(DESTDIR)$(includedir_server)/'
@@ -92,3 +106,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

@@ -6,24 +6,26 @@
 
 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; 
-
  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(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 +37,6 @@ teardown
 {
  DROP TABLE text_table;
  DROP TABLE rum_tbl;
- DROP EXTENSION rum;
 }
 
 session "s1"

expected/predicate-rum-2_1.out

@@ -6,24 +6,26 @@
 
 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; 
-
  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(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 +37,6 @@ teardown
 {
  DROP TABLE text_table;
  DROP TABLE rum_tbl;
- DROP EXTENSION rum;
 }
 
 session "s1"