Skip to content

Commit c3f67ed

Browse files
tglsfdctglsfdc
committed
Do pre-release housekeeping on catalog data, and fix jsonpath send/recv.
Run renumber_oids.pl to move high-numbered OIDs down, as per pre-beta tasks specified by RELEASE_CHANGES. (The only change is 8394 -> 3428.) Also run reformat_dat_file.pl while I'm here. While looking at the reformat diffs, I chanced to notice that type jsonpath had typsend and typreceive = '-', which surely is not the intention given that jsonpath_send and jsonpath_recv exist. Fix that. It's safe to assume that these functions have never been tested :-(. I didn't try, but somebody should.
1 parent 90e7f31 commit c3f67ed

File tree

3 files changed

+32
-33
lines changed

3 files changed

+32
-33
lines changed

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 201904251
56+
#define CATALOG_VERSION_NO 201904281
5757

5858
#endif

‎src/include/catalog/pg_proc.dat

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -925,9 +925,8 @@
925925
prorettype => 'bool', proargtypes => 'regclass int4 text',
926926
prosrc => 'pg_index_column_has_property' },
927927
{ oid => '676', descr => 'return name of given index build phase',
928-
proname => 'pg_indexam_progress_phasename', provolatile => 'i',
929-
prorettype => 'text', proargtypes => 'oid int8',
930-
prosrc => 'pg_indexam_progress_phasename' },
928+
proname => 'pg_indexam_progress_phasename', prorettype => 'text',
929+
proargtypes => 'oid int8', prosrc => 'pg_indexam_progress_phasename' },
931930

932931
{ oid => '339',
933932
proname => 'poly_same', prorettype => 'bool',
@@ -5017,11 +5016,9 @@
50175016
proname => 'pg_mcv_list_send', provolatile => 's', prorettype => 'bytea',
50185017
proargtypes => 'pg_mcv_list', prosrc => 'pg_mcv_list_send' },
50195018

5020-
{ oid => '3427',
5021-
descr => 'details about MCV list items',
5022-
proname => 'pg_mcv_list_items', prorows => '1000', proisstrict => 't',
5023-
proretset => 't', provolatile => 's', prorettype => 'record',
5024-
proargtypes => 'pg_mcv_list',
5019+
{ oid => '3427', descr => 'details about MCV list items',
5020+
proname => 'pg_mcv_list_items', prorows => '1000', proretset => 't',
5021+
provolatile => 's', prorettype => 'record', proargtypes => 'pg_mcv_list',
50255022
proallargtypes => '{pg_mcv_list,int4,text,_bool,float8,float8}',
50265023
proargmodes => '{i,o,o,o,o,o}',
50275024
proargnames => '{mcv_list,index,values,nulls,frequency,base_frequency}',
@@ -5285,7 +5282,7 @@
52855282
proname => 'pg_stat_get_db_checksum_failures', provolatile => 's',
52865283
proparallel => 'r', prorettype => 'int8', proargtypes => 'oid',
52875284
prosrc => 'pg_stat_get_db_checksum_failures' },
5288-
{ oid => '8394',
5285+
{ oid => '3428',
52895286
descr => 'statistics: when last checksum failure was detected in database',
52905287
proname => 'pg_stat_get_db_checksum_last_failure', provolatile => 's',
52915288
proparallel => 'r', prorettype => 'timestamptz', proargtypes => 'oid',
@@ -9254,8 +9251,8 @@
92549251
proname => 'jsonpath_in', prorettype => 'jsonpath', proargtypes => 'cstring',
92559252
prosrc => 'jsonpath_in' },
92569253
{ oid => '4002', descr => 'I/O',
9257-
proname => 'jsonpath_recv', prorettype => 'jsonpath', proargtypes => 'internal',
9258-
prosrc => 'jsonpath_recv' },
9254+
proname => 'jsonpath_recv', prorettype => 'jsonpath',
9255+
proargtypes => 'internal', prosrc => 'jsonpath_recv' },
92599256
{ oid => '4003', descr => 'I/O',
92609257
proname => 'jsonpath_out', prorettype => 'cstring', proargtypes => 'jsonpath',
92619258
prosrc => 'jsonpath_out' },
@@ -9276,10 +9273,11 @@
92769273
prosrc => 'jsonb_path_query_array' },
92779274
{ oid => '4008', descr => 'jsonpath query first item',
92789275
proname => 'jsonb_path_query_first', prorettype => 'jsonb',
9279-
proargtypes => 'jsonb jsonpath jsonb bool', prosrc => 'jsonb_path_query_first' },
9280-
{ oid => '4009', descr => 'jsonpath match', proname => 'jsonb_path_match',
9281-
prorettype => 'bool', proargtypes => 'jsonb jsonpath jsonb bool',
9282-
prosrc => 'jsonb_path_match' },
9276+
proargtypes => 'jsonb jsonpath jsonb bool',
9277+
prosrc => 'jsonb_path_query_first' },
9278+
{ oid => '4009', descr => 'jsonpath match',
9279+
proname => 'jsonb_path_match', prorettype => 'bool',
9280+
proargtypes => 'jsonb jsonpath jsonb bool', prosrc => 'jsonb_path_match' },
92839281

