Skip to content

Commit ec4bfe2

Browse files
yuzefovichyuzefovich
committed
roachtest/pg_regress: enable oidjoins file
This was disabled with a comment to enable once we support DO blocks which we now do. Release note: None
1 parent 841ad6e commit ec4bfe2

File tree

2 files changed

+248
-2
lines changed

2 files changed

+248
-2
lines changed

‎pkg/cmd/roachtest/testdata/pg_regress/oidjoins.diffs‎

Lines changed: 247 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/oidjoins.out --label=/mnt/data1/postgres/src/test/regress/results/oidjoins.out /mnt/data1/postgres/src/test/regress/expected/oidjoins.out /mnt/data1/postgres/src/test/regress/results/oidjoins.out
2+
--- /mnt/data1/postgres/src/test/regress/expected/oidjoins.out
3+
+++ /mnt/data1/postgres/src/test/regress/results/oidjoins.out
4+
@@ -47,222 +47,24 @@
5+
end loop;
6+
end
7+
$doblock$;
8+
-NOTICE: checking pg_proc {pronamespace} => pg_namespace {oid}
9+
-NOTICE: checking pg_proc {proowner} => pg_authid {oid}
10+
-NOTICE: checking pg_proc {prolang} => pg_language {oid}
11+
-NOTICE: checking pg_proc {provariadic} => pg_type {oid}
12+
-NOTICE: checking pg_proc {prosupport} => pg_proc {oid}
13+
-NOTICE: checking pg_proc {prorettype} => pg_type {oid}
14+
-NOTICE: checking pg_proc {proargtypes} => pg_type {oid}
15+
-NOTICE: checking pg_proc {proallargtypes} => pg_type {oid}
16+
-NOTICE: checking pg_proc {protrftypes} => pg_type {oid}
17+
-NOTICE: checking pg_type {typnamespace} => pg_namespace {oid}
18+
-NOTICE: checking pg_type {typowner} => pg_authid {oid}
19+
-NOTICE: checking pg_type {typrelid} => pg_class {oid}
20+
-NOTICE: checking pg_type {typsubscript} => pg_proc {oid}
21+
-NOTICE: checking pg_type {typelem} => pg_type {oid}
22+
-NOTICE: checking pg_type {typarray} => pg_type {oid}
23+
-NOTICE: checking pg_type {typinput} => pg_proc {oid}
24+
-NOTICE: checking pg_type {typoutput} => pg_proc {oid}
25+
-NOTICE: checking pg_type {typreceive} => pg_proc {oid}
26+
-NOTICE: checking pg_type {typsend} => pg_proc {oid}
27+
-NOTICE: checking pg_type {typmodin} => pg_proc {oid}
28+
-NOTICE: checking pg_type {typmodout} => pg_proc {oid}
29+
-NOTICE: checking pg_type {typanalyze} => pg_proc {oid}
30+
-NOTICE: checking pg_type {typbasetype} => pg_type {oid}
31+
-NOTICE: checking pg_type {typcollation} => pg_collation {oid}
32+
-NOTICE: checking pg_attribute {attrelid} => pg_class {oid}
33+
-NOTICE: checking pg_attribute {atttypid} => pg_type {oid}
34+
-NOTICE: checking pg_attribute {attcollation} => pg_collation {oid}
35+
-NOTICE: checking pg_class {relnamespace} => pg_namespace {oid}
36+
-NOTICE: checking pg_class {reltype} => pg_type {oid}
37+
-NOTICE: checking pg_class {reloftype} => pg_type {oid}
38+
-NOTICE: checking pg_class {relowner} => pg_authid {oid}
39+
-NOTICE: checking pg_class {relam} => pg_am {oid}
40+
-NOTICE: checking pg_class {reltablespace} => pg_tablespace {oid}
41+
-NOTICE: checking pg_class {reltoastrelid} => pg_class {oid}
42+
-NOTICE: checking pg_class {relrewrite} => pg_class {oid}
43+
-NOTICE: checking pg_attrdef {adrelid} => pg_class {oid}
44+
-NOTICE: checking pg_attrdef {adrelid,adnum} => pg_attribute {attrelid,attnum}
45+
-NOTICE: checking pg_constraint {connamespace} => pg_namespace {oid}
46+
-NOTICE: checking pg_constraint {conrelid} => pg_class {oid}
47+
-NOTICE: checking pg_constraint {contypid} => pg_type {oid}
48+
-NOTICE: checking pg_constraint {conindid} => pg_class {oid}
49+
-NOTICE: checking pg_constraint {conparentid} => pg_constraint {oid}
50+
-NOTICE: checking pg_constraint {confrelid} => pg_class {oid}
51+
-NOTICE: checking pg_constraint {conpfeqop} => pg_operator {oid}
52+
-NOTICE: checking pg_constraint {conppeqop} => pg_operator {oid}
53+
-NOTICE: checking pg_constraint {conffeqop} => pg_operator {oid}
54+
-NOTICE: checking pg_constraint {conexclop} => pg_operator {oid}
55+
-NOTICE: checking pg_constraint {conrelid,conkey} => pg_attribute {attrelid,attnum}
56+
-NOTICE: checking pg_constraint {confrelid,confkey} => pg_attribute {attrelid,attnum}
57+
-NOTICE: checking pg_inherits {inhrelid} => pg_class {oid}
58+
-NOTICE: checking pg_inherits {inhparent} => pg_class {oid}
59+
-NOTICE: checking pg_index {indexrelid} => pg_class {oid}
60+
-NOTICE: checking pg_index {indrelid} => pg_class {oid}
61+
-NOTICE: checking pg_index {indcollation} => pg_collation {oid}
62+
-NOTICE: checking pg_index {indclass} => pg_opclass {oid}
63+
-NOTICE: checking pg_index {indrelid,indkey} => pg_attribute {attrelid,attnum}
64+
-NOTICE: checking pg_operator {oprnamespace} => pg_namespace {oid}
65+
-NOTICE: checking pg_operator {oprowner} => pg_authid {oid}
66+
-NOTICE: checking pg_operator {oprleft} => pg_type {oid}
67+
-NOTICE: checking pg_operator {oprright} => pg_type {oid}
68+
-NOTICE: checking pg_operator {oprresult} => pg_type {oid}
69+
-NOTICE: checking pg_operator {oprcom} => pg_operator {oid}
70+
-NOTICE: checking pg_operator {oprnegate} => pg_operator {oid}
71+
-NOTICE: checking pg_operator {oprcode} => pg_proc {oid}
72+
-NOTICE: checking pg_operator {oprrest} => pg_proc {oid}
73+
-NOTICE: checking pg_operator {oprjoin} => pg_proc {oid}
74+
-NOTICE: checking pg_opfamily {opfmethod} => pg_am {oid}
75+
-NOTICE: checking pg_opfamily {opfnamespace} => pg_namespace {oid}
76+
-NOTICE: checking pg_opfamily {opfowner} => pg_authid {oid}
77+
-NOTICE: checking pg_opclass {opcmethod} => pg_am {oid}
78+
-NOTICE: checking pg_opclass {opcnamespace} => pg_namespace {oid}
79+
-NOTICE: checking pg_opclass {opcowner} => pg_authid {oid}
80+
-NOTICE: checking pg_opclass {opcfamily} => pg_opfamily {oid}
81+
-NOTICE: checking pg_opclass {opcintype} => pg_type {oid}
82+
-NOTICE: checking pg_opclass {opckeytype} => pg_type {oid}
83+
-NOTICE: checking pg_am {amhandler} => pg_proc {oid}
84+
-NOTICE: checking pg_amop {amopfamily} => pg_opfamily {oid}
85+
-NOTICE: checking pg_amop {amoplefttype} => pg_type {oid}
86+
-NOTICE: checking pg_amop {amoprighttype} => pg_type {oid}
87+
-NOTICE: checking pg_amop {amopopr} => pg_operator {oid}
88+
-NOTICE: checking pg_amop {amopmethod} => pg_am {oid}
89+
-NOTICE: checking pg_amop {amopsortfamily} => pg_opfamily {oid}
90+
-NOTICE: checking pg_amproc {amprocfamily} => pg_opfamily {oid}
91+
-NOTICE: checking pg_amproc {amproclefttype} => pg_type {oid}
92+
-NOTICE: checking pg_amproc {amprocrighttype} => pg_type {oid}
93+
-NOTICE: checking pg_amproc {amproc} => pg_proc {oid}
94+
-NOTICE: checking pg_language {lanowner} => pg_authid {oid}
95+
-NOTICE: checking pg_language {lanplcallfoid} => pg_proc {oid}
96+
-NOTICE: checking pg_language {laninline} => pg_proc {oid}
97+
-NOTICE: checking pg_language {lanvalidator} => pg_proc {oid}
98+
-NOTICE: checking pg_largeobject_metadata {lomowner} => pg_authid {oid}
99+
-NOTICE: checking pg_largeobject {loid} => pg_largeobject_metadata {oid}
100+
-NOTICE: checking pg_aggregate {aggfnoid} => pg_proc {oid}
101+
-NOTICE: checking pg_aggregate {aggtransfn} => pg_proc {oid}
102+
-NOTICE: checking pg_aggregate {aggfinalfn} => pg_proc {oid}
103+
-NOTICE: checking pg_aggregate {aggcombinefn} => pg_proc {oid}
104+
-NOTICE: checking pg_aggregate {aggserialfn} => pg_proc {oid}
105+
-NOTICE: checking pg_aggregate {aggdeserialfn} => pg_proc {oid}
106+
-NOTICE: checking pg_aggregate {aggmtransfn} => pg_proc {oid}
107+
-NOTICE: checking pg_aggregate {aggminvtransfn} => pg_proc {oid}
108+
-NOTICE: checking pg_aggregate {aggmfinalfn} => pg_proc {oid}
109+
-NOTICE: checking pg_aggregate {aggsortop} => pg_operator {oid}
110+
-NOTICE: checking pg_aggregate {aggtranstype} => pg_type {oid}
111+
-NOTICE: checking pg_aggregate {aggmtranstype} => pg_type {oid}
112+
-NOTICE: checking pg_statistic {starelid} => pg_class {oid}
113+
-NOTICE: checking pg_statistic {staop1} => pg_operator {oid}
114+
-NOTICE: checking pg_statistic {staop2} => pg_operator {oid}
115+
-NOTICE: checking pg_statistic {staop3} => pg_operator {oid}
116+
-NOTICE: checking pg_statistic {staop4} => pg_operator {oid}
117+
-NOTICE: checking pg_statistic {staop5} => pg_operator {oid}
118+
-NOTICE: checking pg_statistic {stacoll1} => pg_collation {oid}
119+
-NOTICE: checking pg_statistic {stacoll2} => pg_collation {oid}
120+
-NOTICE: checking pg_statistic {stacoll3} => pg_collation {oid}
121+
-NOTICE: checking pg_statistic {stacoll4} => pg_collation {oid}
122+
-NOTICE: checking pg_statistic {stacoll5} => pg_collation {oid}
123+
-NOTICE: checking pg_statistic {starelid,staattnum} => pg_attribute {attrelid,attnum}
124+
-NOTICE: checking pg_statistic_ext {stxrelid} => pg_class {oid}
125+
-NOTICE: checking pg_statistic_ext {stxnamespace} => pg_namespace {oid}
126+
-NOTICE: checking pg_statistic_ext {stxowner} => pg_authid {oid}
127+
-NOTICE: checking pg_statistic_ext {stxrelid,stxkeys} => pg_attribute {attrelid,attnum}
128+
-NOTICE: checking pg_statistic_ext_data {stxoid} => pg_statistic_ext {oid}
129+
-NOTICE: checking pg_rewrite {ev_class} => pg_class {oid}
130+
-NOTICE: checking pg_trigger {tgrelid} => pg_class {oid}
131+
-NOTICE: checking pg_trigger {tgparentid} => pg_trigger {oid}
132+
-NOTICE: checking pg_trigger {tgfoid} => pg_proc {oid}
133+
-NOTICE: checking pg_trigger {tgconstrrelid} => pg_class {oid}
134+
-NOTICE: checking pg_trigger {tgconstrindid} => pg_class {oid}
135+
-NOTICE: checking pg_trigger {tgconstraint} => pg_constraint {oid}
136+
-NOTICE: checking pg_trigger {tgrelid,tgattr} => pg_attribute {attrelid,attnum}
137+
-NOTICE: checking pg_event_trigger {evtowner} => pg_authid {oid}
138+
-NOTICE: checking pg_event_trigger {evtfoid} => pg_proc {oid}
139+
-NOTICE: checking pg_description {classoid} => pg_class {oid}
140+
-NOTICE: checking pg_cast {castsource} => pg_type {oid}
141+
-NOTICE: checking pg_cast {casttarget} => pg_type {oid}
142+
-NOTICE: checking pg_cast {castfunc} => pg_proc {oid}
143+
-NOTICE: checking pg_enum {enumtypid} => pg_type {oid}
144+
-NOTICE: checking pg_namespace {nspowner} => pg_authid {oid}
145+
-NOTICE: checking pg_conversion {connamespace} => pg_namespace {oid}
146+
-NOTICE: checking pg_conversion {conowner} => pg_authid {oid}
147+
-NOTICE: checking pg_conversion {conproc} => pg_proc {oid}
148+
-NOTICE: checking pg_depend {classid} => pg_class {oid}
149+
-NOTICE: checking pg_depend {refclassid} => pg_class {oid}
150+
-NOTICE: checking pg_database {datdba} => pg_authid {oid}
151+
-NOTICE: checking pg_database {dattablespace} => pg_tablespace {oid}
152+
-NOTICE: checking pg_db_role_setting {setdatabase} => pg_database {oid}
153+
-NOTICE: checking pg_db_role_setting {setrole} => pg_authid {oid}
154+
-NOTICE: checking pg_tablespace {spcowner} => pg_authid {oid}
155+
-NOTICE: checking pg_auth_members {roleid} => pg_authid {oid}
156+
-NOTICE: checking pg_auth_members {member} => pg_authid {oid}
157+
-NOTICE: checking pg_auth_members {grantor} => pg_authid {oid}
158+
-NOTICE: checking pg_shdepend {dbid} => pg_database {oid}
159+
-NOTICE: checking pg_shdepend {classid} => pg_class {oid}
160+
-NOTICE: checking pg_shdepend {refclassid} => pg_class {oid}
161+
-NOTICE: checking pg_shdescription {classoid} => pg_class {oid}
162+
-NOTICE: checking pg_ts_config {cfgnamespace} => pg_namespace {oid}
163+
-NOTICE: checking pg_ts_config {cfgowner} => pg_authid {oid}
164+
-NOTICE: checking pg_ts_config {cfgparser} => pg_ts_parser {oid}
165+
-NOTICE: checking pg_ts_config_map {mapcfg} => pg_ts_config {oid}
166+
-NOTICE: checking pg_ts_config_map {mapdict} => pg_ts_dict {oid}
167+
-NOTICE: checking pg_ts_dict {dictnamespace} => pg_namespace {oid}
168+
-NOTICE: checking pg_ts_dict {dictowner} => pg_authid {oid}
169+
-NOTICE: checking pg_ts_dict {dicttemplate} => pg_ts_template {oid}
170+
-NOTICE: checking pg_ts_parser {prsnamespace} => pg_namespace {oid}
171+
-NOTICE: checking pg_ts_parser {prsstart} => pg_proc {oid}
172+
-NOTICE: checking pg_ts_parser {prstoken} => pg_proc {oid}
173+
-NOTICE: checking pg_ts_parser {prsend} => pg_proc {oid}
174+
-NOTICE: checking pg_ts_parser {prsheadline} => pg_proc {oid}
175+
-NOTICE: checking pg_ts_parser {prslextype} => pg_proc {oid}
176+
-NOTICE: checking pg_ts_template {tmplnamespace} => pg_namespace {oid}
177+
-NOTICE: checking pg_ts_template {tmplinit} => pg_proc {oid}
178+
-NOTICE: checking pg_ts_template {tmpllexize} => pg_proc {oid}
179+
-NOTICE: checking pg_extension {extowner} => pg_authid {oid}
180+
-NOTICE: checking pg_extension {extnamespace} => pg_namespace {oid}
181+
-NOTICE: checking pg_extension {extconfig} => pg_class {oid}
182+
-NOTICE: checking pg_foreign_data_wrapper {fdwowner} => pg_authid {oid}
183+
-NOTICE: checking pg_foreign_data_wrapper {fdwhandler} => pg_proc {oid}
184+
-NOTICE: checking pg_foreign_data_wrapper {fdwvalidator} => pg_proc {oid}
185+
-NOTICE: checking pg_foreign_server {srvowner} => pg_authid {oid}
186+
-NOTICE: checking pg_foreign_server {srvfdw} => pg_foreign_data_wrapper {oid}
187+
-NOTICE: checking pg_user_mapping {umuser} => pg_authid {oid}
188+
-NOTICE: checking pg_user_mapping {umserver} => pg_foreign_server {oid}
189+
-NOTICE: checking pg_foreign_table {ftrelid} => pg_class {oid}
190+
-NOTICE: checking pg_foreign_table {ftserver} => pg_foreign_server {oid}
191+
-NOTICE: checking pg_policy {polrelid} => pg_class {oid}
192+
-NOTICE: checking pg_policy {polroles} => pg_authid {oid}
193+
-NOTICE: checking pg_default_acl {defaclrole} => pg_authid {oid}
194+
-NOTICE: checking pg_default_acl {defaclnamespace} => pg_namespace {oid}
195+
-NOTICE: checking pg_init_privs {classoid} => pg_class {oid}
196+
-NOTICE: checking pg_seclabel {classoid} => pg_class {oid}
197+
-NOTICE: checking pg_shseclabel {classoid} => pg_class {oid}
198+
-NOTICE: checking pg_collation {collnamespace} => pg_namespace {oid}
199+
-NOTICE: checking pg_collation {collowner} => pg_authid {oid}
200+
-NOTICE: checking pg_partitioned_table {partrelid} => pg_class {oid}
201+
-NOTICE: checking pg_partitioned_table {partdefid} => pg_class {oid}
202+
-NOTICE: checking pg_partitioned_table {partclass} => pg_opclass {oid}
203+
-NOTICE: checking pg_partitioned_table {partcollation} => pg_collation {oid}
204+
-NOTICE: checking pg_partitioned_table {partrelid,partattrs} => pg_attribute {attrelid,attnum}
205+
-NOTICE: checking pg_range {rngtypid} => pg_type {oid}
206+
-NOTICE: checking pg_range {rngsubtype} => pg_type {oid}
207+
-NOTICE: checking pg_range {rngmultitypid} => pg_type {oid}
208+
-NOTICE: checking pg_range {rngcollation} => pg_collation {oid}
209+
-NOTICE: checking pg_range {rngsubopc} => pg_opclass {oid}
210+
-NOTICE: checking pg_range {rngcanonical} => pg_proc {oid}
211+
-NOTICE: checking pg_range {rngsubdiff} => pg_proc {oid}
212+
-NOTICE: checking pg_transform {trftype} => pg_type {oid}
213+
-NOTICE: checking pg_transform {trflang} => pg_language {oid}
214+
-NOTICE: checking pg_transform {trffromsql} => pg_proc {oid}
215+
-NOTICE: checking pg_transform {trftosql} => pg_proc {oid}
216+
-NOTICE: checking pg_sequence {seqrelid} => pg_class {oid}
217+
-NOTICE: checking pg_sequence {seqtypid} => pg_type {oid}
218+
-NOTICE: checking pg_publication {pubowner} => pg_authid {oid}
219+
-NOTICE: checking pg_publication_namespace {pnpubid} => pg_publication {oid}
220+
-NOTICE: checking pg_publication_namespace {pnnspid} => pg_namespace {oid}
221+
-NOTICE: checking pg_publication_rel {prpubid} => pg_publication {oid}
222+
-NOTICE: checking pg_publication_rel {prrelid} => pg_class {oid}
223+
-NOTICE: checking pg_subscription {subdbid} => pg_database {oid}
224+
-NOTICE: checking pg_subscription {subowner} => pg_authid {oid}
225+
-NOTICE: checking pg_subscription_rel {srsubid} => pg_subscription {oid}
226+
-NOTICE: checking pg_subscription_rel {srrelid} => pg_class {oid}
227+
+ERROR: at or near "in": syntax error: unimplemented: this syntax
228+
+DETAIL: source SQL:
229+
+declare
230+
+ fk record;
231+
+ nkeys integer;
232+
+ cmd text;
233+
+ err record;
234+
+begin
235+
+ for fk in select * from pg_get_catalog_foreign_keys()
236+
+ ^
237+
+HINT: You have attempted to use a feature that is not yet implemented.
238+
+
239+
+Please check the public issue tracker to check whether this problem is
240+
+already tracked. If you cannot find it there, please report the error
241+
+with details by creating a new issue.
242+
+
243+
+If you would rather not post publicly, please contact us directly
244+
+using the support form.
245+
+
246+
+We appreciate your feedback.
247+
+

‎pkg/cmd/roachtest/tests/pg_regress.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,7 @@ func runPGRegress(ctx context.Context, t test.Test, c cluster.Cluster) {
380380
"partition_prune",
381381
"tuplesort",
382382
"stats",
383-
// TODO(#107345): Reenable oidjoins when DO statements are supported.
384-
// "oidjoins",
383+
"oidjoins",
385384
"event_trigger",
386385
}
387386

0 commit comments

Comments
 (0)