Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e6a759

Browse files
committed
Use appendBinaryStringInfo in more places where the length is known
When we already know the length that we're going to append, then itmakes sense to use appendBinaryStringInfo instead ofappendStringInfoString so that the append can be performed with a simplememcpy() using a known length rather than having to first perform astrlen() call to obtain the length.Discussion:https://postgr.es/m/CAKJS1f8+FRAM1s5+mAa3isajeEoAaicJ=4e0WzrH3tAusbbiMQ@mail.gmail.com
1 parent1978172 commit1e6a759

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

‎contrib/postgres_fdw/deparse.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
15311531
{
15321532
Assert(fpinfo->jointype==JOIN_INNER);
15331533
Assert(fpinfo->joinclauses==NIL);
1534-
appendStringInfoString(buf,join_sql_o.data);
1534+
appendBinaryStringInfo(buf,join_sql_o.data,join_sql_o.len);
15351535
return;
15361536
}
15371537
}
@@ -1552,7 +1552,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
15521552
{
15531553
Assert(fpinfo->jointype==JOIN_INNER);
15541554
Assert(fpinfo->joinclauses==NIL);
1555-
appendStringInfoString(buf,join_sql_i.data);
1555+
appendBinaryStringInfo(buf,join_sql_i.data,join_sql_i.len);
15561556
return;
15571557
}
15581558
}

‎src/backend/executor/execMain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,7 @@ ExecBuildSlotValueDescription(Oid reloid,
22902290
/* truncate if needed */
22912291
vallen=strlen(val);
22922292
if (vallen <=maxfieldlen)
2293-
appendStringInfoString(&buf,val);
2293+
appendBinaryStringInfo(&buf,val,vallen);
22942294
else
22952295
{
22962296
vallen=pg_mbcliplen(val,vallen,maxfieldlen);
@@ -2309,7 +2309,7 @@ ExecBuildSlotValueDescription(Oid reloid,
23092309
if (!table_perm)
23102310
{
23112311
appendStringInfoString(&collist,") = ");
2312-
appendStringInfoString(&collist,buf.data);
2312+
appendBinaryStringInfo(&collist,buf.data,buf.len);
23132313

23142314
returncollist.data;
23152315
}

‎src/backend/executor/execPartition.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,7 @@ ExecBuildSlotPartitionKeyDescription(Relation rel,
14061406
/* truncate if needed */
14071407
vallen=strlen(val);
14081408
if (vallen <=maxfieldlen)
1409-
appendStringInfoString(&buf,val);
1409+
appendBinaryStringInfo(&buf,val,vallen);
14101410
else
14111411
{
14121412
vallen=pg_mbcliplen(val,vallen,maxfieldlen);

‎src/backend/storage/lmgr/deadlock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ DeadLockReport(void)
11151115
}
11161116

11171117
/* Duplicate all the above for the server ... */
1118-
appendStringInfoString(&logbuf,clientbuf.data);
1118+
appendBinaryStringInfo(&logbuf,clientbuf.data,clientbuf.len);
11191119

11201120
/* ... and add info about query strings */
11211121
for (i=0;i<nDeadlockDetails;i++)

‎src/backend/utils/adt/ri_triggers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
927927
queryoids[i]=pk_type;
928928
queryoids[j]=pk_type;
929929
}
930-
appendStringInfoString(&querybuf,qualbuf.data);
930+
appendBinaryStringInfo(&querybuf,qualbuf.data,qualbuf.len);
931931

932932
/* Prepare and save the plan */
933933
qplan=ri_PlanCheck(querybuf.data,riinfo->nkeys*2,queryoids,
@@ -1106,7 +1106,7 @@ ri_set(TriggerData *trigdata, bool is_set_null)
11061106
qualsep="AND";
11071107
queryoids[i]=pk_type;
11081108
}
1109-
appendStringInfoString(&querybuf,qualbuf.data);
1109+
appendBinaryStringInfo(&querybuf,qualbuf.data,qualbuf.len);
11101110

11111111
/* Prepare and save the plan */
11121112
qplan=ri_PlanCheck(querybuf.data,riinfo->nkeys,queryoids,

‎src/backend/utils/adt/ruleutils.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,9 +2804,9 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
28042804
appendStringInfoChar(&dq,'x');
28052805
appendStringInfoChar(&dq,'$');
28062806

2807-
appendStringInfoString(&buf,dq.data);
2807+
appendBinaryStringInfo(&buf,dq.data,dq.len);
28082808
appendStringInfoString(&buf,prosrc);
2809-
appendStringInfoString(&buf,dq.data);
2809+
appendBinaryStringInfo(&buf,dq.data,dq.len);
28102810

28112811
appendStringInfoChar(&buf,'\n');
28122812

@@ -2930,7 +2930,7 @@ print_function_rettype(StringInfo buf, HeapTuple proctup)
29302930
appendStringInfoString(&rbuf,format_type_be(proc->prorettype));
29312931
}
29322932

2933-
appendStringInfoString(buf,rbuf.data);
2933+
appendBinaryStringInfo(buf,rbuf.data,rbuf.len);
29342934
}
29352935

29362936
/*
@@ -5682,7 +5682,7 @@ get_target_list(List *targetList, deparse_context *context,
56825682
}
56835683

56845684
/* Add the new field */
5685-
appendStringInfoString(buf,targetbuf.data);
5685+
appendBinaryStringInfo(buf,targetbuf.data,targetbuf.len);
56865686
}
56875687

56885688
/* clean up */
@@ -9987,7 +9987,7 @@ get_from_clause(Query *query, const char *prefix, deparse_context *context)
99879987
}
99889988

