[prev in list] [next in list] [prev in thread] [next in thread] 

List:       postgresql-general
Subject:    Re: [HACKERS] Misplaced BKI entries in pg_amproc.h
From:       Bruce Momjian <bruce () momjian ! us>
Date:       2014-01-31 21:06:51
Message-ID: 20140131210651.GP19957 () momjian ! us
[Download RAW message or body]

On Thu, Aug  1, 2013 at 10:14:43AM +0200, Antonin Houska wrote:
> While checking something, I noticed that opfamilies 3626, 3683, 3901
> (all btree AM), 3903 (hash) and 3919 (gist) are all defined in the
> section marked as "gin".
> 
> (I'm not sure if it helps to deliver a patch - it may be easier for
> the committer to move the items himself than to check if the diff is
> correct)

You are absolutely correct.  I checked your report by comparing
src/include/catalog/pg_amproc.h against this query:

	SELECT pg_opfamily.oid, pg_opfamily.*, pg_am.amname 
	FROM pg_opfamily join pg_am ON (pg_opfamily.opfmethod = pg_am.oid)
	ORDER BY 2, 1;

and you are right that the ones you mentioned were in the wrong section.
I also reordered a few so the entries in each section were in increasing
order.

Attached patch applied.

-- 
  Bruce Momjian  <bruce@momjian.us>        http://momjian.us
  EnterpriseDB                             http://enterprisedb.com

  + Everyone has their own god. +

["catalog.diff" (text/x-diff)]

diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
new file mode 100644
index c090be4..66bd765
*** a/src/include/catalog/pg_amproc.h
--- b/src/include/catalog/pg_amproc.h
*************** DATA(insert (	1988   1700 1700 1 1769 ))
*** 121,128 ****
  DATA(insert (	1989   26 26 1 356 ));
  DATA(insert (	1989   26 26 2 3134 ));
  DATA(insert (	1991   30 30 1 404 ));
- DATA(insert (	2994   2249 2249 1 2987 ));
- DATA(insert (	3194   2249 2249 1 3187 ));
  DATA(insert (	1994   25 25 1 360 ));
  DATA(insert (	1996   1083 1083 1 1107 ));
  DATA(insert (	2000   1266 1266 1 1358 ));
--- 121,126 ----
*************** DATA(insert (	2233   703 703 1  380 ));
*** 134,140 ****
--- 132,143 ----
  DATA(insert (	2234   704 704 1  381 ));
  DATA(insert (	2789   27 27 1 2794 ));
  DATA(insert (	2968   2950 2950 1 2960 ));
+ DATA(insert (	2994   2249 2249 1 2987 ));
+ DATA(insert (	3194   2249 2249 1 3187 ));
  DATA(insert (	3522   3500 3500 1 3514 ));
+ DATA(insert (	3626   3614 3614 1 3622 ));
+ DATA(insert (	3683   3615 3615 1 3668 ));
+ DATA(insert (	3901   3831 3831 1 3870 ));
  
  
  /* hash */
*************** DATA(insert (	2231   1042 1042 1 1080 ))
*** 171,179 ****
--- 174,191 ----
  DATA(insert (	2235   1033 1033 1 329 ));
  DATA(insert (	2969   2950 2950 1 2963 ));
  DATA(insert (	3523   3500 3500 1 3515 ));
+ DATA(insert (	3903   3831 3831 1 3902 ));
  
  
  /* gist */
+ DATA(insert (	1029   600 600 1 2179 ));
+ DATA(insert (	1029   600 600 2 2583 ));
+ DATA(insert (	1029   600 600 3 1030 ));
+ DATA(insert (	1029   600 600 4 2580 ));
+ DATA(insert (	1029   600 600 5 2581 ));
+ DATA(insert (	1029   600 600 6 2582 ));
+ DATA(insert (	1029   600 600 7 2584 ));
+ DATA(insert (	1029   600 600 8 3064 ));
  DATA(insert (	2593   603 603 1 2578 ));
  DATA(insert (	2593   603 603 2 2583 ));
  DATA(insert (	2593   603 603 3 2579 ));
