mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have crosstab variants treat NULL rowid as a category in its own right,

Browse Source 
per suggestion from Tom Lane. This fixes crash-bug reported by Stefan
Schwarzer.
This commit is contained in:
Joe Conway 2007-11-10 05:02:04 +00:00
parent a084d1f48f
commit 96365c7197
4 changed files with 139 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/tablefunc/data/ct.data
View File

@ -12,3 +12,7 @@
12 group2 test4 att1 val4 12 group2 test4 att1 val4
13 group2 test4 att2 val5 13 group2 test4 att2 val5
14 group2 test4 att3 val6 14 group2 test4 att3 val6
15 group1 \N att1 val9
16 group1 \N att2 val10
17 group1 \N att3 val11
18 group1 \N att4 val12

88
contrib/tablefunc/expected/tablefunc.out
View File

@ -23,42 +23,48 @@ SELECT * FROM crosstab2('SELECT rowid, attribute, val FROM ct where rowclass = '
----------+------------+------------ ----------+------------+------------
test1 | val2 | val3 test1 | val2 | val3
test2 | val6 | val7 test2 | val6 | val7
(2 rows) | val10 | val11
(3 rows)
SELECT * FROM crosstab3('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' and (attribute = ''att2'' or attribute = ''att3'') ORDER BY 1,2;'); SELECT * FROM crosstab3('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' and (attribute = ''att2'' or attribute = ''att3'') ORDER BY 1,2;');
row_name | category_1 | category_2 | category_3 row_name | category_1 | category_2 | category_3
----------+------------+------------+------------ ----------+------------+------------+------------
test1 | val2 | val3 | test1 | val2 | val3 |
test2 | val6 | val7 | test2 | val6 | val7 |
(2 rows) | val10 | val11 |
(3 rows)
SELECT * FROM crosstab4('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' and (attribute = ''att2'' or attribute = ''att3'') ORDER BY 1,2;'); SELECT * FROM crosstab4('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' and (attribute = ''att2'' or attribute = ''att3'') ORDER BY 1,2;');
row_name | category_1 | category_2 | category_3 | category_4 row_name | category_1 | category_2 | category_3 | category_4
----------+------------+------------+------------+------------ ----------+------------+------------+------------+------------
test1 | val2 | val3 | | test1 | val2 | val3 | |
test2 | val6 | val7 | | test2 | val6 | val7 | |
(2 rows) | val10 | val11 | |
(3 rows)
SELECT * FROM crosstab2('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;'); SELECT * FROM crosstab2('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;');
row_name | category_1 | category_2 row_name | category_1 | category_2
----------+------------+------------ ----------+------------+------------
test1 | val1 | val2 test1 | val1 | val2
test2 | val5 | val6 test2 | val5 | val6
(2 rows) | val9 | val10
(3 rows)
SELECT * FROM crosstab3('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;'); SELECT * FROM crosstab3('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;');
row_name | category_1 | category_2 | category_3 row_name | category_1 | category_2 | category_3
----------+------------+------------+------------ ----------+------------+------------+------------
test1 | val1 | val2 | val3 test1 | val1 | val2 | val3
test2 | val5 | val6 | val7 test2 | val5 | val6 | val7
(2 rows) | val9 | val10 | val11
(3 rows)
SELECT * FROM crosstab4('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;'); SELECT * FROM crosstab4('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;');
row_name | category_1 | category_2 | category_3 | category_4 row_name | category_1 | category_2 | category_3 | category_4
----------+------------+------------+------------+------------ ----------+------------+------------+------------+------------
test1 | val1 | val2 | val3 | val4 test1 | val1 | val2 | val3 | val4
test2 | val5 | val6 | val7 | val8 test2 | val5 | val6 | val7 | val8
(2 rows) | val9 | val10 | val11 | val12
(3 rows)
SELECT * FROM crosstab2('SELECT rowid, attribute, val FROM ct where rowclass = ''group2'' and (attribute = ''att1'' or attribute = ''att2'') ORDER BY 1,2;'); SELECT * FROM crosstab2('SELECT rowid, attribute, val FROM ct where rowclass = ''group2'' and (attribute = ''att1'' or attribute = ''att2'') ORDER BY 1,2;');
row_name | category_1 | category_2 row_name | category_1 | category_2
@ -103,25 +109,28 @@ SELECT * FROM crosstab4('SELECT rowid, attribute, val FROM ct where rowclass = '
(2 rows) (2 rows)
SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 2) AS c(rowid text, att1 text, att2 text); SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 2) AS c(rowid text, att1 text, att2 text);
rowid | att1 | att2 rowid | att1 | att2
-------+------+------ -------+------+-------
test1 | val1 | val2 test1 | val1 | val2
test2 | val5 | val6 test2 | val5 | val6
(2 rows) | val9 | val10
(3 rows)
SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 3) AS c(rowid text, att1 text, att2 text, att3 text); SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 3) AS c(rowid text, att1 text, att2 text, att3 text);
rowid | att1 | att2 | att3 rowid | att1 | att2 | att3
-------+------+------+------ -------+------+-------+-------
test1 | val1 | val2 | val3 test1 | val1 | val2 | val3
test2 | val5 | val6 | val7 test2 | val5 | val6 | val7
(2 rows) | val9 | val10 | val11
(3 rows)
SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 4) AS c(rowid text, att1 text, att2 text, att3 text, att4 text); SELECT * FROM crosstab('SELECT rowid, attribute, val FROM ct where rowclass = ''group1'' ORDER BY 1,2;', 4) AS c(rowid text, att1 text, att2 text, att3 text, att4 text);
rowid | att1 | att2 | att3 | att4 rowid | att1 | att2 | att3 | att4
-------+------+------+------+------ -------+------+-------+-------+-------
test1 | val1 | val2 | val3 | val4 test1 | val1 | val2 | val3 | val4
test2 | val5 | val6 | val7 | val8 test2 | val5 | val6 | val7 | val8
(2 rows) | val9 | val10 | val11 | val12
(3 rows)
-- --
-- hash based crosstab -- hash based crosstab
@ -137,38 +146,46 @@ insert into cth values(DEFAULT,'test2','02 March 2003','temperature','53');
insert into cth values(DEFAULT,'test2','02 March 2003','test_result','FAIL'); insert into cth values(DEFAULT,'test2','02 March 2003','test_result','FAIL');
insert into cth values(DEFAULT,'test2','02 March 2003','test_startdate','01 March 2003'); insert into cth values(DEFAULT,'test2','02 March 2003','test_startdate','01 March 2003');
insert into cth values(DEFAULT,'test2','02 March 2003','volts','3.1234'); insert into cth values(DEFAULT,'test2','02 March 2003','volts','3.1234');
-- next group tests for NULL rowids
insert into cth values(DEFAULT,NULL,'25 October 2007','temperature','57');
insert into cth values(DEFAULT,NULL,'25 October 2007','test_result','PASS');
insert into cth values(DEFAULT,NULL,'25 October 2007','test_startdate','24 October 2007');
insert into cth values(DEFAULT,NULL,'25 October 2007','volts','1.41234');
-- return attributes as plain text -- return attributes as plain text
SELECT * FROM crosstab( SELECT * FROM crosstab(
'SELECT rowid, rowdt, attribute, val FROM cth ORDER BY 1', 'SELECT rowid, rowdt, attribute, val FROM cth ORDER BY 1',
'SELECT DISTINCT attribute FROM cth ORDER BY 1') 'SELECT DISTINCT attribute FROM cth ORDER BY 1')
AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text); AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text);
rowid | rowdt | temperature | test_result | test_startdate | volts rowid | rowdt | temperature | test_result | test_startdate | volts
-------+--------------------------+-------------+-------------+----------------+-------- -------+--------------------------+-------------+-------------+-----------------+---------
test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS | | 2.6987 test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS | | 2.6987
test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | 01 March 2003 | 3.1234 test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | 01 March 2003 | 3.1234
(2 rows) | Thu Oct 25 00:00:00 2007 | 57 | PASS | 24 October 2007 | 1.41234
(3 rows)
-- this time without rowdt -- this time without rowdt
SELECT * FROM crosstab( SELECT * FROM crosstab(
'SELECT rowid, attribute, val FROM cth ORDER BY 1', 'SELECT rowid, attribute, val FROM cth ORDER BY 1',
'SELECT DISTINCT attribute FROM cth ORDER BY 1') 'SELECT DISTINCT attribute FROM cth ORDER BY 1')
AS c(rowid text, temperature text, test_result text, test_startdate text, volts text); AS c(rowid text, temperature text, test_result text, test_startdate text, volts text);
rowid | temperature | test_result | test_startdate | volts rowid | temperature | test_result | test_startdate | volts
-------+-------------+-------------+----------------+-------- -------+-------------+-------------+-----------------+---------
test1 | 42 | PASS | | 2.6987 test1 | 42 | PASS | | 2.6987
test2 | 53 | FAIL | 01 March 2003 | 3.1234 test2 | 53 | FAIL | 01 March 2003 | 3.1234
(2 rows) | 57 | PASS | 24 October 2007 | 1.41234
(3 rows)
-- convert attributes to specific datatypes -- convert attributes to specific datatypes
SELECT * FROM crosstab( SELECT * FROM crosstab(
'SELECT rowid, rowdt, attribute, val FROM cth ORDER BY 1', 'SELECT rowid, rowdt, attribute, val FROM cth ORDER BY 1',
'SELECT DISTINCT attribute FROM cth ORDER BY 1') 'SELECT DISTINCT attribute FROM cth ORDER BY 1')
AS c(rowid text, rowdt timestamp, temperature int4, test_result text, test_startdate timestamp, volts float8); AS c(rowid text, rowdt timestamp, temperature int4, test_result text, test_startdate timestamp, volts float8);
rowid | rowdt | temperature | test_result | test_startdate | volts rowid | rowdt | temperature | test_result | test_startdate | volts
-------+--------------------------+-------------+-------------+--------------------------+-------- -------+--------------------------+-------------+-------------+--------------------------+---------
test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS | | 2.6987 test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS | | 2.6987
test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | Sat Mar 01 00:00:00 2003 | 3.1234 test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | Sat Mar 01 00:00:00 2003 | 3.1234
(2 rows) | Thu Oct 25 00:00:00 2007 | 57 | PASS | Wed Oct 24 00:00:00 2007 | 1.41234
(3 rows)
-- source query and category query out of sync -- source query and category query out of sync
SELECT * FROM crosstab( SELECT * FROM crosstab(
@ -179,7 +196,8 @@ AS c(rowid text, rowdt timestamp, temperature int4, test_result text, test_start
-------+--------------------------+-------------+-------------+-------------------------- -------+--------------------------+-------------+-------------+--------------------------
test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS | test1 | Sat Mar 01 00:00:00 2003 | 42 | PASS |
test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | Sat Mar 01 00:00:00 2003 test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | Sat Mar 01 00:00:00 2003
(2 rows) | Thu Oct 25 00:00:00 2007 | 57 | PASS | Wed Oct 24 00:00:00 2007
(3 rows)
-- if category query generates no rows, get expected error -- if category query generates no rows, get expected error
SELECT * FROM crosstab( SELECT * FROM crosstab(

5
contrib/tablefunc/sql/tablefunc.sql
View File

@ -51,6 +51,11 @@ insert into cth values(DEFAULT,'test2','02 March 2003','temperature','53');
insert into cth values(DEFAULT,'test2','02 March 2003','test_result','FAIL'); insert into cth values(DEFAULT,'test2','02 March 2003','test_result','FAIL');
insert into cth values(DEFAULT,'test2','02 March 2003','test_startdate','01 March 2003'); insert into cth values(DEFAULT,'test2','02 March 2003','test_startdate','01 March 2003');
insert into cth values(DEFAULT,'test2','02 March 2003','volts','3.1234'); insert into cth values(DEFAULT,'test2','02 March 2003','volts','3.1234');
-- next group tests for NULL rowids
insert into cth values(DEFAULT,NULL,'25 October 2007','temperature','57');
insert into cth values(DEFAULT,NULL,'25 October 2007','test_result','PASS');
insert into cth values(DEFAULT,NULL,'25 October 2007','test_startdate','24 October 2007');
insert into cth values(DEFAULT,NULL,'25 October 2007','volts','1.41234');
-- return attributes as plain text -- return attributes as plain text
SELECT * FROM crosstab( SELECT * FROM crosstab(

138
contrib/tablefunc/tablefunc.c
View File

@ -106,6 +106,18 @@ typedef struct
} \ } \
} while (0) } while (0)
#define xpstrdup(tgtvar_, srcvar_) \
do { \
if (srcvar_) \
tgtvar_ = pstrdup(srcvar_); \
else \
tgtvar_ = NULL; \
} while (0)
#define xstreq(tgtvar_, srcvar_) \
(((tgtvar_ == NULL) && (srcvar_ == NULL)) || \
((tgtvar_ != NULL) && (srcvar_ != NULL) && (strcmp(tgtvar_, srcvar_) == 0)))
/* sign, 10 digits, '\0' */ /* sign, 10 digits, '\0' */
#define INT32_STRLEN 12 #define INT32_STRLEN 12
@ -358,6 +370,7 @@ crosstab(PG_FUNCTION_ARGS)
crosstab_fctx *fctx; crosstab_fctx *fctx;
int i; int i;
int num_categories; int num_categories;
bool firstpass = false;
MemoryContext oldcontext; MemoryContext oldcontext;
/* stuff done only on the first call of the function */ /* stuff done only on the first call of the function */
@ -481,6 +494,7 @@ crosstab(PG_FUNCTION_ARGS)
funcctx->max_calls = proc; funcctx->max_calls = proc;
MemoryContextSwitchTo(oldcontext); MemoryContextSwitchTo(oldcontext);
firstpass = true;
} }
/* stuff done on every call of the function */ /* stuff done on every call of the function */
@ -512,7 +526,7 @@ crosstab(PG_FUNCTION_ARGS)
HeapTuple tuple; HeapTuple tuple;
Datum result; Datum result;
char **values; char **values;
bool allnulls = true; bool skip_tuple = false;
while (true) while (true)
{ {
@ -543,35 +557,42 @@ crosstab(PG_FUNCTION_ARGS)
/* /*
* If this is the first pass through the values for this * If this is the first pass through the values for this
* rowid set it, otherwise make sure it hasn't changed on * rowid, set the first column to rowid
* us. Also check to see if the rowid is the same as that
* of the last tuple sent -- if so, skip this tuple
* entirely
*/ */
if (i == 0) if (i == 0)
values[0] = pstrdup(rowid);
if ((rowid != NULL) && (strcmp(rowid, values[0]) == 0))
{ {
if ((lastrowid != NULL) && (strcmp(rowid, lastrowid) == 0)) xpstrdup(values[0], rowid);
break;
else if (allnulls == true)
allnulls = false;
/* /*
* Get the next category item value, which is alway * Check to see if the rowid is the same as that of the last
* tuple sent -- if so, skip this tuple entirely
*/
if (!firstpass && xstreq(lastrowid, rowid))
{
skip_tuple = true;
break;
}
}
/*
* If rowid hasn't changed on us, continue building the
* ouput tuple.
*/
if (xstreq(rowid, values[0]))
{
/*
* Get the next category item value, which is always
* attribute number three. * attribute number three.
* *
* Be careful to sssign the value to the array index * Be careful to assign the value to the array index based
* based on which category we are presently * on which category we are presently processing.
* processing.
*/ */
values[1 + i] = SPI_getvalue(spi_tuple, spi_tupdesc, 3); values[1 + i] = SPI_getvalue(spi_tuple, spi_tupdesc, 3);
/* /*
* increment the counter since we consume a row for * increment the counter since we consume a row for each
* each category, but not for last pass because the * category, but not for last pass because the API will do
* API will do that for us * that for us
*/ */
if (i < (num_categories - 1)) if (i < (num_categories - 1))
call_cntr = ++funcctx->call_cntr; call_cntr = ++funcctx->call_cntr;
@ -579,33 +600,29 @@ crosstab(PG_FUNCTION_ARGS)
else else
{ {
/* /*
* We'll fill in NULLs for the missing values, but we * We'll fill in NULLs for the missing values, but we need
* need to decrement the counter since this sql result * to decrement the counter since this sql result row
* row doesn't belong to the current output tuple. * doesn't belong to the current output tuple.
*/ */
call_cntr = --funcctx->call_cntr; call_cntr = --funcctx->call_cntr;
break; break;
} }
xpfree(rowid);
if (rowid != NULL)
xpfree(rowid);
} }
/*
* switch to memory context appropriate for multiple function
* calls
*/
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
xpfree(fctx->lastrowid); xpfree(fctx->lastrowid);
xpstrdup(fctx->lastrowid, values[0]);
lastrowid = fctx->lastrowid;
if (values[0] != NULL) MemoryContextSwitchTo(oldcontext);
{
/*
* switch to memory context appropriate for multiple
* function calls
*/
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
lastrowid = fctx->lastrowid = pstrdup(values[0]); if (!skip_tuple)
MemoryContextSwitchTo(oldcontext);
}
if (!allnulls)
{ {
/* build the tuple */ /* build the tuple */
tuple = BuildTupleFromCStrings(attinmeta, values); tuple = BuildTupleFromCStrings(attinmeta, values);
@ -624,8 +641,8 @@ crosstab(PG_FUNCTION_ARGS)
else else
{ {
/* /*
* Skipping this tuple entirely, but we need to advance * Skipping this tuple entirely, but we need to advance the
* the counter like the API would if we had returned one. * counter like the API would if we had returned one.
*/ */
call_cntr = ++funcctx->call_cntr; call_cntr = ++funcctx->call_cntr;
@ -639,11 +656,14 @@ crosstab(PG_FUNCTION_ARGS)
SPI_finish(); SPI_finish();
SRF_RETURN_DONE(funcctx); SRF_RETURN_DONE(funcctx);
} }
/* need to reset this before the next tuple is started */
skip_tuple = false;
} }
} }
} }
else else
/* do when there is no more left */ /* do when there is no more left */
{ {
/* release SPI related resources */ /* release SPI related resources */
SPI_finish(); SPI_finish();
@ -866,6 +886,7 @@ get_crosstab_tuplestore(char *sql,
int ncols = spi_tupdesc->natts; int ncols = spi_tupdesc->natts;
char *rowid; char *rowid;
char *lastrowid = NULL; char *lastrowid = NULL;
bool firstpass = true;
int i, int i,
j; j;
int result_ncols; int result_ncols;
@ -930,41 +951,36 @@ get_crosstab_tuplestore(char *sql,
/* get the rowid from the current sql result tuple */ /* get the rowid from the current sql result tuple */
rowid = SPI_getvalue(spi_tuple, spi_tupdesc, 1); rowid = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
/* if rowid is null, skip this tuple entirely */
if (rowid == NULL)
continue;
/* /*
* if we're on a new output row, grab the column values up to * if we're on a new output row, grab the column values up to
* column N-2 now * column N-2 now
*/ */
if ((lastrowid == NULL) || (strcmp(rowid, lastrowid) != 0)) if (firstpass || !xstreq(lastrowid, rowid))
{ {
/* /*
* a new row means we need to flush the old one first, * a new row means we need to flush the old one first, unless
* unless we're on the very first row * we're on the very first row
*/ */
if (lastrowid != NULL) if (!firstpass)
{ {
/*
* switch to appropriate context while storing the
* tuple
*/
SPIcontext = MemoryContextSwitchTo(per_query_ctx);
/* rowid changed, flush the previous output row */ /* rowid changed, flush the previous output row */
tuple = BuildTupleFromCStrings(attinmeta, values); tuple = BuildTupleFromCStrings(attinmeta, values);
/* switch to appropriate context while storing the tuple */
SPIcontext = MemoryContextSwitchTo(per_query_ctx);
tuplestore_puttuple(tupstore, tuple); tuplestore_puttuple(tupstore, tuple);
MemoryContextSwitchTo(SPIcontext);
for (j = 0; j < result_ncols; j++) for (j = 0; j < result_ncols; j++)
xpfree(values[j]); xpfree(values[j]);
/* now reset the context */
MemoryContextSwitchTo(SPIcontext);
} }
values[0] = rowid; values[0] = rowid;
for (j = 1; j < ncols - 2; j++) for (j = 1; j < ncols - 2; j++)
values[j] = SPI_getvalue(spi_tuple, spi_tupdesc, j + 1); values[j] = SPI_getvalue(spi_tuple, spi_tupdesc, j + 1);
/* we're no longer on the first pass */
firstpass = false;
} }
/* look up the category and fill in the appropriate column */ /* look up the category and fill in the appropriate column */
@ -980,7 +996,7 @@ get_crosstab_tuplestore(char *sql,
} }
xpfree(lastrowid); xpfree(lastrowid);
lastrowid = pstrdup(rowid); xpstrdup(lastrowid, rowid);
} }
/* switch to appropriate context while storing the tuple */ /* switch to appropriate context while storing the tuple */
@ -988,11 +1004,11 @@ get_crosstab_tuplestore(char *sql,
/* flush the last output row */ /* flush the last output row */
tuple = BuildTupleFromCStrings(attinmeta, values); tuple = BuildTupleFromCStrings(attinmeta, values);
/* switch to appropriate context while storing the tuple */
SPIcontext = MemoryContextSwitchTo(per_query_ctx);
tuplestore_puttuple(tupstore, tuple); tuplestore_puttuple(tupstore, tuple);
/* now reset the context */
MemoryContextSwitchTo(SPIcontext); MemoryContextSwitchTo(SPIcontext);
} }
if (SPI_finish() != SPI_OK_FINISH) if (SPI_finish() != SPI_OK_FINISH)