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

Fix memory arrangement of tsquery after removing stop words. It causes

Browse Source 
a unused memory holes in tsquery.

Per report by Richard Huxton <dev@archonet.com>.

It was working well because in fact tsquery->size is not used for any
kind of operation except comparing tsqueries. So, in HEAD it's enough to
fix to_tsquery function, but for previous version it's needed to
remove optimization in CompareTSQ to prevent requirement of renew all
stored tsquery.
This commit is contained in:
Teodor Sigaev 2008-03-07 14:30:20 +00:00
parent 588d213a92
commit 3b8bca335d
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/tsearch/to_tsany.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.9 2008/03/05 15:50:37 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.10 2008/03/07 14:30:20 teodor Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -350,6 +350,18 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(query); PG_RETURN_POINTER(query);
} }
memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem)); memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem));
if ( len != query->size ) {
char *oldoperand = GETOPERAND(query);
int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query);
Assert( len < query->size );
query->size = len;
memcpy((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char*)query) );
SET_VARSIZE(query, COMPUTESIZE( len, lenoperand ));
}
pfree(res); pfree(res);
PG_RETURN_TSQUERY(query); PG_RETURN_TSQUERY(query);
} }
@ -388,6 +400,18 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(query); PG_RETURN_POINTER(query);
} }
memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem)); memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem));
if ( len != query->size ) {
char *oldoperand = GETOPERAND(query);
int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query);
Assert( len < query->size );
query->size = len;
memcpy((void *) GETOPERAND(query), oldoperand, lenoperand );
SET_VARSIZE(query, COMPUTESIZE( len, lenoperand ));
}
pfree(res); pfree(res);
PG_RETURN_POINTER(query); PG_RETURN_POINTER(query);
} }