Kouhei Sutou
null+****@clear*****
Mon May 1 20:30:09 JST 2017
Kouhei Sutou 2017-05-01 20:30:09 +0900 (Mon, 01 May 2017) New Revision: ceb8f4c34c62be308dbc9dc2556d3e2cccc921f4 https://github.com/pgroonga/pgroonga/commit/ceb8f4c34c62be308dbc9dc2556d3e2cccc921f4 Message: Remove needless "_contain" from function names of &^> and &^~> Modified files: data/pgroonga--1.2.0--1.2.1.sql data/pgroonga.sql src/pgroonga.c Modified: data/pgroonga--1.2.0--1.2.1.sql (+43 -0) =================================================================== --- data/pgroonga--1.2.0--1.2.1.sql 2017-05-01 19:28:50 +0900 (c48c249) +++ data/pgroonga--1.2.0--1.2.1.sql 2017-05-01 20:30:09 +0900 (44f0cd4) @@ -1,4 +1,47 @@ +-- Add v1 compatible operators to full text search ops for text ALTER OPERATOR FAMILY pgroonga.text_full_text_search_ops_v2 USING pgroonga ADD OPERATOR 8 %% (text, text), OPERATOR 9 @@ (text, text); + +-- Remove "_contain" from function names of &^> and &^~>. +DROP OPERATOR CLASS pgroonga.text_array_term_search_ops_v2 USING pgroonga; + +DROP OPERATOR &^> (text[], text); + +DROP FUNCTION pgroonga.prefix_contain_text_array(text[], text); + +CREATE FUNCTION pgroonga.prefix_text_array(text[], text) + RETURNS bool + AS 'MODULE_PATHNAME', 'pgroonga_prefix_text_array' + LANGUAGE C + IMMUTABLE + STRICT; + +CREATE OPERATOR &^> ( + PROCEDURE = pgroonga.prefix_text_array, + LEFTARG = text[], + RIGHTARG = text +); + +DROP OPERATOR &^~> (text[], text); + +DROP FUNCTION pgroonga.prefix_rk_contain_text_array(text[], text); + +CREATE FUNCTION pgroonga.prefix_rk_text_array(text[], text) + RETURNS bool + AS 'MODULE_PATHNAME', 'pgroonga_prefix_rk_text_array' + LANGUAGE C + IMMUTABLE + STRICT; + +CREATE OPERATOR &^~> ( + PROCEDURE = pgroonga.prefix_rk_text_array, + LEFTARG = text[], + RIGHTARG = text +); + +CREATE OPERATOR CLASS pgroonga.text_array_term_search_ops_v2 FOR TYPE text[] + USING pgroonga AS + OPERATOR 20 &^> (text[], text), + OPERATOR 21 &^~> (text[], text); Modified: data/pgroonga.sql (+6 -6) =================================================================== --- data/pgroonga.sql 2017-05-01 19:28:50 +0900 (8f0a0c8) +++ data/pgroonga.sql 2017-05-01 20:30:09 +0900 (94997f3) @@ -383,28 +383,28 @@ CREATE OPERATOR &?> ( RIGHTARG = text[] ); -CREATE FUNCTION pgroonga.prefix_contain_text_array(text[], text) +CREATE FUNCTION pgroonga.prefix_text_array(text[], text) RETURNS bool - AS 'MODULE_PATHNAME', 'pgroonga_prefix_contain_text_array' + AS 'MODULE_PATHNAME', 'pgroonga_prefix_text_array' LANGUAGE C IMMUTABLE STRICT; CREATE OPERATOR &^> ( - PROCEDURE = pgroonga.prefix_contain_text_array, + PROCEDURE = pgroonga.prefix_text_array, LEFTARG = text[], RIGHTARG = text ); -CREATE FUNCTION pgroonga.prefix_rk_contain_text_array(text[], text) +CREATE FUNCTION pgroonga.prefix_rk_text_array(text[], text) RETURNS bool - AS 'MODULE_PATHNAME', 'pgroonga_prefix_rk_contain_text_array' + AS 'MODULE_PATHNAME', 'pgroonga_prefix_rk_text_array' LANGUAGE C IMMUTABLE STRICT; CREATE OPERATOR &^~> ( - PROCEDURE = pgroonga.prefix_rk_contain_text_array, + PROCEDURE = pgroonga.prefix_rk_text_array, LEFTARG = text[], RIGHTARG = text ); Modified: src/pgroonga.c (+28 -4) =================================================================== --- src/pgroonga.c 2017-05-01 19:28:50 +0900 (0490fba) +++ src/pgroonga.c 2017-05-01 20:30:09 +0900 (2e5c6ab) @@ -160,7 +160,9 @@ PGRN_FUNCTION_INFO_V1(pgroonga_prefix_text); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_text); PGRN_FUNCTION_INFO_V1(pgroonga_match_contain_text); PGRN_FUNCTION_INFO_V1(pgroonga_query_contain_text); +PGRN_FUNCTION_INFO_V1(pgroonga_prefix_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_contain_text_array); +PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_prefix_rk_contain_text_array); PGRN_FUNCTION_INFO_V1(pgroonga_insert); @@ -1995,10 +1997,10 @@ pgroonga_query_contain_text(PG_FUNCTION_ARGS) } /** - * pgroonga.prefix_contain_text_array(targets text[], prefix text) : bool + * pgroonga.prefix_text_array(targets text[], prefix text) : bool */ Datum -pgroonga_prefix_contain_text_array(PG_FUNCTION_ARGS) +pgroonga_prefix_text_array(PG_FUNCTION_ARGS) { ArrayType *targets = PG_GETARG_ARRAYTYPE_P(0); text *prefix = PG_GETARG_TEXT_PP(1); @@ -2032,10 +2034,21 @@ pgroonga_prefix_contain_text_array(PG_FUNCTION_ARGS) } /** - * pgroonga.prefix_rk_contain_text_array(targets text[], prefix text) : bool + * pgroonga.prefix_contain_text_array(targets text[], prefix text) : bool + * + * It's deprecated since 1.2.1. Just for backward compatibility. */ Datum -pgroonga_prefix_rk_contain_text_array(PG_FUNCTION_ARGS) +pgroonga_prefix_contain_text_array(PG_FUNCTION_ARGS) +{ + return pgroonga_prefix_text_array(fcinfo); +} + +/** + * pgroonga.prefix_rk_text_array(targets text[], prefix text) : bool + */ +Datum +pgroonga_prefix_rk_text_array(PG_FUNCTION_ARGS) { ArrayType *targets = PG_GETARG_ARRAYTYPE_P(0); text *prefix = PG_GETARG_TEXT_PP(1); @@ -2067,6 +2080,17 @@ pgroonga_prefix_rk_contain_text_array(PG_FUNCTION_ARGS) PG_RETURN_BOOL(matched); } +/** + * pgroonga.prefix_rk_contain_text_array(targets text[], prefix text) : bool + * + * It's deprecated since 1.2.1. Just for backward compatibility. + */ +Datum +pgroonga_prefix_rk_contain_text_array(PG_FUNCTION_ARGS) +{ + return pgroonga_prefix_rk_contain_text_array(fcinfo); +} + static bool PGrnNeedMaxRecordSizeUpdate(Relation index) { -------------- next part -------------- HTML����������������������������...ダウンロード