*************** DATA(insert (	3702   3615 3615 4 3696 ))
*** 209,222 ****
  DATA(insert (	3702   3615 3615 5 3700 ));
  DATA(insert (	3702   3615 3615 6 3697 ));
  DATA(insert (	3702   3615 3615 7 3699 ));
! DATA(insert (	1029   600 600 1 2179 ));
! DATA(insert (	1029   600 600 2 2583 ));
! DATA(insert (	1029   600 600 3 1030 ));
! DATA(insert (	1029   600 600 4 2580 ));
! DATA(insert (	1029   600 600 5 2581 ));
! DATA(insert (	1029   600 600 6 2582 ));
! DATA(insert (	1029   600 600 7 2584 ));
! DATA(insert (	1029   600 600 8 3064 ));
  
  
  /* gin */
--- 221,233 ----
  DATA(insert (	3702   3615 3615 5 3700 ));
  DATA(insert (	3702   3615 3615 6 3697 ));
  DATA(insert (	3702   3615 3615 7 3699 ));
! DATA(insert (	3919   3831 3831 1 3875 ));
! DATA(insert (	3919   3831 3831 2 3876 ));
! DATA(insert (	3919   3831 3831 3 3877 ));
! DATA(insert (	3919   3831 3831 4 3878 ));
! DATA(insert (	3919   3831 3831 5 3879 ));
! DATA(insert (	3919   3831 3831 6 3880 ));
! DATA(insert (	3919   3831 3831 7 3881 ));
  
  
  /* gin */
*************** DATA(insert (	3659   3614 3614 2 3656 ))
*** 345,364 ****
  DATA(insert (	3659   3614 3614 3 3657 ));
  DATA(insert (	3659   3614 3614 4 3658 ));
  DATA(insert (	3659   3614 3614 5 2700 ));
- DATA(insert (	3626   3614 3614 1 3622 ));
- DATA(insert (	3683   3615 3615 1 3668 ));
- DATA(insert (	3901   3831 3831 1 3870 ));
- DATA(insert (	3903   3831 3831 1 3902 ));
- DATA(insert (	3919   3831 3831 1 3875 ));
- DATA(insert (	3919   3831 3831 2 3876 ));
- DATA(insert (	3919   3831 3831 3 3877 ));
- DATA(insert (	3919   3831 3831 4 3878 ));
- DATA(insert (	3919   3831 3831 5 3879 ));
- DATA(insert (	3919   3831 3831 6 3880 ));
- DATA(insert (	3919   3831 3831 7 3881 ));
  
  
  /* sp-gist */
  DATA(insert (	4015   600 600 1 4018 ));
  DATA(insert (	4015   600 600 2 4019 ));
  DATA(insert (	4015   600 600 3 4020 ));
--- 356,369 ----
  DATA(insert (	3659   3614 3614 3 3657 ));
  DATA(insert (	3659   3614 3614 4 3658 ));
  DATA(insert (	3659   3614 3614 5 2700 ));
  
  
  /* sp-gist */
+ DATA(insert (	3474   3831 3831 1 3469 ));
+ DATA(insert (	3474   3831 3831 2 3470 ));
+ DATA(insert (	3474   3831 3831 3 3471 ));
+ DATA(insert (	3474   3831 3831 4 3472 ));
+ DATA(insert (	3474   3831 3831 5 3473 ));
  DATA(insert (	4015   600 600 1 4018 ));
  DATA(insert (	4015   600 600 2 4019 ));
  DATA(insert (	4015   600 600 3 4020 ));
*************** DATA(insert (	4017   25 25 2 4028 ));
*** 374,383 ****
  DATA(insert (	4017   25 25 3 4029 ));
  DATA(insert (	4017   25 25 4 4030 ));
  DATA(insert (	4017   25 25 5 4031 ));
- DATA(insert (	3474   3831 3831 1 3469 ));
- DATA(insert (	3474   3831 3831 2 3470 ));
- DATA(insert (	3474   3831 3831 3 3471 ));
- DATA(insert (	3474   3831 3831 4 3472 ));
- DATA(insert (	3474   3831 3831 5 3473 ));
  
  #endif   /* PG_AMPROC_H */
--- 379,383 ----


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic