database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Rename tsvector delete() to ts_delete(), and filter() to ts_filter().

Browse Source 
The similarity of the original names to SQL keywords seems like a bad
idea.  Rename them before we're stuck with 'em forever.

In passing, minor code and docs cleanup.

Discussion: <4875.1462210058@sss.pgh.pa.us>
This commit is contained in:
Tom Lane
2016-05-05 19:43:32 -04:00
parent 2f38b986fa
commit 0b9a234432
7 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/utils/adt/tsvector_op.c
View File

@ -506,7 +506,7 @@ tsvector_delete_by_indices(TSVector tsv, int *indices_to_delete,
/*
* Delete given lexeme from tsvector.
* Implementation of user-level delete(tsvector, text).
* Implementation of user-level ts_delete(tsvector, text).
*/
Datum
tsvector_delete_str(PG_FUNCTION_ARGS)
@ -530,7 +530,7 @@ tsvector_delete_str(PG_FUNCTION_ARGS)
/*
* Delete given array of lexemes from tsvector.
* Implementation of user-level delete(tsvector, text[]).
* Implementation of user-level ts_delete(tsvector, text[]).
*/
Datum
tsvector_delete_arr(PG_FUNCTION_ARGS)
@ -757,7 +757,7 @@ array_to_tsvector(PG_FUNCTION_ARGS)
}
/*
* Leave only elements with given weights from tsvector.
* ts_filter(): keep only lexemes with given weights in tsvector.
*/
Datum
tsvector_filter(PG_FUNCTION_ARGS)
@ -771,15 +771,15 @@ tsvector_filter(PG_FUNCTION_ARGS)
*dataout;
Datum *dweights;
bool *nulls;
int nweigths;
int nweights;
int i, j;
int cur_pos = 0;
char mask = 0;
deconstruct_array(weights, CHAROID, 1, true, 'c',
&dweights, &nulls, &nweigths);
&dweights, &nulls, &nweights);
for (i = 0; i < nweigths; i++)
for (i = 0; i < nweights; i++)
{
char char_weight;
@ -804,8 +804,9 @@ tsvector_filter(PG_FUNCTION_ARGS)
mask = mask | 1;
break;
default:
/* internal error */
elog(ERROR, "unrecognized weight: %c", char_weight);
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized weight: \"%c\"", char_weight)));
}
}