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

Commit9470ab0

Browse files
author
Thomas G. Lockhart
committed
Define routines and catalog entries for string min()/max() functions.
Extend new type coersion techniques to aggregates.
1 parent84107b4 commit9470ab0

File tree

4 files changed

+36
-26
lines changed

4 files changed

+36
-26
lines changed

‎src/include/catalog/pg_aggregate.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_aggregate.h,v 1.17 1998/09/01 04:34:45 momjian Exp $
10+
* $Id: pg_aggregate.h,v 1.18 1998/12/08 06:18:11 thomas Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -115,6 +115,7 @@ DATA(insert OID = 0 ( maxPGUID float8larger- - 1084 1084 0 1084 _null_ _null_
115115
DATA(insertOID=0 (maxPGUIDcashlarger--7907900790_null__null_ ));
116116
DATA(insertOID=0 (maxPGUIDdatetime_larger--1184118401184_null__null_ ));
117117
DATA(insertOID=0 (maxPGUIDtimespan_larger--1186118601186_null__null_ ));
118+
DATA(insertOID=0 (maxPGUIDtext_larger--2525025_null__null_ ));
118119

119120
DATA(insertOID=0 (minPGUIDint8smaller--2020020_null__null_ ));
120121
DATA(insertOID=0 (minPGUIDint4smaller--2323023_null__null_ ));
@@ -127,6 +128,7 @@ DATA(insert OID = 0 ( minPGUID float8smaller- - 1084 1084 0 1084 _null_ _null
127128
DATA(insertOID=0 (minPGUIDcashsmaller--7907900790_null__null_ ));
128129
DATA(insertOID=0 (minPGUIDdatetime_smaller--1184118401184_null__null_ ));
129130
DATA(insertOID=0 (minPGUIDtimespan_smaller--1186118601186_null__null_ ));
131+
DATA(insertOID=0 (minPGUIDtext_smaller--2525025_null__null_ ));
130132

131133
DATA(insertOID=0 (countPGUID-int4inc-002323_null_0 ));
132134

‎src/include/catalog/pg_proc.h

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.84 1998/11/17 14:36:51 thomas Exp $
9+
* $Id: pg_proc.h,v 1.85 1998/12/08 06:18:11 thomas Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -435,11 +435,11 @@ DESCR("subtract");
435435
DATA(insertOID=207 (float4absPGUID11ftf1f700"700 700"10000100foobar ));
436436
DESCR("absolute value");
437437
DATA(insertOID=208 (float4incPGUID11ftf1f700"700"10000100foobar ));
438-
DESCR("");
438+
DESCR("increment");
439439
DATA(insertOID=209 (float4largerPGUID11ftf2f700"700 700"10000100foobar ));
440-
DESCR("");
440+
DESCR("larger of two");
441441
DATA(insertOID=211 (float4smallerPGUID11ftf2f700"700 700"10000100foobar ));
442-
DESCR("");
442+
DESCR("smaller of two");
443443

444444
DATA(insertOID=212 (int4umPGUID11ftf1f23"23"10000100foobar ));
445445
DESCR("subtract");
@@ -463,11 +463,11 @@ DESCR("subtract");
463463
DATA(insertOID=221 (float8absPGUID11ftf1f701"701"10000100foobar ));
464464
DESCR("absolute value");
465465
DATA(insertOID=222 (float8incPGUID11ftf1f701"701"10000100foobar ));
466-
DESCR("");
466+
DESCR("increment");
467467
DATA(insertOID=223 (float8largerPGUID11ftf2f701"701 701"10000100foobar ));
468-
DESCR("");
468+
DESCR("larger of two");
469469
DATA(insertOID=224 (float8smallerPGUID11ftf2f701"701 701"10000100foobar ));
470-
DESCR("");
470+
DESCR("smaller of two");
471471

472472
DATA(insertOID=225 (lseg_centerPGUID11ftf1f600"601"10000100foobar ));
473473
DESCR("center of");
@@ -827,14 +827,18 @@ DATA(insert OID = 452 ( hashfloat8 PGUID 11 f t f 2 f 23 "701 701" 100 0 0
827827
DESCR("hash");
828828
DATA(insertOID=453 (hashoidPGUID11ftf2f23"26 26"10000100foobar ));
829829
DESCR("hash");
830-
DATA(insertOID=457 (hashoid8PGUID11ftf2f23"30 30"10000100foobar ));
831-
DESCR("hash");
832830
DATA(insertOID=454 (hashcharPGUID11ftf2f23"18 18"10000100foobar ));
833831
DESCR("hash");
834832
DATA(insertOID=455 (hashnamePGUID11ftf2f23"19 19"10000100foobar ));
835833
DESCR("hash");
836834
DATA(insertOID=456 (hashtextPGUID11ftf2f23"25 25"10000100foobar ));
837835
DESCR("hash");
836+
DATA(insertOID=457 (hashoid8PGUID11ftf2f23"30 30"10000100foobar ));
837+
DESCR("hash");
838+
DATA(insertOID=458 (text_largerPGUID11ftf2f25"25 25"10000100foobar ));
839+
DESCR("larger of two");
840+
DATA(insertOID=459 (text_smallerPGUID11ftf2f25"25 25"10000100foobar ));
841+
DESCR("smaller of two");
838842

839843
DATA(insertOID=460 (int8inPGUID11ftf1f20"0"10000100foobar ));
840844
DESCR("(internal)");
@@ -1011,9 +1015,9 @@ DATA(insert OID = 765 ( lo_export PGUID 11 f t f 2 f 23 "26 25" 100 0 0 100
10111015
DESCR("large object export");
10121016

10131017
DATA(insertOID=766 (int4incPGUID11ftf1f23"23"10000100foobar ));
1014-
DESCR("");
1018+
DESCR("increment");
10151019
DATA(insertOID=767 (int2incPGUID11ftf1f21"21"10000100foobar ));
1016-
DESCR("");
1020+
DESCR("increment");
10171021
DATA(insertOID=768 (int4largerPGUID11ftf2f23"23 23"10000100foobar ));
10181022
DESCR("larger of two");
10191023
DATA(insertOID=769 (int4smallerPGUID11ftf2f23"23 23"10000100foobar ));
@@ -1153,9 +1157,9 @@ DESCR("multiply");
11531157
DATA(insertOID=897 (cash_div_flt8PGUID11ftf2f790"790 701"10000100foobar ));
11541158
DESCR("divide");
11551159
DATA(insertOID=898 (cashlargerPGUID11ftf2f790"790 790"10000100foobar ));
1156-
DESCR("");
1160+
DESCR("larger of two");
11571161
DATA(insertOID=899 (cashsmallerPGUID11ftf2f790"790 790"10000100foobar ));
1158-
DESCR("");
1162+
DESCR("smaller of two");
11591163

11601164
DATA(insertOID=919 (flt8_mul_cashPGUID11ftf2f790"701 790"10000100foobar ));
11611165
DESCR("multiply");
@@ -1352,9 +1356,9 @@ DESCR("not equal");
13521356
DATA(insertOID=1107 (time_cmpPGUID11ftf2f23"1083 1083"10000100foobar ));
13531357
DESCR("less-equal-greater");
13541358
DATA(insertOID=1138 (date_largerPGUID11ftf2f1082"1082 1082"10000100foobar ));
1355-
DESCR("");
1359+
DESCR("larger of two");
13561360
DATA(insertOID=1139 (date_smallerPGUID11ftf2f1082"1082 1082"10000100foobar ));
1357-
DESCR("");
1361+
DESCR("smaller of two");
13581362
DATA(insertOID=1140 (date_miPGUID11ftf2f23"1082 1082"10000100foobar ));
13591363
DESCR("subtract");
13601364
DATA(insertOID=1141 (date_pliPGUID11ftf2f1082"1082 23"10000100foobar ));
@@ -1457,13 +1461,13 @@ DESCR("convert");
14571461
DATA(insertOID=1194 (timespan_reltimePGUID11ftf1f703"1186"10000100foobar ));
14581462
DESCR("convert");
14591463
DATA(insertOID=1195 (datetime_smallerPGUID11ftf2f1184"1184 1184"10000100foobar ));
1460-
DESCR("");
1464+
DESCR("smaller of two");
14611465
DATA(insertOID=1196 (datetime_largerPGUID11ftf2f1184"1184 1184"10000100foobar ));
1462-
DESCR("");
1466+
DESCR("larger of two");
14631467
DATA(insertOID=1197 (timespan_smallerPGUID11ftf2f1186"1186 1186"10000100foobar ));
1464-
DESCR("");
1468+
DESCR("smaller of two");
14651469
DATA(insertOID=1198 (timespan_largerPGUID11ftf2f1186"1186 1186"10000100foobar ));
1466-
DESCR("");
1470+
DESCR("larger of two");
14671471
DATA(insertOID=1199 (datetime_agePGUID11ftf2f1186"1184 1184"10000100foobar ));
14681472
DESCR("date difference preserving months and years");
14691473

‎src/include/parser/parse_func.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*-------------------------------------------------------------------------
22
*
3-
*catalog_utils.h--
3+
*parse_func.h--
44
*
55
*
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: parse_func.h,v 1.12 1998/10/08 18:30:38 momjian Exp $
9+
* $Id: parse_func.h,v 1.13 1998/12/0806:18:27 thomas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -42,12 +42,14 @@ typedef struct _CandidateList
4242
struct_CandidateList*next;
4343
}*CandidateList;
4444

45-
externNode*ParseNestedFuncOrColumn(ParseState*pstate,Attr*attr,
45+
externNode*
46+
ParseNestedFuncOrColumn(ParseState*pstate,Attr*attr,
4647
int*curr_resno,intprecedence);
47-
externNode*ParseFuncOrColumn(ParseState*pstate,char*funcname,List*fargs,
48+
externNode*
49+
ParseFuncOrColumn(ParseState*pstate,char*funcname,List*fargs,
4850
int*curr_resno,intprecedence);
4951

5052
externvoid
51-
func_error(char*caller,char*funcname,intnargs,Oid*argtypes,char*msg);
53+
func_error(char*caller,char*funcname,intnargs,Oid*argtypes,char*msg);
5254

5355
#endif/* PARSE_FUNC_H */

‎src/include/utils/builtins.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.70 1998/11/17 14:36:37 thomas Exp $
9+
* $Id: builtins.h,v 1.71 1998/12/08 06:18:34 thomas Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -447,6 +447,8 @@ extern bool text_lt(text *arg1, text *arg2);
447447
externbooltext_le(text*arg1,text*arg2);
448448
externbooltext_gt(text*arg1,text*arg2);
449449
externbooltext_ge(text*arg1,text*arg2);
450+
externtext*text_larger(text*arg1,text*arg2);
451+
externtext*text_smaller(text*arg1,text*arg2);
450452
externint32textlen(text*arg);
451453
externint32textoctetlen(text*arg);
452454
externint32textpos(text*arg1,text*arg2);

0 commit comments

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