mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Back-patch today's memory management fixups in contrib/xml2.
Prior to 8.3, these changes are not critical for compatibility with core Postgres, since core had no libxml2 calls then. However there is still a risk if contrib/xml2 is used along with libxml2 functionality in Perl or other loadable modules. So back-patch to all versions. Also back-patch addition of regression tests. I'm not sure how many of the cases are interesting without the interaction with core xml code, but a silly regression test is still better than none at all.
This commit is contained in:
Tom Lane
@ -16,28 +16,7 @@
|
||||
#include <libxml/xmlerror.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
|
||||
/* declarations */
|
||||
|
||||
static void *pgxml_palloc(size_t size);
|
||||
static void *pgxml_repalloc(void *ptr, size_t size);
|
||||
static void pgxml_pfree(void *ptr);
|
||||
static char *pgxml_pstrdup(const char *string);
|
||||
static void pgxml_errorHandler(void *ctxt, const char *msg,...);
|
||||
|
||||
void elog_error(int level, char *explain, int force);
|
||||
void pgxml_parser_init(void);
|
||||
|
||||
static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
xmlChar * toptagname, xmlChar * septagname,
|
||||
xmlChar * plainsep);
|
||||
|
||||
text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar * toptag,
|
||||
xmlChar * septag, xmlChar * plainsep);
|
||||
|
||||
xmlChar *pgxml_texttoxmlchar(text *textstring);
|
||||
|
||||
static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar * xpath);
|
||||
|
||||
/* externally accessible functions */
|
||||
|
||||
Datum xml_valid(PG_FUNCTION_ARGS);
|
||||
Datum xml_encode_special_chars(PG_FUNCTION_ARGS);
|
||||
@ -48,116 +27,100 @@ Datum xpath_bool(PG_FUNCTION_ARGS);
|
||||
Datum xpath_list(PG_FUNCTION_ARGS);
|
||||
Datum xpath_table(PG_FUNCTION_ARGS);
|
||||
|
||||
/* these are exported for use by xslt_proc.c */
|
||||
|
||||
void elog_error(const char *explain, bool force);
|
||||
void pgxml_parser_init(void);
|
||||
|
||||
/* local declarations */
|
||||
|
||||
static void pgxml_errorHandler(void *ctxt, const char *msg,...);
|
||||
|
||||
static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
xmlChar *toptagname, xmlChar *septagname,
|
||||
xmlChar *plainsep);
|
||||
|
||||
static text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag,
|
||||
xmlChar *septag, xmlChar *plainsep);
|
||||
|
||||
static xmlChar *pgxml_texttoxmlchar(text *textstring);
|
||||
|
||||
static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath);
|
||||
|
||||
/* Global variables */
|
||||
char *errbuf; /* per line error buffer */
|
||||
char *pgxml_errorMsg = NULL; /* overall error message */
|
||||
static char *pgxml_errorMsg = NULL; /* overall error message */
|
||||
|
||||
/* Convenience macros */
|
||||
|
||||
#define GET_TEXT(cstrp) DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(cstrp)))
|
||||
#define GET_STR(textp) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(textp)))
|
||||
|
||||
#define ERRBUF_SIZE 200
|
||||
|
||||
/* memory handling passthrough functions (e.g. palloc, pstrdup are
|
||||
currently macros, and the others might become so...) */
|
||||
|
||||
static void *
|
||||
pgxml_palloc(size_t size)
|
||||
{
|
||||
/* elog(DEBUG1,"Alloc %d in CMC %x",size,CurrentMemoryContext); */
|
||||
return palloc(size);
|
||||
}
|
||||
|
||||
static void *
|
||||
pgxml_repalloc(void *ptr, size_t size)
|
||||
{
|
||||
/* elog(DEBUG1,"ReAlloc in CMC %x",CurrentMemoryContext);*/
|
||||
return repalloc(ptr, size);
|
||||
}
|
||||
|
||||
static void
|
||||
pgxml_pfree(void *ptr)
|
||||
{
|
||||
/* elog(DEBUG1,"Free in CMC %x",CurrentMemoryContext); */
|
||||
pfree(ptr);
|
||||
}
|
||||
|
||||
static char *
|
||||
pgxml_pstrdup(const char *string)
|
||||
{
|
||||
return pstrdup(string);
|
||||
}
|
||||
|
||||
/* The error handling function. This formats an error message and sets
|
||||
/*
|
||||
* The error handling function. This formats an error message and sets
|
||||
* a flag - an ereport will be issued prior to return
|
||||
*/
|
||||
|
||||
static void
|
||||
pgxml_errorHandler(void *ctxt, const char *msg,...)
|
||||
{
|
||||
char errbuf[1024]; /* per line error buffer */
|
||||
va_list args;
|
||||
|
||||
/* Format the message */
|
||||
va_start(args, msg);
|
||||
vsnprintf(errbuf, ERRBUF_SIZE, msg, args);
|
||||
vsnprintf(errbuf, sizeof(errbuf), msg, args);
|
||||
va_end(args);
|
||||
/* Now copy the argument across */
|
||||
/* Store in, or append to, pgxml_errorMsg */
|
||||
if (pgxml_errorMsg == NULL)
|
||||
pgxml_errorMsg = pstrdup(errbuf);
|
||||
else
|
||||
{
|
||||
int32 xsize = strlen(pgxml_errorMsg);
|
||||
|
||||
pgxml_errorMsg = repalloc(pgxml_errorMsg,
|
||||
(size_t) (xsize + strlen(errbuf) + 1));
|
||||
strncpy(&pgxml_errorMsg[xsize - 1], errbuf, strlen(errbuf));
|
||||
pgxml_errorMsg[xsize + strlen(errbuf) - 1] = '\0';
|
||||
size_t oldsize = strlen(pgxml_errorMsg);
|
||||
size_t newsize = strlen(errbuf);
|
||||
|
||||
/*
|
||||
* We intentionally discard the last char of the existing message,
|
||||
* which should be a carriage return. (XXX wouldn't it be saner
|
||||
* to keep it?)
|
||||
*/
|
||||
pgxml_errorMsg = repalloc(pgxml_errorMsg, oldsize + newsize);
|
||||
memcpy(&pgxml_errorMsg[oldsize - 1], errbuf, newsize);
|
||||
pgxml_errorMsg[oldsize + newsize - 1] = '\0';
|
||||
}
|
||||
memset(errbuf, 0, ERRBUF_SIZE);
|
||||
}
|
||||
|
||||
/* This function reports the current message at the level specified */
|
||||
/*
|
||||
* This function ereports the current message if any. If force is true
|
||||
* then an error is thrown even if pgxml_errorMsg hasn't been set.
|
||||
*/
|
||||
void
|
||||
elog_error(int level, char *explain, int force)
|
||||
elog_error(const char *explain, bool force)
|
||||
{
|
||||
if (force || (pgxml_errorMsg != NULL))
|
||||
if (force || pgxml_errorMsg != NULL)
|
||||
{
|
||||
if (pgxml_errorMsg == NULL)
|
||||
{
|
||||
ereport(level, (errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
|
||||
errmsg(explain)));
|
||||
}
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
|
||||
errmsg("%s", explain)));
|
||||
else
|
||||
{
|
||||
ereport(level, (errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
|
||||
errmsg("%s:%s", explain, pgxml_errorMsg)));
|
||||
pfree(pgxml_errorMsg);
|
||||
}
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
|
||||
errmsg("%s: %s", explain, pgxml_errorMsg)));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize for xml parsing.
|
||||
*/
|
||||
void
|
||||
pgxml_parser_init()
|
||||
pgxml_parser_init(void)
|
||||
{
|
||||
/*
|
||||
* This code could also set parser settings from user-supplied info.
|
||||
* Quite how these settings are made is another matter :)
|
||||
*/
|
||||
|
||||
xmlMemSetup(pgxml_pfree, pgxml_palloc, pgxml_repalloc, pgxml_pstrdup);
|
||||
xmlInitParser();
|
||||
|
||||
/* Set up error handling */
|
||||
pgxml_errorMsg = NULL;
|
||||
xmlSetGenericErrorFunc(NULL, pgxml_errorHandler);
|
||||
|
||||
/* Initialize libxml */
|
||||
xmlInitParser();
|
||||
|
||||
xmlSubstituteEntitiesDefault(1);
|
||||
xmlLoadExtDtdDefaultValue = 1;
|
||||
|
||||
pgxml_errorMsg = NULL;
|
||||
|
||||
errbuf = palloc(200);
|
||||
memset(errbuf, 0, 200);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -168,10 +131,9 @@ PG_FUNCTION_INFO_V1(xml_valid);
|
||||
Datum
|
||||
xml_valid(PG_FUNCTION_ARGS)
|
||||
{
|
||||
/* called as xml_valid(document) */
|
||||
xmlDocPtr doctree;
|
||||
text *t = PG_GETARG_TEXT_P(0); /* document buffer */
|
||||
int32 docsize = VARSIZE(t) - VARHDRSZ;
|
||||
xmlDocPtr doctree;
|
||||
|
||||
pgxml_parser_init();
|
||||
|
||||
@ -181,8 +143,8 @@ xml_valid(PG_FUNCTION_ARGS)
|
||||
xmlCleanupParser();
|
||||
PG_RETURN_BOOL(false); /* i.e. not well-formed */
|
||||
}
|
||||
xmlCleanupParser();
|
||||
xmlFreeDoc(doctree);
|
||||
xmlCleanupParser();
|
||||
PG_RETURN_BOOL(true);
|
||||
}
|
||||
|
||||
@ -216,28 +178,23 @@ xml_encode_special_chars(PG_FUNCTION_ARGS)
|
||||
PG_RETURN_TEXT_P(tout);
|
||||
}
|
||||
|
||||
static xmlChar
|
||||
*
|
||||
/*
|
||||
* Function translates a nodeset into a text representation
|
||||
*
|
||||
* iterates over each node in the set and calls xmlNodeDump to write it to
|
||||
* an xmlBuffer -from which an xmlChar * string is returned.
|
||||
*
|
||||
* each representation is surrounded by <tagname> ... </tagname>
|
||||
*
|
||||
* plainsep is an ordinary (not tag) separator - if used, then nodes are
|
||||
* cast to string as output method
|
||||
*/
|
||||
static xmlChar *
|
||||
pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
xmlChar * toptagname,
|
||||
xmlChar * septagname,
|
||||
xmlChar * plainsep)
|
||||
xmlChar *toptagname,
|
||||
xmlChar *septagname,
|
||||
xmlChar *plainsep)
|
||||
{
|
||||
/* Function translates a nodeset into a text representation */
|
||||
|
||||
/*
|
||||
* iterates over each node in the set and calls xmlNodeDump to write it to
|
||||
* an xmlBuffer -from which an xmlChar * string is returned.
|
||||
*/
|
||||
|
||||
/* each representation is surrounded by <tagname> ... </tagname> */
|
||||
|
||||
/*
|
||||
* plainsep is an ordinary (not tag) seperator - if used, then nodes are
|
||||
* cast to string as output method
|
||||
*/
|
||||
|
||||
|
||||
xmlBufferPtr buf;
|
||||
xmlChar *result;
|
||||
int i;
|
||||
@ -254,7 +211,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
{
|
||||
for (i = 0; i < nodeset->nodeNr; i++)
|
||||
{
|
||||
|
||||
if (plainsep != NULL)
|
||||
{
|
||||
xmlBufferWriteCHAR(buf,
|
||||
@ -266,8 +222,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
if ((septagname != NULL) && (xmlStrlen(septagname) > 0))
|
||||
{
|
||||
xmlBufferWriteChar(buf, "<");
|
||||
@ -304,8 +258,7 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
|
||||
/* Translate a PostgreSQL "varlena" -i.e. a variable length parameter
|
||||
* into the libxml2 representation
|
||||
*/
|
||||
|
||||
xmlChar *
|
||||
static xmlChar *
|
||||
pgxml_texttoxmlchar(text *textstring)
|
||||
{
|
||||
xmlChar *res;
|
||||
@ -318,12 +271,12 @@ pgxml_texttoxmlchar(text *textstring)
|
||||
return res;
|
||||
}
|
||||
|
||||
/* Public visible XPath functions */
|
||||
/* Publicly visible XPath functions */
|
||||
|
||||
/* This is a "raw" xpath function. Check that it returns child elements
|
||||
/*
|
||||
* This is a "raw" xpath function. Check that it returns child elements
|
||||
* properly
|
||||
*/
|
||||
|
||||
PG_FUNCTION_INFO_V1(xpath_nodeset);
|
||||
|
||||
Datum
|
||||
@ -333,8 +286,7 @@ xpath_nodeset(PG_FUNCTION_ARGS)
|
||||
*toptag,
|
||||
*septag;
|
||||
int32 pathsize;
|
||||
text
|
||||
*xpathsupp,
|
||||
text *xpathsupp,
|
||||
*xpres;
|
||||
|
||||
/* PG_GETARG_TEXT_P(0) is document buffer */
|
||||
@ -347,8 +299,7 @@ xpath_nodeset(PG_FUNCTION_ARGS)
|
||||
|
||||
xpath = pgxml_texttoxmlchar(xpathsupp);
|
||||
|
||||
xpres = pgxml_result_to_text(
|
||||
pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
toptag, septag, NULL);
|
||||
|
||||
/* xmlCleanupParser(); done by result_to_text routine */
|
||||
@ -359,9 +310,10 @@ xpath_nodeset(PG_FUNCTION_ARGS)
|
||||
PG_RETURN_TEXT_P(xpres);
|
||||
}
|
||||
|
||||
/* The following function is almost identical, but returns the elements in */
|
||||
/* a list. */
|
||||
|
||||
/*
|
||||
* The following function is almost identical, but returns the elements in
|
||||
* a list.
|
||||
*/
|
||||
PG_FUNCTION_INFO_V1(xpath_list);
|
||||
|
||||
Datum
|
||||
@ -370,8 +322,7 @@ xpath_list(PG_FUNCTION_ARGS)
|
||||
xmlChar *xpath,
|
||||
*plainsep;
|
||||
int32 pathsize;
|
||||
text
|
||||
*xpathsupp,
|
||||
text *xpathsupp,
|
||||
*xpres;
|
||||
|
||||
/* PG_GETARG_TEXT_P(0) is document buffer */
|
||||
@ -383,8 +334,7 @@ xpath_list(PG_FUNCTION_ARGS)
|
||||
|
||||
xpath = pgxml_texttoxmlchar(xpathsupp);
|
||||
|
||||
xpres = pgxml_result_to_text(
|
||||
pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
NULL, NULL, plainsep);
|
||||
|
||||
/* xmlCleanupParser(); done by result_to_text routine */
|
||||
@ -403,8 +353,7 @@ xpath_string(PG_FUNCTION_ARGS)
|
||||
{
|
||||
xmlChar *xpath;
|
||||
int32 pathsize;
|
||||
text
|
||||
*xpathsupp,
|
||||
text *xpathsupp,
|
||||
*xpres;
|
||||
|
||||
/* PG_GETARG_TEXT_P(0) is document buffer */
|
||||
@ -424,8 +373,7 @@ xpath_string(PG_FUNCTION_ARGS)
|
||||
xpath[pathsize + 7] = ')';
|
||||
xpath[pathsize + 8] = '\0';
|
||||
|
||||
xpres = pgxml_result_to_text(
|
||||
pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
|
||||
NULL, NULL, NULL);
|
||||
|
||||
xmlCleanupParser();
|
||||
@ -444,9 +392,7 @@ xpath_number(PG_FUNCTION_ARGS)
|
||||
{
|
||||
xmlChar *xpath;
|
||||
int32 pathsize;
|
||||
text
|
||||
*xpathsupp;
|
||||
|
||||
text *xpathsupp;
|
||||
float4 fRes;
|
||||
|
||||
xmlXPathObjectPtr res;
|
||||
@ -473,7 +419,6 @@ xpath_number(PG_FUNCTION_ARGS)
|
||||
PG_RETURN_NULL();
|
||||
|
||||
PG_RETURN_FLOAT4(fRes);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -484,9 +429,7 @@ xpath_bool(PG_FUNCTION_ARGS)
|
||||
{
|
||||
xmlChar *xpath;
|
||||
int32 pathsize;
|
||||
text
|
||||
*xpathsupp;
|
||||
|
||||
text *xpathsupp;
|
||||
int bRes;
|
||||
|
||||
xmlXPathObjectPtr res;
|
||||
@ -510,26 +453,21 @@ xpath_bool(PG_FUNCTION_ARGS)
|
||||
bRes = xmlXPathCastToBoolean(res);
|
||||
xmlCleanupParser();
|
||||
PG_RETURN_BOOL(bRes);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Core function to evaluate XPath query */
|
||||
|
||||
xmlXPathObjectPtr
|
||||
pgxml_xpath(text *document, xmlChar * xpath)
|
||||
static xmlXPathObjectPtr
|
||||
pgxml_xpath(text *document, xmlChar *xpath)
|
||||
{
|
||||
|
||||
xmlDocPtr doctree;
|
||||
xmlXPathContextPtr ctxt;
|
||||
xmlXPathObjectPtr res;
|
||||
|
||||
xmlXPathCompExprPtr comppath;
|
||||
|
||||
int32 docsize;
|
||||
|
||||
|
||||
docsize = VARSIZE(document) - VARHDRSZ;
|
||||
|
||||
pgxml_parser_init();
|
||||
@ -543,16 +481,13 @@ pgxml_xpath(text *document, xmlChar * xpath)
|
||||
ctxt = xmlXPathNewContext(doctree);
|
||||
ctxt->node = xmlDocGetRootElement(doctree);
|
||||
|
||||
|
||||
/* compile the path */
|
||||
comppath = xmlXPathCompile(xpath);
|
||||
if (comppath == NULL)
|
||||
{
|
||||
xmlCleanupParser();
|
||||
xmlFreeDoc(doctree);
|
||||
elog_error(ERROR, "XPath Syntax Error", 1);
|
||||
|
||||
return NULL;
|
||||
elog_error("XPath Syntax Error", true);
|
||||
}
|
||||
|
||||
/* Now evaluate the path expression. */
|
||||
@ -571,12 +506,11 @@ pgxml_xpath(text *document, xmlChar * xpath)
|
||||
return res;
|
||||
}
|
||||
|
||||
text
|
||||
*
|
||||
static text *
|
||||
pgxml_result_to_text(xmlXPathObjectPtr res,
|
||||
xmlChar * toptag,
|
||||
xmlChar * septag,
|
||||
xmlChar * plainsep)
|
||||
xmlChar *toptag,
|
||||
xmlChar *septag,
|
||||
xmlChar *plainsep)
|
||||
{
|
||||
xmlChar *xpresstr;
|
||||
int32 ressize;
|
||||
@ -604,7 +538,6 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
|
||||
xpresstr = xmlStrdup("<unsupported/>");
|
||||
}
|
||||
|
||||
|
||||
/* Now convert this result back to text */
|
||||
ressize = strlen(xpresstr);
|
||||
xpres = (text *) palloc(ressize + VARHDRSZ);
|
||||
@ -617,27 +550,33 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
|
||||
|
||||
xmlFree(xpresstr);
|
||||
|
||||
elog_error(ERROR, "XPath error", 0);
|
||||
|
||||
elog_error("XPath error", false);
|
||||
|
||||
return xpres;
|
||||
}
|
||||
|
||||
/* xpath_table is a table function. It needs some tidying (as do the
|
||||
/*
|
||||
* xpath_table is a table function. It needs some tidying (as do the
|
||||
* other functions here!
|
||||
*/
|
||||
|
||||
PG_FUNCTION_INFO_V1(xpath_table);
|
||||
|
||||
Datum
|
||||
xpath_table(PG_FUNCTION_ARGS)
|
||||
{
|
||||
/* SPI (input tuple) support */
|
||||
/* Function parameters */
|
||||
char *pkeyfield = GET_STR(PG_GETARG_TEXT_P(0));
|
||||
char *xmlfield = GET_STR(PG_GETARG_TEXT_P(1));
|
||||
char *relname = GET_STR(PG_GETARG_TEXT_P(2));
|
||||
char *xpathset = GET_STR(PG_GETARG_TEXT_P(3));
|
||||
char *condition = GET_STR(PG_GETARG_TEXT_P(4));
|
||||
|
||||
/* SPI (input tuple) support */
|
||||
SPITupleTable *tuptable;
|
||||
HeapTuple spi_tuple;
|
||||
TupleDesc spi_tupdesc;
|
||||
|
||||
/* Output tuple (tuplestore) support */
|
||||
/* Output tuple (tuplestore) support */
|
||||
Tuplestorestate *tupstore = NULL;
|
||||
TupleDesc ret_tupdesc;
|
||||
HeapTuple ret_tuple;
|
||||
@ -647,13 +586,6 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
MemoryContext per_query_ctx;
|
||||
MemoryContext oldcontext;
|
||||
|
||||
/* Function parameters */
|
||||
char *pkeyfield = GET_STR(PG_GETARG_TEXT_P(0));
|
||||
char *xmlfield = GET_STR(PG_GETARG_TEXT_P(1));
|
||||
char *relname = GET_STR(PG_GETARG_TEXT_P(2));
|
||||
char *xpathset = GET_STR(PG_GETARG_TEXT_P(3));
|
||||
char *condition = GET_STR(PG_GETARG_TEXT_P(4));
|
||||
|
||||
char **values;
|
||||
xmlChar **xpaths;
|
||||
xmlChar *pos;
|
||||
@ -666,9 +598,8 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
int j;
|
||||
int rownr; /* For issuing multiple rows from one original
|
||||
* document */
|
||||
int had_values; /* To determine end of nodeset results */
|
||||
|
||||
StringInfo querysql;
|
||||
bool had_values; /* To determine end of nodeset results */
|
||||
StringInfoData query_buf;
|
||||
|
||||
/* We only have a valid tuple description in table function mode */
|
||||
if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
|
||||
@ -694,7 +625,6 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
* The tuplestore must exist in a higher context than this function call
|
||||
* (per_query_ctx is used)
|
||||
*/
|
||||
|
||||
per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
|
||||
oldcontext = MemoryContextSwitchTo(per_query_ctx);
|
||||
|
||||
@ -709,6 +639,12 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
/* get the requested return tuple description */
|
||||
ret_tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
|
||||
|
||||
/* must have at least one output column (for the pkey) */
|
||||
if (ret_tupdesc->natts < 1)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_SYNTAX_ERROR),
|
||||
errmsg("xpath_table must have at least one output column")));
|
||||
|
||||
/*
|
||||
* At the moment we assume that the returned attributes make sense for the
|
||||
* XPath specififed (i.e. we trust the caller). It's not fatal if they get
|
||||
@ -724,60 +660,58 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
rsinfo->setDesc = ret_tupdesc;
|
||||
|
||||
values = (char **) palloc(ret_tupdesc->natts * sizeof(char *));
|
||||
|
||||
xpaths = (xmlChar **) palloc(ret_tupdesc->natts * sizeof(xmlChar *));
|
||||
|
||||
/* Split XPaths. xpathset is a writable CString. */
|
||||
|
||||
/* Note that we stop splitting once we've done all needed for tupdesc */
|
||||
|
||||
/*
|
||||
* Split XPaths. xpathset is a writable CString.
|
||||
*
|
||||
* Note that we stop splitting once we've done all needed for tupdesc
|
||||
*/
|
||||
numpaths = 0;
|
||||
pos = xpathset;
|
||||
do
|
||||
while (numpaths < (ret_tupdesc->natts - 1))
|
||||
{
|
||||
xpaths[numpaths] = pos;
|
||||
xpaths[numpaths++] = (xmlChar *) pos;
|
||||
pos = strstr(pos, pathsep);
|
||||
if (pos != NULL)
|
||||
{
|
||||
*pos = '\0';
|
||||
pos++;
|
||||
}
|
||||
numpaths++;
|
||||
} while ((pos != NULL) && (numpaths < (ret_tupdesc->natts - 1)));
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
/* Now build query */
|
||||
|
||||
querysql = makeStringInfo();
|
||||
initStringInfo(&query_buf);
|
||||
|
||||
/* Build initial sql statement */
|
||||
appendStringInfo(querysql, "SELECT %s, %s FROM %s WHERE %s",
|
||||
appendStringInfo(&query_buf, "SELECT %s, %s FROM %s WHERE %s",
|
||||
pkeyfield,
|
||||
xmlfield,
|
||||
relname,
|
||||
condition
|
||||
);
|
||||
|
||||
condition);
|
||||
|
||||
if ((ret = SPI_connect()) < 0)
|
||||
elog(ERROR, "xpath_table: SPI_connect returned %d", ret);
|
||||
|
||||
if ((ret = SPI_exec(querysql->data, 0)) != SPI_OK_SELECT)
|
||||
elog(ERROR, "xpath_table: SPI execution failed for query %s", querysql->data);
|
||||
if ((ret = SPI_exec(query_buf.data, 0)) != SPI_OK_SELECT)
|
||||
elog(ERROR, "xpath_table: SPI execution failed for query %s",
|
||||
query_buf.data);
|
||||
|
||||
proc = SPI_processed;
|
||||
/* elog(DEBUG1,"xpath_table: SPI returned %d rows",proc); */
|
||||
tuptable = SPI_tuptable;
|
||||
spi_tupdesc = tuptable->tupdesc;
|
||||
|
||||
/* Switch out of SPI context */
|
||||
/* Switch out of SPI context */
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
|
||||
|
||||
/* Check that SPI returned correct result. If you put a comma into one of
|
||||
* the function parameters, this will catch it when the SPI query returns
|
||||
* e.g. 3 columns.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Check that SPI returned correct result. If you put a comma into one of
|
||||
* the function parameters, this will catch it when the SPI query returns
|
||||
* e.g. 3 columns.
|
||||
*/
|
||||
if (spi_tupdesc->natts != 2)
|
||||
{
|
||||
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
@ -785,10 +719,12 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
errdetail("Expected two columns in SPI result, got %d", spi_tupdesc->natts)));
|
||||
}
|
||||
|
||||
/* Setup the parser. Beware that this must happen in the same context as the
|
||||
* cleanup - which means that any error from here on must do cleanup to
|
||||
* ensure that the entity table doesn't get freed by being out of context.
|
||||
*/
|
||||
/*
|
||||
* Setup the parser. Beware that this must happen in the same context as
|
||||
* the cleanup - which means that any error from here on must do cleanup
|
||||
* to ensure that the entity table doesn't get freed by being out of
|
||||
* context.
|
||||
*/
|
||||
pgxml_parser_init();
|
||||
|
||||
/* For each row i.e. document returned from SPI */
|
||||
@ -796,13 +732,10 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
{
|
||||
char *pkey;
|
||||
char *xmldoc;
|
||||
|
||||
xmlDocPtr doctree;
|
||||
xmlXPathContextPtr ctxt;
|
||||
xmlXPathObjectPtr res;
|
||||
xmlChar *resstr;
|
||||
|
||||
|
||||
xmlXPathCompExprPtr comppath;
|
||||
|
||||
/* Extract the row data as C Strings */
|
||||
@ -812,10 +745,9 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
|
||||
/*
|
||||
* Clear the values array, so that not-well-formed documents return
|
||||
* NULL in all columns.
|
||||
* NULL in all columns. Note that this also means that spare columns
|
||||
* will be NULL.
|
||||
*/
|
||||
|
||||
/* Note that this also means that spare columns will be NULL. */
|
||||
for (j = 0; j < ret_tupdesc->natts; j++)
|
||||
values[j] = NULL;
|
||||
|
||||
@ -843,10 +775,9 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
do
|
||||
{
|
||||
/* Now evaluate the set of xpaths. */
|
||||
had_values = 0;
|
||||
had_values = false;
|
||||
for (j = 0; j < numpaths; j++)
|
||||
{
|
||||
|
||||
ctxt = xmlXPathNewContext(doctree);
|
||||
ctxt->node = xmlDocGetRootElement(doctree);
|
||||
xmlSetGenericErrorFunc(ctxt, pgxml_errorHandler);
|
||||
@ -857,10 +788,7 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
{
|
||||
xmlCleanupParser();
|
||||
xmlFreeDoc(doctree);
|
||||
|
||||
elog_error(ERROR, "XPath Syntax Error", 1);
|
||||
|
||||
PG_RETURN_NULL(); /* Keep compiler happy */
|
||||
elog_error("XPath Syntax Error", true);
|
||||
}
|
||||
|
||||
/* Now evaluate the path expression. */
|
||||
@ -873,11 +801,12 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
{
|
||||
case XPATH_NODESET:
|
||||
/* We see if this nodeset has enough nodes */
|
||||
if ((res->nodesetval != NULL) && (rownr < res->nodesetval->nodeNr))
|
||||
if (res->nodesetval != NULL &&
|
||||
rownr < res->nodesetval->nodeNr)
|
||||
{
|
||||
resstr =
|
||||
xmlXPathCastNodeToString(res->nodesetval->nodeTab[rownr]);
|
||||
had_values = 1;
|
||||
had_values = true;
|
||||
}
|
||||
else
|
||||
resstr = NULL;
|
||||
@ -893,7 +822,6 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
resstr = xmlStrdup("<unsupported/>");
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Insert this into the appropriate column in the
|
||||
* result tuple.
|
||||
@ -902,6 +830,7 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
}
|
||||
xmlXPathFreeContext(ctxt);
|
||||
}
|
||||
|
||||
/* Now add the tuple to the output, if there is one. */
|
||||
if (had_values)
|
||||
{
|
||||
@ -911,9 +840,7 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
}
|
||||
|
||||
rownr++;
|
||||
|
||||
} while (had_values);
|
||||
|
||||
}
|
||||
|
||||
xmlFreeDoc(doctree);
|
||||
@ -925,7 +852,7 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
}
|
||||
|
||||
xmlCleanupParser();
|
||||
/* Needed to flag completeness in 7.3.1. 7.4 defines it as a no-op. */
|
||||
|
||||
tuplestore_donestoring(tupstore);
|
||||
|
||||
SPI_finish();
|
||||
@ -940,5 +867,4 @@ xpath_table(PG_FUNCTION_ARGS)
|
||||
* expecting.
|
||||
*/
|
||||
return (Datum) 0;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user