Commit c6c458e2 authored by Teodor Sigaev's avatar Teodor Sigaev

Resort tsvector's lexemes in tsvectorrecv instead of emmiting an error.

Basically, it's needed to support binary dump from 8.3 because ordering rule
was changed.

Per discussion with Bruce.
parent ab9981cc
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.16 2009/05/21 12:54:27 meskes Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.17 2009/05/21 20:09:36 teodor Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -451,6 +451,7 @@ tsvectorrecv(PG_FUNCTION_ARGS) ...@@ -451,6 +451,7 @@ tsvectorrecv(PG_FUNCTION_ARGS)
* WordEntries */ * WordEntries */
Size hdrlen; Size hdrlen;
Size len; /* allocated size of vec */ Size len; /* allocated size of vec */
bool needSort = false;
nentries = pq_getmsgint(buf, sizeof(int32)); nentries = pq_getmsgint(buf, sizeof(int32));
if (nentries < 0 || nentries > (MaxAllocSize / sizeof(WordEntry))) if (nentries < 0 || nentries > (MaxAllocSize / sizeof(WordEntry)))
...@@ -507,7 +508,7 @@ tsvectorrecv(PG_FUNCTION_ARGS) ...@@ -507,7 +508,7 @@ tsvectorrecv(PG_FUNCTION_ARGS)
if (i > 0 && WordEntryCMP(&vec->entries[i], if (i > 0 && WordEntryCMP(&vec->entries[i],
&vec->entries[i - 1], &vec->entries[i - 1],
STRPTR(vec)) <= 0) STRPTR(vec)) <= 0)
elog(ERROR, "lexemes are misordered"); needSort = true;
/* Receive positions */ /* Receive positions */
if (npos > 0) if (npos > 0)
...@@ -542,5 +543,9 @@ tsvectorrecv(PG_FUNCTION_ARGS) ...@@ -542,5 +543,9 @@ tsvectorrecv(PG_FUNCTION_ARGS)
SET_VARSIZE(vec, hdrlen + datalen); SET_VARSIZE(vec, hdrlen + datalen);
if (needSort)
qsort_arg((void *) ARRPTR(vec), vec->size, sizeof(WordEntry),
compareentry, (void*)STRPTR(vec));
PG_RETURN_TSVECTOR(vec); PG_RETURN_TSVECTOR(vec);
} }
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