99899989
/* Add the new item */
9990-
appendStringInfoString(buf,itembuf.data);
9990+
appendBinaryStringInfo(buf,itembuf.data,itembuf.len);
99919991

99929992
/* clean up */
99939993
pfree(itembuf.data);

‎src/backend/utils/adt/xml.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ xmlconcat(List *args)
559559
0,
560560
global_standalone);
561561

562-
appendStringInfoString(&buf2,buf.data);
562+
appendBinaryStringInfo(&buf2,buf.data,buf.len);
563563
buf=buf2;
564564
}
565565

@@ -1879,7 +1879,8 @@ xml_errorHandler(void *data, xmlErrorPtr error)
18791879
if (xmlerrcxt->strictness==PG_XML_STRICTNESS_LEGACY)
18801880
{
18811881
appendStringInfoLineSeparator(&xmlerrcxt->err_buf);
1882-
appendStringInfoString(&xmlerrcxt->err_buf,errorBuf->data);
1882+
appendBinaryStringInfo(&xmlerrcxt->err_buf,errorBuf->data,
1883+
errorBuf->len);
18831884

18841885
pfree(errorBuf->data);
18851886
pfree(errorBuf);
@@ -1897,7 +1898,8 @@ xml_errorHandler(void *data, xmlErrorPtr error)
18971898
if (level >=XML_ERR_ERROR)
18981899
{
18991900
appendStringInfoLineSeparator(&xmlerrcxt->err_buf);
1900-
appendStringInfoString(&xmlerrcxt->err_buf,errorBuf->data);
1901+
appendBinaryStringInfo(&xmlerrcxt->err_buf,errorBuf->data,
1902+
errorBuf->len);
19011903

19021904
xmlerrcxt->err_occurred= true;
19031905
}
@@ -2874,7 +2876,7 @@ schema_to_xml_internal(Oid nspid, const char *xmlschema, bool nulls,
28742876
subres=table_to_xml_internal(relid,NULL,nulls,tableforest,
28752877
targetns, false);
28762878

2877-
appendStringInfoString(result,subres->data);
2879+
appendBinaryStringInfo(result,subres->data,subres->len);
28782880
appendStringInfoChar(result,'\n');
28792881
}
28802882

@@ -3049,7 +3051,7 @@ database_to_xml_internal(const char *xmlschema, bool nulls,
30493051
subres=schema_to_xml_internal(nspid,NULL,nulls,
30503052
tableforest,targetns, false);
30513053

3052-
appendStringInfoString(result,subres->data);
3054+
appendBinaryStringInfo(result,subres->data,subres->len);
30533055
appendStringInfoChar(result,'\n');
30543056
}
30553057

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp