Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita817ad8

Browse files
[PGPRO-9336] Fix of isolation tests and beautify makefile
1 parent9e78b97 commita817ad8

File tree

7 files changed

+707
-1602
lines changed

7 files changed

+707
-1602
lines changed

‎Makefile

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_ha
3434

3535
TAP_TESTS = 1
3636

37+
ISOLATION = predicate-rum predicate-rum-2
38+
ISOLATION_OPTS = --load-extension=rum
39+
3740
ifdefUSE_PGXS
3841
PG_CONFIG = pg_config
3942
PGXS :=$(shell$(PG_CONFIG) --pgxs)
@@ -68,27 +71,3 @@ rum--$(EXTVERSION).sql: $(DATA_first) $(DATA_updates)
6871
# rule for updates, e.g. rum--1.0--1.1.sql
6972
rum--%.sql: gen_rum_sql--%.pl
7073
perl$<>$@
71-
72-
install: installincludes
73-
74-
installincludes:
75-
$(INSTALL) -d'$(DESTDIR)$(includedir_server)/'
76-
$(INSTALL_DATA)$(addprefix$(srcdir)/,$(RELATIVE_INCLUDES))'$(DESTDIR)$(includedir_server)/'
77-
78-
uninstall: uninstallincludes
79-
80-
uninstallincludes:
81-
rm -f$(addprefix '$(DESTDIR)$(includedir_server)/',$(INCLUDES))
82-
83-
ISOLATIONCHECKS= predicate-rum predicate-rum-2
84-
85-
submake-isolation:
86-
$(MAKE) -C$(top_builddir)/src/test/isolation all
87-
88-
submake-rum:
89-
$(MAKE) -C$(top_builddir)/contrib/rum
90-
91-
isolationcheck: | submake-isolation submake-rum temp-install
92-
$(pg_isolation_regress_check)\
93-
--temp-config$(top_srcdir)/contrib/rum/logical.conf\
94-
$(ISOLATIONCHECKS)

‎expected/predicate-rum-2.out

Lines changed: 340 additions & 260 deletions
Large diffs are not rendered by default.

‎expected/predicate-rum-2_1.out

Lines changed: 0 additions & 501 deletions
This file was deleted.

‎expected/predicate-rum.out

Lines changed: 342 additions & 280 deletions
Large diffs are not rendered by default.

‎expected/predicate-rum_1.out

Lines changed: 0 additions & 521 deletions
This file was deleted.

‎specs/predicate-rum-2.spec

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
setup
88
{
9-
CREATEEXTENSIONrum;
10-
119
CREATETABLErum_tbl (idserial,tsvtsvector);
1210

1311
CREATETABLEtext_table (id1serial,ttext[]);
@@ -17,13 +15,19 @@ setup
1715
INSERTINTOtext_table(t)SELECTarray[chr(i)||chr(j)]FROMgenerate_series(65,90)i,
1816
generate_series(65,90)j ;
1917

20-
INSERTINTOrum_tbl(tsv)SELECTto_tsvector('simple',t[1] )FROMtext_table;
21-
2218
DO $$
19+
DECLARE
20+
cinteger:=17;
21+
ainteger:=261;
22+
minteger:=6760;
23+
Xiinteger:=228;
2324
BEGIN
24-
FORjin1..10LOOP
25-
UPDATErum_tblSETtsv=tsv||q.t1FROM (SELECTid1,to_tsvector('simple',t[1] )
26-
ast1FROMtext_table)asqWHEREid= (random()*q.id1)::integer;
25+
FORiin1..338LOOP
26+
INSERTINTOrum_tbl(tsv)VALUES ('');
27+
FORjin1..10LOOP
28+
UPDATErum_tblSETtsv=tsv|| (SELECTto_tsvector(t[1])FROMtext_tableWHEREid1=Xi%676+1)WHEREid=i;
29+
Xi= (a*Xi+c)%m;
30+
ENDLOOP;
2731
ENDLOOP;
2832
END;
2933
$$;
@@ -35,7 +39,6 @@ teardown
3539
{
3640
DROPTABLEtext_table;
3741
DROPTABLErum_tbl;
38-
DROPEXTENSIONrum;
3942
}
4043

4144
session"s1"

‎specs/predicate-rum.spec

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
setup
88
{
9-
CREATEEXTENSIONrum;
10-
119
CREATETABLErum_tbl (idserial,tsvtsvector);
1210

1311
CREATETABLEtext_table (id1serial,ttext[]);
@@ -17,13 +15,19 @@ setup
1715
INSERTINTOtext_table(t)SELECTarray[chr(i)||chr(j)]FROMgenerate_series(65,90)i,
1816
generate_series(65,90)j ;
1917

20-
INSERTINTOrum_tbl(tsv)SELECTto_tsvector('simple',t[1] )FROMtext_table;
21-
2218
DO $$
19+
DECLARE
20+
cinteger:=17;
21+
ainteger:=261;
22+
minteger:=6760;
23+
Xiinteger:=228;
2324
BEGIN
24-
FORjin1..10LOOP
25-
UPDATErum_tblSETtsv=tsv||q.t1FROM (SELECTid1,to_tsvector('simple',t[1] )
26-
ast1FROMtext_table)asqWHEREid= (random()*q.id1)::integer;
25+
FORiin1..338LOOP
26+
INSERTINTOrum_tbl(tsv)VALUES ('');
27+
FORjin1..10LOOP
28+
UPDATErum_tblSETtsv=tsv|| (SELECTto_tsvector(t[1])FROMtext_tableWHEREid1=Xi%676+1)WHEREid=i;
29+
Xi= (a*Xi+c)%m;
30+
ENDLOOP;
2731
ENDLOOP;
2832
END;
2933
$$;
@@ -35,7 +39,6 @@ teardown
3539
{
3640
DROPTABLEtext_table;
3741
DROPTABLErum_tbl;
38-
DROPEXTENSIONrum;
3942
}
4043

4144
session"s1"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp