Found another small glitch in tsearch API: the two versions of ts_lexize()

[postgresql] / src / include / catalog / pg_proc.h

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 1c3e179047aaf1f275ac44fde543d360976d1e3b..bd3eb5abc3cf74f501657cdd2f48d434d85bd4d8 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.467 2007/09/03 02:30:43 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.476 2007/10/19 22:01:45 tgl Exp $
  *
  * NOTES
  *       The script catalog/genbki.sh reads this file and generates .bki
@@ -2232,15 +2232,18 @@ DESCR("encoding name of current database");
 DATA(insert OID = 810 (  pg_client_encoding    PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ pg_client_encoding - _null_ _null_ ));
 DESCR("encoding name of current database");
 
-DATA(insert OID = 1717 (  convert                 PGNSP PGUID 12 1 0 f f t f s 2 25 "25 19" _null_ _null_ _null_ pg_convert - _null_ _null_ ));
+DATA(insert OID = 1713 (  length                  PGNSP PGUID 12 1 0 f f t f s 2 23 "17 19" _null_ _null_ _null_ length_in_encoding - _null_ _null_ ));
+DESCR("length of string in specified encoding");
+
+DATA(insert OID = 1714 (  convert_from            PGNSP PGUID 12 1 0 f f t f s 2 25 "17 19" _null_ _null_ _null_ pg_convert_from - _null_ _null_ ));
+DESCR("convert string with specified source encoding name");
+
+DATA(insert OID = 1717 (  convert_to              PGNSP PGUID 12 1 0 f f t f s 2 17 "25 19" _null_ _null_ _null_ pg_convert_to - _null_ _null_ ));
 DESCR("convert string with specified destination encoding name");
 
-DATA(insert OID = 1813 (  convert                 PGNSP PGUID 12 1 0 f f t f s 3 25 "25 19 19" _null_ _null_ _null_    pg_convert2 - _null_ _null_ ));
+DATA(insert OID = 1813 (  convert                 PGNSP PGUID 12 1 0 f f t f s 3 17 "17 19 19" _null_ _null_ _null_ pg_convert - _null_ _null_ ));
 DESCR("convert string with specified encoding names");
 
-DATA(insert OID = 1619 (  convert_using    PGNSP PGUID 12 1 0 f f t f s 2 25 "25 25" _null_ _null_ _null_  pg_convert_using - _null_ _null_ ));
-DESCR("convert string with specified conversion name");
-
 DATA(insert OID = 1264 (  pg_char_to_encoding     PGNSP PGUID 12 1 0 f f t f s 1 23 "19" _null_ _null_ _null_  PG_char_to_encoding - _null_ _null_ ));
 DESCR("convert encoding name to encoding id");
 
