open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attached is a patch that replaces a bunch of places where StringInfos

Browse Source 
are unnecessarily allocated on the heap rather than the stack. If the
StringInfo doesn't outlive the stack frame in which it is created,
there is no need to allocate it on the heap via makeStringInfo() --
stack allocation is faster.  While it's not a big deal unless the
code is in a critical path, I don't see a reason not to save a few
cycles -- using stack allocation is not less readable.

I also cleaned up a bit of code along the way: moved variable
declarations into a more tightly-enclosing scope where possible,
fixed some pointless copying of strings in dblink, etc.
REL8_2_STABLE
Neil Conway 20 years ago
parent 8e5a10d46c
commit 0d9742f99a
5 changed files with 126 additions and 140 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 125
      contrib/dblink/dblink.c
  2. 51
      contrib/tablefunc/tablefunc.c
  3. 11
      contrib/xml2/xpath.c
  4. 24
      src/backend/commands/explain.c
  5. 55
      src/backend/utils/adt/varlena.c

125
contrib/dblink/dblink.c
Unescape View File

@ -301,11 +301,12 @@ dblink_open(PG_FUNCTION_ARGS)
char *curname = NULL; char *curname = NULL;
char *sql = NULL; char *sql = NULL;
char *conname = NULL; char *conname = NULL;
StringInfo str = makeStringInfo(); StringInfoData buf;
remoteConn *rconn = NULL; remoteConn *rconn = NULL;
bool fail = true; /* default to backward compatible behavior */ bool fail = true; /* default to backward compatible behavior */
DBLINK_INIT; DBLINK_INIT;
initStringInfo(&buf);
if (PG_NARGS() == 2) if (PG_NARGS() == 2)
{ {
@ -361,8 +362,8 @@ dblink_open(PG_FUNCTION_ARGS)
if (rconn->newXactForCursor) if (rconn->newXactForCursor)
(rconn->openCursorCount)++; (rconn->openCursorCount)++;
appendStringInfo(str, "DECLARE %s CURSOR FOR %s", curname, sql); appendStringInfo(&buf, "DECLARE %s CURSOR FOR %s", curname, sql);
res = PQexec(conn, str->data); res = PQexec(conn, buf.data);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
if (fail) if (fail)
@ -389,12 +390,13 @@ dblink_close(PG_FUNCTION_ARGS)
PGresult *res = NULL; PGresult *res = NULL;
char *curname = NULL; char *curname = NULL;
char *conname = NULL; char *conname = NULL;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *msg; char *msg;
remoteConn *rconn = NULL; remoteConn *rconn = NULL;
bool fail = true; /* default to backward compatible behavior */ bool fail = true; /* default to backward compatible behavior */
DBLINK_INIT; DBLINK_INIT;
initStringInfo(&buf);
if (PG_NARGS() == 1) if (PG_NARGS() == 1)
{ {
@ -432,10 +434,10 @@ dblink_close(PG_FUNCTION_ARGS)
else else
conn = rconn->conn; conn = rconn->conn;
appendStringInfo(str, "CLOSE %s", curname); appendStringInfo(&buf, "CLOSE %s", curname);
/* close the cursor */ /* close the cursor */
res = PQexec(conn, str->data); res = PQexec(conn, buf.data);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
if (fail) if (fail)
@ -493,7 +495,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
if (SRF_IS_FIRSTCALL()) if (SRF_IS_FIRSTCALL())
{ {
PGconn *conn = NULL; PGconn *conn = NULL;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *curname = NULL; char *curname = NULL;
int howmany = 0; int howmany = 0;
bool fail = true; /* default to backward compatible */ bool fail = true; /* default to backward compatible */
@ -542,6 +544,9 @@ dblink_fetch(PG_FUNCTION_ARGS)
if (!conn) if (!conn)
DBLINK_CONN_NOT_AVAIL; DBLINK_CONN_NOT_AVAIL;
initStringInfo(&buf);
appendStringInfo(&buf, "FETCH %d FROM %s", howmany, curname);
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();
@ -550,9 +555,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
*/ */
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
appendStringInfo(str, "FETCH %d FROM %s", howmany, curname); res = PQexec(conn, buf.data);
res = PQexec(conn, str->data);
if (!res || if (!res ||
(PQresultStatus(res) != PGRES_COMMAND_OK && (PQresultStatus(res) != PGRES_COMMAND_OK &&
PQresultStatus(res) != PGRES_TUPLES_OK)) PQresultStatus(res) != PGRES_TUPLES_OK))
@ -1547,13 +1550,14 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
HeapTuple tuple; HeapTuple tuple;
TupleDesc tupdesc; TupleDesc tupdesc;
int natts; int natts;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *sql;
char *val; char *val;
int16 key; int16 key;
int i; int i;
bool needComma; bool needComma;
initStringInfo(&buf);
/* get relation name including any needed schema prefix and quoting */ /* get relation name including any needed schema prefix and quoting */
relname = generate_relation_name(relid); relname = generate_relation_name(relid);
@ -1570,7 +1574,7 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
(errcode(ERRCODE_CARDINALITY_VIOLATION), (errcode(ERRCODE_CARDINALITY_VIOLATION),
errmsg("source row not found"))); errmsg("source row not found")));
appendStringInfo(str, "INSERT INTO %s(", relname); appendStringInfo(&buf, "INSERT INTO %s(", relname);
needComma = false; needComma = false;
for (i = 0; i < natts; i++) for (i = 0; i < natts; i++)
@ -1579,14 +1583,14 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
continue; continue;
if (needComma) if (needComma)
appendStringInfo(str, ","); appendStringInfo(&buf, ",");
appendStringInfo(str, "%s", appendStringInfoString(&buf,
quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname))); quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
needComma = true; needComma = true;
} }
appendStringInfo(str, ") VALUES("); appendStringInfo(&buf, ") VALUES(");
/* /*
* remember attvals are 1 based * remember attvals are 1 based
@ -1598,7 +1602,7 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
continue; continue;
if (needComma) if (needComma)
appendStringInfo(str, ","); appendStringInfo(&buf, ",");
if (tgt_pkattvals != NULL) if (tgt_pkattvals != NULL)
key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1); key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1);
@ -1612,21 +1616,17 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
if (val != NULL) if (val != NULL)
{ {
appendStringInfo(str, "%s", quote_literal_cstr(val)); appendStringInfoString(&buf, quote_literal_cstr(val));
pfree(val); pfree(val);
} }
else else
appendStringInfo(str, "NULL"); appendStringInfo(&buf, "NULL");
needComma = true; needComma = true;
} }
appendStringInfo(str, ")"); appendStringInfo(&buf, ")");
sql = pstrdup(str->data);
pfree(str->data);
pfree(str);
relation_close(rel, AccessShareLock); relation_close(rel, AccessShareLock);
return (buf.data);
return (sql);
} }
static char * static char *
@ -1636,10 +1636,11 @@ get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pka
char *relname; char *relname;
TupleDesc tupdesc; TupleDesc tupdesc;
int natts; int natts;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *sql;
int i; int i;
initStringInfo(&buf);
/* get relation name including any needed schema prefix and quoting */ /* get relation name including any needed schema prefix and quoting */
relname = generate_relation_name(relid); relname = generate_relation_name(relid);
@ -1650,15 +1651,15 @@ get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pka
tupdesc = rel->rd_att; tupdesc = rel->rd_att;
natts = tupdesc->natts; natts = tupdesc->natts;
appendStringInfo(str, "DELETE FROM %s WHERE ", relname); appendStringInfo(&buf, "DELETE FROM %s WHERE ", relname);
for (i = 0; i < pknumatts; i++) for (i = 0; i < pknumatts; i++)
{ {
int16 pkattnum = pkattnums->values[i]; int16 pkattnum = pkattnums->values[i];
if (i > 0) if (i > 0)
appendStringInfo(str, " AND "); appendStringInfo(&buf, " AND ");
appendStringInfo(str, "%s", appendStringInfoString(&buf,
quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
if (tgt_pkattvals == NULL) if (tgt_pkattvals == NULL)
@ -1666,18 +1667,14 @@ get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pka
elog(ERROR, "target key array must not be NULL"); elog(ERROR, "target key array must not be NULL");
if (tgt_pkattvals[i] != NULL) if (tgt_pkattvals[i] != NULL)
appendStringInfo(str, " = %s", appendStringInfo(&buf, " = %s",
quote_literal_cstr(tgt_pkattvals[i])); quote_literal_cstr(tgt_pkattvals[i]));
else else
appendStringInfo(str, " IS NULL"); appendStringInfo(&buf, " IS NULL");
} }
sql = pstrdup(str->data);
pfree(str->data);
pfree(str);
relation_close(rel, AccessShareLock); relation_close(rel, AccessShareLock);
return (buf.data);
return (sql);
} }
static char * static char *
@ -1688,13 +1685,14 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
HeapTuple tuple; HeapTuple tuple;
TupleDesc tupdesc; TupleDesc tupdesc;
int natts; int natts;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *sql;
char *val; char *val;
int16 key; int16 key;
int i; int i;
bool needComma; bool needComma;
initStringInfo(&buf);
/* get relation name including any needed schema prefix and quoting */ /* get relation name including any needed schema prefix and quoting */
relname = generate_relation_name(relid); relname = generate_relation_name(relid);
@ -1711,7 +1709,7 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
(errcode(ERRCODE_CARDINALITY_VIOLATION), (errcode(ERRCODE_CARDINALITY_VIOLATION),
errmsg("source row not found"))); errmsg("source row not found")));
appendStringInfo(str, "UPDATE %s SET ", relname); appendStringInfo(&buf, "UPDATE %s SET ", relname);
needComma = false; needComma = false;
for (i = 0; i < natts; i++) for (i = 0; i < natts; i++)
@ -1720,9 +1718,9 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
continue; continue;
if (needComma) if (needComma)
appendStringInfo(str, ", "); appendStringInfo(&buf, ", ");
appendStringInfo(str, "%s = ", appendStringInfo(&buf, "%s = ",
quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname))); quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
if (tgt_pkattvals != NULL) if (tgt_pkattvals != NULL)
@ -1737,24 +1735,24 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
if (val != NULL) if (val != NULL)
{ {
appendStringInfo(str, "%s", quote_literal_cstr(val)); appendStringInfoString(&buf, quote_literal_cstr(val));
pfree(val); pfree(val);
} }
else else
appendStringInfo(str, "NULL"); appendStringInfoString(&buf, "NULL");
needComma = true; needComma = true;
} }
appendStringInfo(str, " WHERE "); appendStringInfo(&buf, " WHERE ");
for (i = 0; i < pknumatts; i++) for (i = 0; i < pknumatts; i++)
{ {
int16 pkattnum = pkattnums->values[i]; int16 pkattnum = pkattnums->values[i];
if (i > 0) if (i > 0)
appendStringInfo(str, " AND "); appendStringInfo(&buf, " AND ");
appendStringInfo(str, "%s", appendStringInfo(&buf, "%s",
quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
if (tgt_pkattvals != NULL) if (tgt_pkattvals != NULL)
@ -1764,19 +1762,15 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
if (val != NULL) if (val != NULL)
{ {
appendStringInfo(str, " = %s", quote_literal_cstr(val)); appendStringInfo(&buf, " = %s", quote_literal_cstr(val));
pfree(val); pfree(val);
} }
else else
appendStringInfo(str, " IS NULL"); appendStringInfo(&buf, " IS NULL");
} }
sql = pstrdup(str->data);
pfree(str->data);
pfree(str);
relation_close(rel, AccessShareLock); relation_close(rel, AccessShareLock);
return (buf.data);
return (sql);
} }
/* /*
@ -1836,12 +1830,13 @@ get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **
Relation rel; Relation rel;
char *relname; char *relname;
TupleDesc tupdesc; TupleDesc tupdesc;
StringInfo str = makeStringInfo(); StringInfoData buf;
char *sql = NULL;
int ret; int ret;
HeapTuple tuple; HeapTuple tuple;
int i; int i;
initStringInfo(&buf);
/* get relation name including any needed schema prefix and quoting */ /* get relation name including any needed schema prefix and quoting */
relname = generate_relation_name(relid); relname = generate_relation_name(relid);
@ -1863,34 +1858,30 @@ get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **
* Build sql statement to look up tuple of interest Use src_pkattvals as * Build sql statement to look up tuple of interest Use src_pkattvals as
* the criteria. * the criteria.
*/ */
appendStringInfo(str, "SELECT * FROM %s WHERE ", relname); appendStringInfo(&buf, "SELECT * FROM %s WHERE ", relname);
for (i = 0; i < pknumatts; i++) for (i = 0; i < pknumatts; i++)
{ {
int16 pkattnum = pkattnums->values[i]; int16 pkattnum = pkattnums->values[i];
if (i > 0) if (i > 0)
appendStringInfo(str, " AND "); appendStringInfo(&buf, " AND ");
appendStringInfo(str, "%s", appendStringInfoString(&buf,
quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
if (src_pkattvals[i] != NULL) if (src_pkattvals[i] != NULL)
appendStringInfo(str, " = %s", appendStringInfo(&buf, " = %s",
quote_literal_cstr(src_pkattvals[i])); quote_literal_cstr(src_pkattvals[i]));
else else
appendStringInfo(str, " IS NULL"); appendStringInfo(&buf, " IS NULL");
} }
sql = pstrdup(str->data);
pfree(str->data);
pfree(str);
/* /*
* Retrieve the desired tuple * Retrieve the desired tuple
*/ */
ret = SPI_exec(sql, 0); ret = SPI_exec(buf.data, 0);
pfree(sql); pfree(buf.data);
/* /*
* Only allow one qualifying tuple * Only allow one qualifying tuple

51
contrib/tablefunc/tablefunc.c
Unescape View File

@ -1260,13 +1260,10 @@ build_tuplestore_recursively(char *key_fld,
{ {
TupleDesc tupdesc = attinmeta->tupdesc; TupleDesc tupdesc = attinmeta->tupdesc;
MemoryContext oldcontext; MemoryContext oldcontext;
StringInfo sql = makeStringInfo();
int ret; int ret;
int proc; int proc;
int serial_column; int serial_column;
StringInfo branchstr = NULL; StringInfoData sql;
StringInfo chk_branchstr = NULL;
StringInfo chk_current_key = NULL;
char **values; char **values;
char *current_key; char *current_key;
char *current_key_parent; char *current_key_parent;
@ -1278,17 +1275,12 @@ build_tuplestore_recursively(char *key_fld,
if (max_depth > 0 && level > max_depth) if (max_depth > 0 && level > max_depth)
return tupstore; return tupstore;
/* start a new branch */ initStringInfo(&sql);
branchstr = makeStringInfo();
/* need these to check for recursion */
chk_branchstr = makeStringInfo();
chk_current_key = makeStringInfo();
/* Build initial sql statement */ /* Build initial sql statement */
if (!show_serial) if (!show_serial)
{ {
appendStringInfo(sql, "SELECT %s, %s FROM %s WHERE %s = %s AND %s IS NOT NULL AND %s <> %s", appendStringInfo(&sql, "SELECT %s, %s FROM %s WHERE %s = %s AND %s IS NOT NULL AND %s <> %s",
key_fld, key_fld,
parent_key_fld, parent_key_fld,
relname, relname,
@ -1299,7 +1291,7 @@ build_tuplestore_recursively(char *key_fld,
} }
else else
{ {
appendStringInfo(sql, "SELECT %s, %s FROM %s WHERE %s = %s AND %s IS NOT NULL AND %s <> %s ORDER BY %s", appendStringInfo(&sql, "SELECT %s, %s FROM %s WHERE %s = %s AND %s IS NOT NULL AND %s <> %s ORDER BY %s",
key_fld, key_fld,
parent_key_fld, parent_key_fld,
relname, relname,
@ -1359,7 +1351,7 @@ build_tuplestore_recursively(char *key_fld,
} }
/* Retrieve the desired rows */ /* Retrieve the desired rows */
ret = SPI_execute(sql->data, true, 0); ret = SPI_execute(sql.data, true, 0);
proc = SPI_processed; proc = SPI_processed;
/* Check for qualifying tuples */ /* Check for qualifying tuples */
@ -1369,6 +1361,9 @@ build_tuplestore_recursively(char *key_fld,
SPITupleTable *tuptable = SPI_tuptable; SPITupleTable *tuptable = SPI_tuptable;
TupleDesc spi_tupdesc = tuptable->tupdesc; TupleDesc spi_tupdesc = tuptable->tupdesc;
int i; int i;
StringInfoData branchstr;
StringInfoData chk_branchstr;
StringInfoData chk_current_key;
/* First time through, do a little more setup */ /* First time through, do a little more setup */
if (level == 0) if (level == 0)
@ -1389,28 +1384,35 @@ build_tuplestore_recursively(char *key_fld,
for (i = 0; i < proc; i++) for (i = 0; i < proc; i++)
{ {
/* start a new branch */
initStringInfo(&branchstr);
/* need these to check for recursion */
initStringInfo(&chk_branchstr);
initStringInfo(&chk_current_key);
/* initialize branch for this pass */ /* initialize branch for this pass */
appendStringInfo(branchstr, "%s", branch); appendStringInfo(&branchstr, "%s", branch);
appendStringInfo(chk_branchstr, "%s%s%s", branch_delim, branch, branch_delim); appendStringInfo(&chk_branchstr, "%s%s%s", branch_delim, branch, branch_delim);
/* get the next sql result tuple */ /* get the next sql result tuple */
spi_tuple = tuptable->vals[i]; spi_tuple = tuptable->vals[i];
/* get the current key and parent */ /* get the current key and parent */
current_key = SPI_getvalue(spi_tuple, spi_tupdesc, 1); current_key = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
appendStringInfo(chk_current_key, "%s%s%s", branch_delim, current_key, branch_delim); appendStringInfo(&chk_current_key, "%s%s%s", branch_delim, current_key, branch_delim);
current_key_parent = pstrdup(SPI_getvalue(spi_tuple, spi_tupdesc, 2)); current_key_parent = pstrdup(SPI_getvalue(spi_tuple, spi_tupdesc, 2));
/* get the current level */ /* get the current level */
sprintf(current_level, "%d", level); sprintf(current_level, "%d", level);
/* check to see if this key is also an ancestor */ /* check to see if this key is also an ancestor */
if (strstr(chk_branchstr->data, chk_current_key->data)) if (strstr(chk_branchstr.data, chk_current_key.data))
elog(ERROR, "infinite recursion detected"); elog(ERROR, "infinite recursion detected");
/* OK, extend the branch */ /* OK, extend the branch */
appendStringInfo(branchstr, "%s%s", branch_delim, current_key); appendStringInfo(&branchstr, "%s%s", branch_delim, current_key);
current_branch = branchstr->data; current_branch = branchstr.data;
/* build a tuple */ /* build a tuple */
values[0] = pstrdup(current_key); values[0] = pstrdup(current_key);
@ -1461,14 +1463,9 @@ build_tuplestore_recursively(char *key_fld,
tupstore); tupstore);
/* reset branch for next pass */ /* reset branch for next pass */
xpfree(branchstr->data); xpfree(branchstr.data);
initStringInfo(branchstr); xpfree(chk_branchstr.data);
xpfree(chk_current_key.data);
xpfree(chk_branchstr->data);
initStringInfo(chk_branchstr);
xpfree(chk_current_key->data);
initStringInfo(chk_current_key);
} }
} }

11
contrib/xml2/xpath.c
Unescape View File

@ -668,7 +668,7 @@ xpath_table(PG_FUNCTION_ARGS)
* document */ * document */
int had_values; /* To determine end of nodeset results */ int had_values; /* To determine end of nodeset results */
StringInfo querysql; StringInfoData query_buf;
/* We only have a valid tuple description in table function mode */ /* We only have a valid tuple description in table function mode */
if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo)) if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
@ -746,11 +746,10 @@ xpath_table(PG_FUNCTION_ARGS)
} while ((pos != NULL) && (numpaths < (ret_tupdesc->natts - 1))); } while ((pos != NULL) && (numpaths < (ret_tupdesc->natts - 1)));
/* Now build query */ /* Now build query */
initStringInfo(&query_buf);
querysql = makeStringInfo();
/* Build initial sql statement */ /* Build initial sql statement */
appendStringInfo(querysql, "SELECT %s, %s FROM %s WHERE %s", appendStringInfo(&query_buf, "SELECT %s, %s FROM %s WHERE %s",
pkeyfield, pkeyfield,
xmlfield, xmlfield,
relname, relname,
@ -761,8 +760,8 @@ xpath_table(PG_FUNCTION_ARGS)
if ((ret = SPI_connect()) < 0) if ((ret = SPI_connect()) < 0)
elog(ERROR, "xpath_table: SPI_connect returned %d", ret); elog(ERROR, "xpath_table: SPI_connect returned %d", ret);
if ((ret = SPI_exec(querysql->data, 0)) != SPI_OK_SELECT) if ((ret = SPI_exec(query_buf.data, 0)) != SPI_OK_SELECT)
elog(ERROR, "xpath_table: SPI execution failed for query %s", querysql->data); elog(ERROR, "xpath_table: SPI execution failed for query %s", query_buf.data);
proc = SPI_processed; proc = SPI_processed;
/* elog(DEBUG1,"xpath_table: SPI returned %d rows",proc); */ /* elog(DEBUG1,"xpath_table: SPI returned %d rows",proc); */

24
src/backend/commands/explain.c
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994-5, Regents of the University of California * Portions Copyright (c) 1994-5, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.144 2006/02/28 04:10:27 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.145 2006/03/01 06:51:01 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -232,7 +232,7 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
instr_time starttime; instr_time starttime;
double totaltime = 0; double totaltime = 0;
ExplainState *es; ExplainState *es;
StringInfo str; StringInfoData buf;
int eflags; int eflags;
INSTR_TIME_SET_CURRENT(starttime); INSTR_TIME_SET_CURRENT(starttime);
@ -285,9 +285,8 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
} }
} }
str = makeStringInfo(); initStringInfo(&buf);
explain_outNode(&buf, queryDesc->plantree, queryDesc->planstate,
explain_outNode(str, queryDesc->plantree, queryDesc->planstate,
NULL, 0, es); NULL, 0, es);
/* /*
@ -335,18 +334,18 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
if (trig->tgisconstraint && if (trig->tgisconstraint &&
(conname = GetConstraintNameForTrigger(trig->tgoid)) != NULL) (conname = GetConstraintNameForTrigger(trig->tgoid)) != NULL)
{ {
appendStringInfo(str, "Trigger for constraint %s", appendStringInfo(&buf, "Trigger for constraint %s",
conname); conname);
pfree(conname); pfree(conname);
} }
else else
appendStringInfo(str, "Trigger %s", trig->tgname); appendStringInfo(&buf, "Trigger %s", trig->tgname);
if (numrels > 1) if (numrels > 1)
appendStringInfo(str, " on %s", appendStringInfo(&buf, " on %s",
RelationGetRelationName(rInfo->ri_RelationDesc)); RelationGetRelationName(rInfo->ri_RelationDesc));
appendStringInfo(str, ": time=%.3f calls=%.0f\n", appendStringInfo(&buf, ": time=%.3f calls=%.0f\n",
1000.0 * instr->total, 1000.0 * instr->total,
instr->ntuples); instr->ntuples);
} }
@ -370,12 +369,11 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
totaltime += elapsed_time(&starttime); totaltime += elapsed_time(&starttime);
if (stmt->analyze) if (stmt->analyze)
appendStringInfo(str, "Total runtime: %.3f ms\n", appendStringInfo(&buf, "Total runtime: %.3f ms\n",
1000.0 * totaltime); 1000.0 * totaltime);
do_text_output_multiline(tstate, str->data); do_text_output_multiline(tstate, buf.data);
pfree(str->data); pfree(buf.data);
pfree(str);
pfree(es); pfree(es);
} }

55
src/backend/utils/adt/varlena.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.143 2006/02/26 02:23:41 neilc Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.144 2006/03/01 06:51:01 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2038,7 +2038,7 @@ replace_text(PG_FUNCTION_ARGS)
text *buf_text; text *buf_text;
text *ret_text; text *ret_text;
int curr_posn; int curr_posn;
StringInfo str; StringInfoData str;
if (src_text_len == 0 || from_sub_text_len == 0) if (src_text_len == 0 || from_sub_text_len == 0)
PG_RETURN_TEXT_P(src_text); PG_RETURN_TEXT_P(src_text);
@ -2049,7 +2049,7 @@ replace_text(PG_FUNCTION_ARGS)
if (curr_posn == 0) if (curr_posn == 0)
PG_RETURN_TEXT_P(src_text); PG_RETURN_TEXT_P(src_text);
str = makeStringInfo(); initStringInfo(&str);
buf_text = src_text; buf_text = src_text;
while (curr_posn > 0) while (curr_posn > 0)
@ -2059,8 +2059,8 @@ replace_text(PG_FUNCTION_ARGS)
right_text = text_substring(PointerGetDatum(buf_text), right_text = text_substring(PointerGetDatum(buf_text),
curr_posn + from_sub_text_len, -1, true); curr_posn + from_sub_text_len, -1, true);
appendStringInfoText(str, left_text); appendStringInfoText(&str, left_text);
appendStringInfoText(str, to_sub_text); appendStringInfoText(&str, to_sub_text);
if (buf_text != src_text) if (buf_text != src_text)
pfree(buf_text); pfree(buf_text);
@ -2069,13 +2069,12 @@ replace_text(PG_FUNCTION_ARGS)
curr_posn = TEXTPOS(buf_text, from_sub_text); curr_posn = TEXTPOS(buf_text, from_sub_text);
} }
appendStringInfoText(str, buf_text); appendStringInfoText(&str, buf_text);
if (buf_text != src_text) if (buf_text != src_text)
pfree(buf_text); pfree(buf_text);
ret_text = PG_STR_GET_TEXT(str->data); ret_text = PG_STR_GET_TEXT(str.data);
pfree(str->data); pfree(str.data);
pfree(str);
PG_RETURN_TEXT_P(ret_text); PG_RETURN_TEXT_P(ret_text);
} }
@ -2227,8 +2226,7 @@ replace_text_regexp(text *src_text, void *regexp,
text *ret_text; text *ret_text;
regex_t *re = (regex_t *) regexp; regex_t *re = (regex_t *) regexp;
int src_text_len = VARSIZE(src_text) - VARHDRSZ; int src_text_len = VARSIZE(src_text) - VARHDRSZ;
StringInfo str = makeStringInfo(); StringInfoData buf;
int regexec_result;
regmatch_t pmatch[REGEXP_REPLACE_BACKREF_CNT]; regmatch_t pmatch[REGEXP_REPLACE_BACKREF_CNT];
pg_wchar *data; pg_wchar *data;
size_t data_len; size_t data_len;
@ -2236,6 +2234,8 @@ replace_text_regexp(text *src_text, void *regexp,
int data_pos; int data_pos;
bool have_escape; bool have_escape;
initStringInfo(&buf);
/* Convert data string to wide characters. */ /* Convert data string to wide characters. */
data = (pg_wchar *) palloc((src_text_len + 1) * sizeof(pg_wchar)); data = (pg_wchar *) palloc((src_text_len + 1) * sizeof(pg_wchar));
data_len = pg_mb2wchar_with_len(VARDATA(src_text), data, src_text_len); data_len = pg_mb2wchar_with_len(VARDATA(src_text), data, src_text_len);
@ -2245,6 +2245,8 @@ replace_text_regexp(text *src_text, void *regexp,
for (search_start = data_pos = 0; search_start <= data_len;) for (search_start = data_pos = 0; search_start <= data_len;)
{ {
int regexec_result;
regexec_result = pg_regexec(re, regexec_result = pg_regexec(re,
data, data,
data_len, data_len,
@ -2254,20 +2256,19 @@ replace_text_regexp(text *src_text, void *regexp,
pmatch, pmatch,
0); 0);
if (regexec_result != REG_OKAY && regexec_result != REG_NOMATCH) if (regexec_result == REG_NOMATCH)
break;
if (regexec_result != REG_OKAY)
{ {
char errMsg[100]; char errMsg[100];
/* re failed??? */
pg_regerror(regexec_result, re, errMsg, sizeof(errMsg)); pg_regerror(regexec_result, re, errMsg, sizeof(errMsg));
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION), (errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
errmsg("regular expression failed: %s", errMsg))); errmsg("regular expression failed: %s", errMsg)));
} }
if (regexec_result == REG_NOMATCH)
break;
/* /*
* Copy the text to the left of the match position. Because we are * Copy the text to the left of the match position. Because we are
* working with character not byte indexes, it's easiest to use * working with character not byte indexes, it's easiest to use
@ -2281,7 +2282,7 @@ replace_text_regexp(text *src_text, void *regexp,
data_pos + 1, data_pos + 1,
pmatch[0].rm_so - data_pos, pmatch[0].rm_so - data_pos,
false); false);
appendStringInfoText(str, left_text); appendStringInfoText(&buf, left_text);
pfree(left_text); pfree(left_text);
} }
@ -2290,9 +2291,9 @@ replace_text_regexp(text *src_text, void *regexp,
* replace_text has escape characters. * replace_text has escape characters.
*/ */
if (have_escape) if (have_escape)
appendStringInfoRegexpSubstr(str, replace_text, pmatch, src_text); appendStringInfoRegexpSubstr(&buf, replace_text, pmatch, src_text);
else else
appendStringInfoText(str, replace_text); appendStringInfoText(&buf, replace_text);
search_start = data_pos = pmatch[0].rm_eo; search_start = data_pos = pmatch[0].rm_eo;
@ -2318,13 +2319,12 @@ replace_text_regexp(text *src_text, void *regexp,
right_text = text_substring(PointerGetDatum(src_text), right_text = text_substring(PointerGetDatum(src_text),
data_pos + 1, -1, true); data_pos + 1, -1, true);
appendStringInfoText(str, right_text); appendStringInfoText(&buf, right_text);
pfree(right_text); pfree(right_text);
} }
ret_text = PG_STR_GET_TEXT(str->data); ret_text = PG_STR_GET_TEXT(buf.data);
pfree(str->data); pfree(buf.data);
pfree(str);
pfree(data); pfree(data);
return ret_text; return ret_text;
@ -2512,7 +2512,7 @@ array_to_text(PG_FUNCTION_ARGS)
int typlen; int typlen;
bool typbyval; bool typbyval;
char typalign; char typalign;
StringInfo result_str = makeStringInfo(); StringInfoData buf;
bool printed = false; bool printed = false;
char *p; char *p;
bits8 *bitmap; bits8 *bitmap;
@ -2529,6 +2529,7 @@ array_to_text(PG_FUNCTION_ARGS)
PG_RETURN_TEXT_P(PG_STR_GET_TEXT("")); PG_RETURN_TEXT_P(PG_STR_GET_TEXT(""));
element_type = ARR_ELEMTYPE(v); element_type = ARR_ELEMTYPE(v);
initStringInfo(&buf);
/* /*
* We arrange to look up info about element type, including its output * We arrange to look up info about element type, including its output
@ -2583,9 +2584,9 @@ array_to_text(PG_FUNCTION_ARGS)
itemvalue)); itemvalue));
if (printed) if (printed)
appendStringInfo(result_str, "%s%s", fldsep, value); appendStringInfo(&buf, "%s%s", fldsep, value);
else else
appendStringInfoString(result_str, value); appendStringInfoString(&buf, value);
printed = true; printed = true;
p = att_addlength(p, typlen, PointerGetDatum(p)); p = att_addlength(p, typlen, PointerGetDatum(p));
@ -2604,7 +2605,7 @@ array_to_text(PG_FUNCTION_ARGS)
} }
} }
PG_RETURN_TEXT_P(PG_STR_GET_TEXT(result_str->data)); PG_RETURN_TEXT_P(PG_STR_GET_TEXT(buf.data));
} }
#define HEXBASE 16 #define HEXBASE 16

Write Preview
Loading…
Cancel
Save