92849282
{ oid => '4010', descr => 'implementation of @? operator',
92859283
proname => 'jsonb_path_exists_opr', prorettype => 'bool',
@@ -9779,7 +9777,8 @@
97799777
proargmodes => '{i,i,i,o,o}',
97809778
proargnames => '{slot_name,immediately_reserve,temporary,slot_name,lsn}',
97819779
prosrc => 'pg_create_physical_replication_slot' },
9782-
{ oid => '4220', descr => 'copy a physical replication slot, changing temporality',
9780+
{ oid => '4220',
9781+
descr => 'copy a physical replication slot, changing temporality',
97839782
proname => 'pg_copy_physical_replication_slot', provolatile => 'v',
97849783
proparallel => 'u', prorettype => 'record', proargtypes => 'name name bool',
97859784
proallargtypes => '{name,name,bool,name,pg_lsn}',
@@ -9789,8 +9788,7 @@
97899788
{ oid => '4221', descr => 'copy a physical replication slot',
97909789
proname => 'pg_copy_physical_replication_slot', provolatile => 'v',
97919790
proparallel => 'u', prorettype => 'record', proargtypes => 'name name',
9792-
proallargtypes => '{name,name,name,pg_lsn}',
9793-
proargmodes => '{i,i,o,o}',
9791+
proallargtypes => '{name,name,name,pg_lsn}', proargmodes => '{i,i,o,o}',
97949792
proargnames => '{src_slot_name,dst_slot_name,slot_name,lsn}',
97959793
prosrc => 'pg_copy_physical_replication_slot_b' },
97969794
{ oid => '3780', descr => 'drop a replication slot',
@@ -9813,14 +9811,17 @@
98139811
proargmodes => '{i,i,i,o,o}',
98149812
proargnames => '{slot_name,plugin,temporary,slot_name,lsn}',
98159813
prosrc => 'pg_create_logical_replication_slot' },
9816-
{ oid => '4222', descr => 'copy a logical replication slot, changing temporality and plugin',
9814+
{ oid => '4222',
9815+
descr => 'copy a logical replication slot, changing temporality and plugin',
98179816
proname => 'pg_copy_logical_replication_slot', provolatile => 'v',
9818-
proparallel => 'u', prorettype => 'record', proargtypes => 'name name bool name',
9817+
proparallel => 'u', prorettype => 'record',
9818+
proargtypes => 'name name bool name',
98199819
proallargtypes => '{name,name,bool,name,name,pg_lsn}',
98209820
proargmodes => '{i,i,i,i,o,o}',
98219821
proargnames => '{src_slot_name,dst_slot_name,temporary,plugin,slot_name,lsn}',
98229822
prosrc => 'pg_copy_logical_replication_slot_a' },
9823-
{ oid => '4223', descr => 'copy a logical replication slot, changing temporality',
9823+
{ oid => '4223',
9824+
descr => 'copy a logical replication slot, changing temporality',
98249825
proname => 'pg_copy_logical_replication_slot', provolatile => 'v',
98259826
proparallel => 'u', prorettype => 'record', proargtypes => 'name name bool',
98269827
proallargtypes => '{name,name,bool,name,pg_lsn}',
@@ -9830,8 +9831,7 @@
98309831
{ oid => '4224', descr => 'copy a logical replication slot',
98319832
proname => 'pg_copy_logical_replication_slot', provolatile => 'v',
98329833
proparallel => 'u', prorettype => 'record', proargtypes => 'name name',
9833-
proallargtypes => '{name,name,name,pg_lsn}',
9834-
proargmodes => '{i,i,o,o}',
9834+
proallargtypes => '{name,name,name,pg_lsn}', proargmodes => '{i,i,o,o}',
98359835
proargnames => '{src_slot_name,dst_slot_name,slot_name,lsn}',
98369836
prosrc => 'pg_copy_logical_replication_slot_c' },
98379837
{ oid => '3782', descr => 'get changes from replication slot',

‎src/include/catalog/pg_type.dat

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,10 @@
167167
typcollation => 'default' },
168168
{ oid => '5017', oid_symbol => 'PGMCVLISTOID',
169169
descr => 'multivariate MCV list',
170-
typname => 'pg_mcv_list', typlen => '-1', typbyval => 'f',
171-
typcategory => 'S', typinput => 'pg_mcv_list_in',
172-
typoutput => 'pg_mcv_list_out', typreceive => 'pg_mcv_list_recv',
173-
typsend => 'pg_mcv_list_send', typalign => 'i', typstorage => 'x',
174-
typcollation => 'default' },
170+
typname => 'pg_mcv_list', typlen => '-1', typbyval => 'f', typcategory => 'S',
171+
typinput => 'pg_mcv_list_in', typoutput => 'pg_mcv_list_out',
172+
typreceive => 'pg_mcv_list_recv', typsend => 'pg_mcv_list_send',
173+
typalign => 'i', typstorage => 'x', typcollation => 'default' },
175174
{ oid => '32', oid_symbol => 'PGDDLCOMMANDOID',
176175
descr => 'internal type for passing CollectedCommand',
177176
typname => 'pg_ddl_command', typlen => 'SIZEOF_POINTER', typbyval => 't',
@@ -441,11 +440,11 @@
441440
typname => 'jsonb', typlen => '-1', typbyval => 'f', typcategory => 'U',
442441
typinput => 'jsonb_in', typoutput => 'jsonb_out', typreceive => 'jsonb_recv',
443442
typsend => 'jsonb_send', typalign => 'i', typstorage => 'x' },
444-
{ oid => '4072', array_type_oid => '4073', descr => 'JSON path',
443+
{ oid => '4072', array_type_oid => '4073', descr => 'JSON path',
445444
typname => 'jsonpath', typlen => '-1', typbyval => 'f', typcategory => 'U',
446-
typarray => '_jsonpath', typinput => 'jsonpath_in',
447-
typoutput => 'jsonpath_out', typreceive => '-', typsend => '-',
448-
typalign => 'i', typstorage => 'x' },
445+
typinput => 'jsonpath_in', typoutput => 'jsonpath_out',
446+
typreceive => 'jsonpath_recv', typsend => 'jsonpath_send', typalign => 'i',
447+
typstorage => 'x' },
449448

450449
{ oid => '2970', array_type_oid => '2949', descr => 'txid snapshot',
451450
typname => 'txid_snapshot', typlen => '-1', typbyval => 'f',

0 commit comments

Comments
 (0)