Commit a93b3b98 authored by Heikki Linnakangas's avatar Heikki Linnakangas

Fix bug in the tsvector stats collection function, which caused a crash if

the sample contains just a one tsvector, containing only one lexeme.
parent fb645f64
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/ts_typanalyze.c,v 1.2 2008/09/19 19:03:40 tgl Exp $ * $PostgreSQL: pgsql/src/backend/tsearch/ts_typanalyze.c,v 1.3 2008/11/27 21:17:39 heikki Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -290,33 +290,34 @@ compute_tsvector_stats(VacAttrStats *stats, ...@@ -290,33 +290,34 @@ compute_tsvector_stats(VacAttrStats *stats,
if (num_mcelem > track_len) if (num_mcelem > track_len)
num_mcelem = track_len; num_mcelem = track_len;
/* Generate MCELEM slot entry */
if (num_mcelem > 0)
{
MemoryContext old_context;
Datum *mcelem_values;
float4 *mcelem_freqs;
/* Grab the minimal and maximal frequencies that will get stored */ /* Grab the minimal and maximal frequencies that will get stored */
minfreq = sort_table[num_mcelem - 1]->frequency; minfreq = sort_table[num_mcelem - 1]->frequency;
maxfreq = sort_table[0]->frequency; maxfreq = sort_table[0]->frequency;
/* /*
* We want to store statistics sorted on the lexeme value using first * We want to store statistics sorted on the lexeme value using
* length, then byte-for-byte comparison. The reason for doing length * first length, then byte-for-byte comparison. The reason for
* comparison first is that we don't care about the ordering so long * doing length comparison first is that we don't care about the
* as it's consistent, and comparing lengths first gives us a chance * ordering so long as it's consistent, and comparing lengths first
* to avoid a strncmp() call. * gives us a chance to avoid a strncmp() call.
* *
* This is different from what we do with scalar statistics -- they get * This is different from what we do with scalar statistics -- they
* sorted on frequencies. The rationale is that we usually search * get sorted on frequencies. The rationale is that we usually
* through most common elements looking for a specific value, so we can * search through most common elements looking for a specific
* grab its frequency. When values are presorted we can employ binary * value, so we can grab its frequency. When values are presorted
* search for that. See ts_selfuncs.c for a real usage scenario. * we can employ binary search for that. See ts_selfuncs.c for a
* real usage scenario.
*/ */
qsort(sort_table, num_mcelem, sizeof(TrackItem *), qsort(sort_table, num_mcelem, sizeof(TrackItem *),
trackitem_compare_lexemes); trackitem_compare_lexemes);
/* Generate MCELEM slot entry */
if (num_mcelem > 0)
{
MemoryContext old_context;
Datum *mcelem_values;
float4 *mcelem_freqs;
/* Must copy the target values into anl_context */ /* Must copy the target values into anl_context */
old_context = MemoryContextSwitchTo(stats->anl_context); old_context = MemoryContextSwitchTo(stats->anl_context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment