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

Micro-opt: replace calls like

Browse Source 
appendStringInfo(buf, "%s", str);
with
    appendStringInfoString(buf, str);
as the latter form is slightly faster.
REL8_0_STABLE
Neil Conway 22 years ago
parent d4fd7d85f3
commit 7b2cf1713d
6 changed files with 31 additions and 33 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. 4
      src/backend/commands/explain.c
  2. 6
      src/backend/nodes/outfuncs.c
  3. 4
      src/backend/utils/adt/regproc.c
  4. 38
      src/backend/utils/adt/ruleutils.c
  5. 4
      src/backend/utils/adt/varlena.c
  6. 8
      src/backend/utils/misc/guc.c

4
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.118 2003/11/29 19:51:47 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.119 2004/01/31 05:09:40 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1002,7 +1002,7 @@ show_sort_keys(List *tlist, int nkeys, AttrNumber *keycols,
/* And add to str */ /* And add to str */
if (keyno > 0) if (keyno > 0)
appendStringInfo(str, ", "); appendStringInfo(str, ", ");
appendStringInfo(str, "%s", exprstr); appendStringInfoString(str, exprstr);
} }
appendStringInfo(str, "\n"); appendStringInfo(str, "\n");

6
src/backend/nodes/outfuncs.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.231 2004/01/22 00:34:31 tgl Exp $ * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.232 2004/01/31 05:09:40 neilc Exp $
* *
* NOTES * NOTES
* Every node type that can appear in stored rules' parsetrees *must* * Every node type that can appear in stored rules' parsetrees *must*
@ -1427,7 +1427,7 @@ _outValue(StringInfo str, Value *value)
* We assume the value is a valid numeric literal and so does * We assume the value is a valid numeric literal and so does
* not need quoting. * not need quoting.
*/ */
appendStringInfo(str, "%s", value->val.str); appendStringInfoString(str, value->val.str);
break; break;
case T_String: case T_String:
appendStringInfoChar(str, '"'); appendStringInfoChar(str, '"');
@ -1436,7 +1436,7 @@ _outValue(StringInfo str, Value *value)
break; break;
case T_BitString: case T_BitString:
/* internal representation already has leading 'b' */ /* internal representation already has leading 'b' */
appendStringInfo(str, "%s", value->val.str); appendStringInfoString(str, value->val.str);
break; break;
default: default:
elog(ERROR, "unrecognized node type: %d", (int) value->type); elog(ERROR, "unrecognized node type: %d", (int) value->type);

4
src/backend/utils/adt/regproc.c
Unescape View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.85 2003/11/29 19:51:59 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.86 2004/01/31 05:09:40 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -340,7 +340,7 @@ format_procedure(Oid procedure_oid)
if (i > 0) if (i > 0)
appendStringInfoChar(&buf, ','); appendStringInfoChar(&buf, ',');
appendStringInfo(&buf, "%s", format_type_be(thisargtype)); appendStringInfoString(&buf, format_type_be(thisargtype));
} }
appendStringInfoChar(&buf, ')'); appendStringInfoChar(&buf, ')');

38
src/backend/utils/adt/ruleutils.c
Unescape View File

@ -3,7 +3,7 @@
* back to source text * back to source text
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.161 2003/12/28 21:57:37 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.162 2004/01/31 05:09:40 neilc Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -752,7 +752,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, int prettyFlags)
attname = get_relid_attribute_name(indrelid, attnum); attname = get_relid_attribute_name(indrelid, attnum);
if (!colno || colno == keyno + 1) if (!colno || colno == keyno + 1)
appendStringInfo(&buf, "%s", quote_identifier(attname)); appendStringInfoString(&buf, quote_identifier(attname));
keycoltype = get_atttype(indrelid, attnum); keycoltype = get_atttype(indrelid, attnum);
} }
else else
@ -772,7 +772,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, int prettyFlags)
/* Need parens if it's not a bare function call */ /* Need parens if it's not a bare function call */
if (indexkey && IsA(indexkey, FuncExpr) && if (indexkey && IsA(indexkey, FuncExpr) &&
((FuncExpr *) indexkey)->funcformat == COERCE_EXPLICIT_CALL) ((FuncExpr *) indexkey)->funcformat == COERCE_EXPLICIT_CALL)
appendStringInfo(&buf, "%s", str); appendStringInfoString(&buf, str);
else else
appendStringInfo(&buf, "(%s)", str); appendStringInfo(&buf, "(%s)", str);
} }
@ -947,7 +947,7 @@ pg_get_constraintdef_worker(Oid constraintId, int prettyFlags)
string = ""; /* keep compiler quiet */ string = ""; /* keep compiler quiet */
break; break;
} }
appendStringInfo(&buf, "%s", string); appendStringInfoString(&buf, string);
/* Add ON UPDATE and ON DELETE clauses, if needed */ /* Add ON UPDATE and ON DELETE clauses, if needed */
switch (conForm->confupdtype) switch (conForm->confupdtype)
@ -1126,11 +1126,9 @@ decompile_column_index_array(Datum column_index_array, Oid relId,
colName = get_relid_attribute_name(relId, DatumGetInt16(keys[j])); colName = get_relid_attribute_name(relId, DatumGetInt16(keys[j]));
if (j == 0) if (j == 0)
appendStringInfo(buf, "%s", appendStringInfoString(buf, quote_identifier(colName));
quote_identifier(colName));
else else
appendStringInfo(buf, ", %s", appendStringInfo(buf, ", %s", quote_identifier(colName));
quote_identifier(colName));
} }
} }
@ -2134,9 +2132,9 @@ get_insert_query_def(Query *query, deparse_context *context)
appendStringInfo(buf, sep); appendStringInfo(buf, sep);
sep = ", "; sep = ", ";
appendStringInfo(buf, "%s", appendStringInfoString(buf,
quote_identifier(get_relid_attribute_name(rte->relid, quote_identifier(get_relid_attribute_name(rte->relid,
tle->resdom->resno))); tle->resdom->resno)));
} }
appendStringInfo(buf, ") "); appendStringInfo(buf, ") ");
@ -2753,7 +2751,7 @@ get_rule_expr(Node *node, deparse_context *context,
quote_identifier(refname)); quote_identifier(refname));
} }
if (attname) if (attname)
appendStringInfo(buf, "%s", quote_identifier(attname)); appendStringInfoString(buf, quote_identifier(attname));
else else
appendStringInfo(buf, "*"); appendStringInfo(buf, "*");
} }
@ -3763,8 +3761,8 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
{ {
if (col != rte->alias->colnames) if (col != rte->alias->colnames)
appendStringInfo(buf, ", "); appendStringInfo(buf, ", ");
appendStringInfo(buf, "%s", appendStringInfoString(buf,
quote_identifier(strVal(lfirst(col)))); quote_identifier(strVal(lfirst(col))));
} }
appendStringInfoChar(buf, ')'); appendStringInfoChar(buf, ')');
} }
@ -3902,8 +3900,8 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
{ {
if (col != j->using) if (col != j->using)
appendStringInfo(buf, ", "); appendStringInfo(buf, ", ");
appendStringInfo(buf, "%s", appendStringInfoString(buf,
quote_identifier(strVal(lfirst(col)))); quote_identifier(strVal(lfirst(col))));
} }
appendStringInfoChar(buf, ')'); appendStringInfoChar(buf, ')');
} }
@ -3934,7 +3932,7 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
{ {
if (col != j->alias->colnames) if (col != j->alias->colnames)
appendStringInfo(buf, ", "); appendStringInfo(buf, ", ");
appendStringInfo(buf, "%s", appendStringInfoString(buf,
quote_identifier(strVal(lfirst(col)))); quote_identifier(strVal(lfirst(col))));
} }
appendStringInfoChar(buf, ')'); appendStringInfoChar(buf, ')');
@ -4164,7 +4162,7 @@ quote_qualified_identifier(const char *namespace,
initStringInfo(&buf); initStringInfo(&buf);
if (namespace) if (namespace)
appendStringInfo(&buf, "%s.", quote_identifier(namespace)); appendStringInfo(&buf, "%s.", quote_identifier(namespace));
appendStringInfo(&buf, "%s", quote_identifier(ident)); appendStringInfoString(&buf, quote_identifier(ident));
return buf.data; return buf.data;
} }
@ -4316,7 +4314,7 @@ generate_operator_name(Oid operid, Oid arg1, Oid arg2)
appendStringInfo(&buf, "OPERATOR(%s.", quote_identifier(nspname)); appendStringInfo(&buf, "OPERATOR(%s.", quote_identifier(nspname));
} }
appendStringInfo(&buf, "%s", oprname); appendStringInfoString(&buf, oprname);
if (nspname) if (nspname)
appendStringInfoChar(&buf, ')'); appendStringInfoChar(&buf, ')');
@ -4338,7 +4336,7 @@ print_operator_name(StringInfo buf, List *opname)
int nnames = length(opname); int nnames = length(opname);
if (nnames == 1) if (nnames == 1)
appendStringInfo(buf, "%s", strVal(lfirst(opname))); appendStringInfoString(buf, strVal(lfirst(opname)));
else else
{ {
appendStringInfo(buf, "OPERATOR("); appendStringInfo(buf, "OPERATOR(");

4
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.110 2004/01/31 00:45:21 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.111 2004/01/31 05:09:40 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2232,7 +2232,7 @@ array_to_text(PG_FUNCTION_ARGS)
if (i > 0) if (i > 0)
appendStringInfo(result_str, "%s%s", fldsep, value); appendStringInfo(result_str, "%s%s", fldsep, value);
else else
appendStringInfo(result_str, "%s", value); appendStringInfoString(result_str, value);
p = att_addlength(p, typlen, PointerGetDatum(p)); p = att_addlength(p, typlen, PointerGetDatum(p));
p = (char *) att_align(p, typalign); p = (char *) att_align(p, typalign);

8
src/backend/utils/misc/guc.c
Unescape View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.181 2004/01/26 22:35:32 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.182 2004/01/31 05:09:41 neilc Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -3259,7 +3259,7 @@ flatten_set_variable_args(const char *name, List *args)
break; break;
case T_Float: case T_Float:
/* represented as a string, so just copy it */ /* represented as a string, so just copy it */
appendStringInfo(&buf, "%s", strVal(&arg->val)); appendStringInfoString(&buf, strVal(&arg->val));
break; break;
case T_String: case T_String:
val = strVal(&arg->val); val = strVal(&arg->val);
@ -3293,9 +3293,9 @@ flatten_set_variable_args(const char *name, List *args)
* mode, quote it if it's not a vanilla identifier. * mode, quote it if it's not a vanilla identifier.
*/ */
if (flags & GUC_LIST_QUOTE) if (flags & GUC_LIST_QUOTE)
appendStringInfo(&buf, "%s", quote_identifier(val)); appendStringInfoString(&buf, quote_identifier(val));
else else
appendStringInfo(&buf, "%s", val); appendStringInfoString(&buf, val);
} }
break; break;
default: default:

Write Preview
Loading…
Cancel
Save