Kouhei Sutou
null+****@clear*****
Thu Jan 22 23:06:04 JST 2015
Kouhei Sutou 2015-01-22 23:06:04 +0900 (Thu, 22 Jan 2015) New Revision: 3ea7eafd958d3bdb26bf27ca0cb7b80c6d44214b https://github.com/pgroonga/pgroonga/commit/3ea7eafd958d3bdb26bf27ca0cb7b80c6d44214b Message: Remove "s" from "contains" Modified files: pgroonga--0.2.0.sql pgroonga.c pgroonga.h Modified: pgroonga--0.2.0.sql (+6 -6) =================================================================== --- pgroonga--0.2.0.sql 2015-01-22 23:04:39 +0900 (b38d6e6) +++ pgroonga--0.2.0.sql 2015-01-22 23:06:04 +0900 (4cf9f12) @@ -2,28 +2,28 @@ SET search_path = public; CREATE SCHEMA pgroonga; -CREATE FUNCTION pgroonga.contains(text, text) +CREATE FUNCTION pgroonga.contain(text, text) RETURNS bool - AS 'MODULE_PATHNAME', 'pgroonga_contains_text' + AS 'MODULE_PATHNAME', 'pgroonga_contain_text' LANGUAGE C IMMUTABLE STRICT; -CREATE FUNCTION pgroonga.contains(bpchar, bpchar) +CREATE FUNCTION pgroonga.contain(bpchar, bpchar) RETURNS bool - AS 'MODULE_PATHNAME', 'pgroonga_contains_bpchar' + AS 'MODULE_PATHNAME', 'pgroonga_contain_bpchar' LANGUAGE C IMMUTABLE STRICT; CREATE OPERATOR %% ( - PROCEDURE = pgroonga.contains, + PROCEDURE = pgroonga.contain, LEFTARG = text, RIGHTARG = text ); CREATE OPERATOR %% ( - PROCEDURE = pgroonga.contains, + PROCEDURE = pgroonga.contain, LEFTARG = bpchar, RIGHTARG = bpchar ); Modified: pgroonga.c (+12 -12) =================================================================== --- pgroonga.c 2015-01-22 23:04:39 +0900 (b244013) +++ pgroonga.c 2015-01-22 23:06:04 +0900 (080ef12) @@ -40,8 +40,8 @@ typedef struct GrnScanOpaqueData typedef GrnScanOpaqueData *GrnScanOpaque; -PG_FUNCTION_INFO_V1(pgroonga_contains_text); -PG_FUNCTION_INFO_V1(pgroonga_contains_bpchar); +PG_FUNCTION_INFO_V1(pgroonga_contain_text); +PG_FUNCTION_INFO_V1(pgroonga_contain_bpchar); PG_FUNCTION_INFO_V1(pgroonga_insert); PG_FUNCTION_INFO_V1(pgroonga_beginscan); @@ -434,8 +434,8 @@ GrnUnlock(Relation index, LOCKMODE mode) } static grn_bool -pgroonga_contains_raw(const char *text, unsigned int text_size, - const char *key, unsigned int key_size) +pgroonga_contain_raw(const char *text, unsigned int text_size, + const char *key, unsigned int key_size) { grn_bool contained = GRN_FALSE; grn_obj buffer; @@ -471,33 +471,33 @@ exit: } /** - * pgroonga.contains(doc text, key text) : bool + * pgroonga.contain(doc text, key text) : bool */ Datum -pgroonga_contains_text(PG_FUNCTION_ARGS) +pgroonga_contain_text(PG_FUNCTION_ARGS) { text *doc = PG_GETARG_TEXT_PP(0); text *key = PG_GETARG_TEXT_PP(1); grn_bool contained; - contained = pgroonga_contains_raw(VARDATA_ANY(doc), VARSIZE_ANY_EXHDR(doc), - VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key)); + contained = pgroonga_contain_raw(VARDATA_ANY(doc), VARSIZE_ANY_EXHDR(doc), + VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key)); PG_RETURN_BOOL(contained); } /** - * pgroonga.contains(doc bpchar, key bpchar) : bool + * pgroonga.contain(doc bpchar, key bpchar) : bool */ Datum -pgroonga_contains_bpchar(PG_FUNCTION_ARGS) +pgroonga_contain_bpchar(PG_FUNCTION_ARGS) { BpChar *doc = PG_GETARG_BPCHAR_PP(0); BpChar *key = PG_GETARG_BPCHAR_PP(1); grn_bool contained; contained = - pgroonga_contains_raw(VARDATA_ANY(doc), pgroonga_bpchar_size(doc), - VARDATA_ANY(key), pgroonga_bpchar_size(key)); + pgroonga_contain_raw(VARDATA_ANY(doc), pgroonga_bpchar_size(doc), + VARDATA_ANY(key), pgroonga_bpchar_size(key)); PG_RETURN_BOOL(contained); } Modified: pgroonga.h (+2 -2) =================================================================== --- pgroonga.h 2015-01-22 23:04:39 +0900 (d7e3315) +++ pgroonga.h 2015-01-22 23:06:04 +0900 (9d1921d) @@ -36,8 +36,8 @@ /* in pgroonga.c */ extern void PGDLLEXPORT _PG_init(void); -extern Datum PGDLLEXPORT pgroonga_contains_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_contains_bpchar(PG_FUNCTION_ARGS); +extern Datum PGDLLEXPORT pgroonga_contain_text(PG_FUNCTION_ARGS); +extern Datum PGDLLEXPORT pgroonga_contain_bpchar(PG_FUNCTION_ARGS); extern Datum PGDLLEXPORT pgroonga_match(PG_FUNCTION_ARGS); extern Datum PGDLLEXPORT pgroonga_insert(PG_FUNCTION_ARGS); -------------- next part -------------- HTML����������������������������...Download