@@ -2867,6 +2870,8 @@ DATA(insert OID = 1932 (  pg_stat_get_tuples_updated      PGNSP PGUID 12 1 0 f f t f
 DESCR("statistics: number of tuples updated");
 DATA(insert OID = 1933 (  pg_stat_get_tuples_deleted   PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_deleted - _null_ _null_ ));
 DESCR("statistics: number of tuples deleted");
+DATA(insert OID = 1972 (  pg_stat_get_tuples_hot_updated PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_hot_updated - _null_ _null_ ));
+DESCR("statistics: number of tuples hot updated");
 DATA(insert OID = 2878 (  pg_stat_get_live_tuples      PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_live_tuples - _null_ _null_ ));
 DESCR("statistics: number of live tuples");
 DATA(insert OID = 2879 (  pg_stat_get_dead_tuples      PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_dead_tuples - _null_ _null_ ));
@@ -2899,7 +2904,7 @@ DATA(insert OID = 2853 (  pg_stat_get_backend_waiting     PGNSP PGUID 12 1 0 f f t f
 DESCR("statistics: is backend currently waiting for a lock");
 DATA(insert OID = 2094 (  pg_stat_get_backend_activity_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_     pg_stat_get_backend_activity_start - _null_ _null_ ));
 DESCR("statistics: start time for current query of backend");
-DATA(insert OID = 2857 (  pg_stat_get_backend_txn_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_  pg_stat_get_backend_txn_start - _null_ _null_ ));
+DATA(insert OID = 2857 (  pg_stat_get_backend_xact_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_ pg_stat_get_backend_xact_start - _null_ _null_ ));
 DESCR("statistics: start time for backend's current transaction");
 DATA(insert OID = 1391 ( pg_stat_get_backend_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_ pg_stat_get_backend_start - _null_ _null_ ));
 DESCR("statistics: start time for current backend session");
@@ -2937,6 +2942,11 @@ DATA(insert OID = 2772 ( pg_stat_get_bgwriter_buf_written_clean PGNSP PGUID 12 1
 DESCR("statistics: number of buffers written by the bgwriter for cleaning dirty buffers");
 DATA(insert OID = 2773 ( pg_stat_get_bgwriter_maxwritten_clean PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_maxwritten_clean - _null_ _null_ ));
 DESCR("statistics: number of times the bgwriter stopped processing when it had written too many buffers while cleaning");
+DATA(insert OID = 2775 ( pg_stat_get_buf_written_backend PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_buf_written_backend - _null_ _null_ ));
+DESCR("statistics: number of buffers written by backends");
+DATA(insert OID = 2859 ( pg_stat_get_buf_alloc                 PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_buf_alloc - _null_ _null_ ));
+DESCR("statistics: number of buffer allocations");
+
 DATA(insert OID = 2230 (  pg_stat_clear_snapshot               PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_    pg_stat_clear_snapshot - _null_ _null_ ));
 DESCR("statistics: discard current transaction's statistics snapshot");
 DATA(insert OID = 2274 (  pg_stat_reset                                        PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_    pg_stat_reset - _null_ _null_ ));
@@ -4136,6 +4146,8 @@ DATA(insert OID = 3528 (  enum_first      PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500"
 DATA(insert OID = 3529 (  enum_last            PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500" _null_ _null_ _null_ enum_last - _null_ _null_ ));
 DATA(insert OID = 3530 (  enum_range   PGNSP PGUID 12 1 0 f f f f s 2 2277 "3500 3500" _null_ _null_ _null_ enum_range_bounds - _null_ _null_ ));
 DATA(insert OID = 3531 (  enum_range   PGNSP PGUID 12 1 0 f f f f s 1 2277 "3500" _null_ _null_ _null_ enum_range_all - _null_ _null_ ));
+DATA(insert OID = 3532 (  enum_recv        PGNSP PGUID 12 1 0 f f t f s 2 3500 "2275 26" _null_ _null_ _null_ enum_recv - _null_ _null_ ));
+DATA(insert OID = 3533 (  enum_send        PGNSP PGUID 12 1 0 f f t f s 1 17   "3500" _null_ _null_ _null_ enum_send - _null_ _null_ ));
 
 /* text search stuff */
 DATA(insert OID =  3610 (  tsvectorin                  PGNSP PGUID 12 1 0 f f t f i 1 3614 "2275" _null_ _null_ _null_ tsvectorin - _null_ _null_ ));
@@ -4248,7 +4260,7 @@ DESCR("show real useful query for GiST index");
 
 DATA(insert OID = 3684 (  ts_rewrite           PGNSP PGUID 12 1 0 f f t f i 3 3615 "3615 3615 3615" _null_ _null_ _null_ tsquery_rewrite_query - _null_ _null_ ));
 DESCR("rewrite tsquery");
-DATA(insert OID = 3685 (  ts_rewrite           PGNSP PGUID 12 1 1000 f f t t v 2 3615 "3615 25" _null_ _null_ _null_ tsquery_rewrite - _null_ _null_ ));
+DATA(insert OID = 3685 (  ts_rewrite           PGNSP PGUID 12 1 0 f f t f v 2 3615 "3615 25" _null_ _null_ _null_ tsquery_rewrite - _null_ _null_ ));
 DESCR("rewrite tsquery");
 DATA(insert OID = 3686 (  ts_rewrite_accum     PGNSP PGUID 12 1 0 f f f f i 2 3615 "3615 3645" _null_ _null_ _null_ ts_rewrite_accum - _null_ _null_ ));
 DESCR("rewrite tsquery accumulator");
@@ -4314,9 +4326,7 @@ DESCR("");
 DATA(insert OID = 3721 (  prsd_lextype         PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ prsd_lextype - _null_ _null_ ));
 DESCR("");
 
-DATA(insert OID = 3723 (  ts_lexize                    PGNSP PGUID 12 1 0 f f t f i 2 1009 "26 25" _null_ _null_ _null_ ts_lexize_byid - _null_ _null_ ));
-DESCR("normalize one word by dictionary");
-DATA(insert OID = 3724 (  ts_lexize                    PGNSP PGUID 12 1 0 f f t f s 2 1009 "25 25" _null_ _null_ _null_ ts_lexize_byname - _null_ _null_ ));
+DATA(insert OID = 3723 (  ts_lexize                    PGNSP PGUID 12 1 0 f f t f i 2 1009 "3769 25" _null_ _null_ _null_ ts_lexize - _null_ _null_ ));
 DESCR("normalize one word by dictionary");
 
 DATA(insert OID = 3725 (  dsimple_init         PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ dsimple_init - _null_ _null_ ));
@@ -4387,6 +4397,28 @@ DESCR("I/O");
 DATA(insert OID = 3774 (  regdictionarysend    PGNSP PGUID 12 1 0 f f t f i 1 17 "3769" _null_ _null_ _null_ regdictionarysend - _null_ _null_ ));
 DESCR("I/O");
 
+/* txid */
+DATA(insert OID = 2939 (  txid_snapshot_in                     PGNSP PGUID 12 1  0 f f t f i 1 2970 "2275"     _null_ _null_ _null_ txid_snapshot_in - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2940 (  txid_snapshot_out                    PGNSP PGUID 12 1  0 f f t f i 1 2275 "2970" _null_ _null_ _null_ txid_snapshot_out - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2941 (  txid_snapshot_recv           PGNSP PGUID 12 1  0 f f t f i 1 2970 "2281"     _null_ _null_ _null_ txid_snapshot_recv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2942 (  txid_snapshot_send           PGNSP PGUID 12 1  0 f f t f i 1 17 "2970"       _null_ _null_ _null_ txid_snapshot_send - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2943 (  txid_current                         PGNSP PGUID 12 1  0 f f t f s 0 20 ""           _null_ _null_ _null_ txid_current - _null_ _null_ ));
+DESCR("get current transaction ID");
+DATA(insert OID = 2944 (  txid_current_snapshot                PGNSP PGUID 12 1  0 f f t f s 0 2970 ""         _null_ _null_ _null_ txid_current_snapshot - _null_ _null_ ));
+DESCR("get current snapshot");
+DATA(insert OID = 2945 (  txid_snapshot_xmin           PGNSP PGUID 12 1  0 f f t f i 1 20 "2970"       _null_ _null_ _null_ txid_snapshot_xmin - _null_ _null_ ));
+DESCR("get xmin of snapshot");
+DATA(insert OID = 2946 (  txid_snapshot_xmax           PGNSP PGUID 12 1  0 f f t f i 1 20 "2970"       _null_ _null_ _null_ txid_snapshot_xmax - _null_ _null_ ));
+DESCR("get xmax of snapshot");
+DATA(insert OID = 2947 (  txid_snapshot_xip                    PGNSP PGUID 12 1 50 f f t t i 1 20 "2970"       _null_ _null_ _null_ txid_snapshot_xip - _null_ _null_ ));
+DESCR("get set of in-progress txids in snapshot");
+DATA(insert OID = 2948 (  txid_visible_in_snapshot     PGNSP PGUID 12 1  0 f f t f i 2 16 "20 2970" _null_ _null_ _null_ txid_visible_in_snapshot - _null_ _null_ ));
+DESCR("is txid visible in snapshot?");
+
 
 /*
  * Symbolic values for provolatile column: these indicate whether the result