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

Commiteaedf0d

Browse files
committed
1 parent801386a commiteaedf0d

File tree

52 files changed

+224
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+224
-197
lines changed

‎contrib/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ soundex_code(char letter)
104104
#defineTH'0'
105105

106106
staticcharLookahead(char*word,inthow_far);
107-
staticvoid_metaphone(char*word,intmax_phonemes,char**phoned_word);
107+
staticvoid_metaphone(char*word,intmax_phonemes,char**phoned_word);
108108

109109
/* Metachar.h ... little bits about characters for metaphone */
110110

‎contrib/isn/isn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ string2ean(const char *str, bool errorOK, ean13 *result,
925925
* Exported routines.
926926
*---------------------------------------------------------*/
927927

928-
void_PG_init(void);
928+
void_PG_init(void);
929929

930930
void
931931
_PG_init(void)

‎src/backend/access/brin/brin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,8 @@ brinsummarize(Relation index, Relation heapRel, BlockNumber pageRange,
13141314

13151315
/*
13161316
* Unless requested to summarize even a partial range, go away now if
1317-
* we think the next range is partial. Caller would pass true when
1318-
*itis typically run once bulk data loading is done
1317+
* we think the next range is partial. Caller would pass true when it
1318+
* is typically run once bulk data loading is done
13191319
* (brin_summarize_new_values), and false when it is typically the
13201320
* result of arbitrarily-scheduled maintenance command (vacuuming).
13211321
*/

‎src/backend/access/common/printsimple.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ printsimple_startup(DestReceiver *self, int operation, TupleDesc tupdesc)
4141
Form_pg_attributeattr=TupleDescAttr(tupdesc,i);
4242

4343
pq_sendstring(&buf,NameStr(attr->attname));
44-
pq_sendint32(&buf,0);/* table oid */
45-
pq_sendint16(&buf,0);/* attnum */
44+
pq_sendint32(&buf,0);/* table oid */
45+
pq_sendint16(&buf,0);/* attnum */
4646
pq_sendint32(&buf, (int)attr->atttypid);
4747
pq_sendint16(&buf,attr->attlen);
4848
pq_sendint32(&buf,attr->atttypmod);
49-
pq_sendint16(&buf,0);/* format code */
49+
pq_sendint16(&buf,0);/* format code */
5050
}
5151

5252
pq_endmessage(&buf);

‎src/backend/access/transam/xlog.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6586,10 +6586,10 @@ StartupXLOG(void)
65866586
else
65876587
{
65886588
/*
6589-
* We used to attempt to go back to a secondary checkpoint
6590-
*recordhere, but only when not in standby_mode. We now
6591-
*just fail if wecan't read the last checkpoint because
6592-
*this allows us tosimplify processing around checkpoints.
6589+
* We used to attempt to go back to a secondary checkpoint record
6590+
* here, but only when not in standby_mode. We now just fail if we
6591+
* can't read the last checkpoint because this allows us to
6592+
* simplify processing around checkpoints.
65936593
*/
65946594
ereport(PANIC,
65956595
(errmsg("could not locate a valid checkpoint record")));
@@ -8888,7 +8888,8 @@ CreateCheckPoint(int flags)
88888888
(errmsg("concurrent write-ahead log activity while database system is shutting down")));
88898889

88908890
/*
8891-
* Remember the prior checkpoint's redo ptr for UpdateCheckPointDistanceEstimate()
8891+
* Remember the prior checkpoint's redo ptr for
8892+
* UpdateCheckPointDistanceEstimate()
88928893
*/
88938894
PriorRedoPtr=ControlFile->checkPointCopy.redo;
88948895

@@ -9211,7 +9212,8 @@ CreateRestartPoint(int flags)
92119212
CheckPointGuts(lastCheckPoint.redo,flags);
92129213

92139214
/*
9214-
* Remember the prior checkpoint's redo ptr for UpdateCheckPointDistanceEstimate()
9215+
* Remember the prior checkpoint's redo ptr for
9216+
* UpdateCheckPointDistanceEstimate()
92159217
*/
92169218
PriorRedoPtr=ControlFile->checkPointCopy.redo;
92179219

‎src/backend/access/transam/xlogutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ void
802802
XLogReadDetermineTimeline(XLogReaderState*state,XLogRecPtrwantPage,uint32wantLength)
803803
{
804804
constXLogRecPtrlastReadPage=state->readSegNo*
805-
state->wal_segment_size+state->readOff;
805+
state->wal_segment_size+state->readOff;
806806

807807
Assert(wantPage!=InvalidXLogRecPtr&&wantPage %XLOG_BLCKSZ==0);
808808
Assert(wantLength <=XLOG_BLCKSZ);

‎src/backend/catalog/partition.c

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,7 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
21342134

21352135
if (or_expr_args!=NIL)
21362136
{
2137-
Expr*other_parts_constr;
2137+
Expr*other_parts_constr;
21382138

21392139
/*
21402140
* Combine the constraints obtained for non-default partitions
@@ -2143,20 +2143,20 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
21432143
* useless repetition). Add the same now.
21442144
*/
21452145
other_parts_constr=
2146-
makeBoolExpr(AND_EXPR,
2147-
lappend(get_range_nulltest(key),
2148-
list_length(or_expr_args)>1
2149-
?makeBoolExpr(OR_EXPR,or_expr_args,
2150-
-1)
2151-
:linitial(or_expr_args)),
2152-
-1);
2146+
makeBoolExpr(AND_EXPR,
2147+
lappend(get_range_nulltest(key),
2148+
list_length(or_expr_args)>1
2149+
?makeBoolExpr(OR_EXPR,or_expr_args,
2150+
-1)
2151+
:linitial(or_expr_args)),
2152+
-1);
21532153

21542154
/*
21552155
* Finally, the default partition contains everything *NOT*
21562156
* contained in the non-default partitions.
21572157
*/
21582158
result=list_make1(makeBoolExpr(NOT_EXPR,
2159-
list_make1(other_parts_constr),-1));
2159+
list_make1(other_parts_constr),-1));
21602160
}
21612161

21622162
returnresult;
@@ -2502,9 +2502,9 @@ generate_partition_qual(Relation rel)
25022502
int
25032503
get_partition_for_tuple(Relationrelation,Datum*values,bool*isnull)
25042504
{
2505-
intbound_offset;
2506-
intpart_index=-1;
2507-
PartitionKeykey=RelationGetPartitionKey(relation);
2505+
intbound_offset;
2506+
intpart_index=-1;
2507+
PartitionKeykey=RelationGetPartitionKey(relation);
25082508
PartitionDescpartdesc=RelationGetPartitionDesc(relation);
25092509

25102510
/* Route as appropriate based on partitioning strategy. */
@@ -2513,8 +2513,8 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25132513
casePARTITION_STRATEGY_HASH:
25142514
{
25152515
PartitionBoundInfoboundinfo=partdesc->boundinfo;
2516-
intgreatest_modulus=get_greatest_modulus(boundinfo);
2517-
uint64rowHash=compute_hash_value(key,values,isnull);
2516+
intgreatest_modulus=get_greatest_modulus(boundinfo);
2517+
uint64rowHash=compute_hash_value(key,values,isnull);
25182518

25192519
part_index=boundinfo->indexes[rowHash %greatest_modulus];
25202520
}
@@ -2548,8 +2548,7 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25482548

25492549
/*
25502550
* No range includes NULL, so this will be accepted by the
2551-
* default partition if there is one, and otherwise
2552-
* rejected.
2551+
* default partition if there is one, and otherwise rejected.
25532552
*/
25542553
for (i=0;i<key->partnatts;i++)
25552554
{
@@ -2563,7 +2562,7 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25632562
if (!range_partkey_has_null)
25642563
{
25652564
bound_offset=partition_bound_bsearch(key,
2566-
partdesc->boundinfo,
2565+
partdesc->boundinfo,
25672566
values,
25682567
false,
25692568
&equal);
@@ -2585,8 +2584,8 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25852584
}
25862585

25872586
/*
2588-
* part_index < 0 means we failed to find a partition of this parent.
2589-
*Usethe default partition, if there is one.
2587+
* part_index < 0 means we failed to find a partition of this parent. Use
2588+
* the default partition, if there is one.
25902589
*/
25912590
if (part_index<0)
25922591
part_index=partdesc->boundinfo->default_index;
@@ -3125,7 +3124,7 @@ satisfies_hash_partition(PG_FUNCTION_ARGS)
31253124
boolvariadic_typbyval;
31263125
charvariadic_typalign;
31273126
FmgrInfopartsupfunc[PARTITION_MAX_KEYS];
3128-
}ColumnsHashData;
3127+
}ColumnsHashData;
31293128
OidparentId;
31303129
intmodulus;
31313130
intremainder;

‎src/backend/commands/copy.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ typedef struct CopyStateData
168168
PartitionDispatch*partition_dispatch_info;
169169
intnum_dispatch;/* Number of entries in the above array */
170170
intnum_partitions;/* Number of members in the following arrays */
171-
ResultRelInfo**partitions;/* Per partition result relation pointers */
171+
ResultRelInfo**partitions;/* Per partition result relation pointers */
172172
TupleConversionMap**partition_tupconv_maps;
173173
TupleTableSlot*partition_tuple_slot;
174174
TransitionCaptureState*transition_capture;
@@ -360,7 +360,7 @@ SendCopyBegin(CopyState cstate)
360360
pq_sendbyte(&buf,format);/* overall format */
361361
pq_sendint16(&buf,natts);
362362
for (i=0;i<natts;i++)
363-
pq_sendint16(&buf,format);/* per-column formats */
363+
pq_sendint16(&buf,format);/* per-column formats */
364364
pq_endmessage(&buf);
365365
cstate->copy_dest=COPY_NEW_FE;
366366
}
@@ -393,7 +393,7 @@ ReceiveCopyBegin(CopyState cstate)
393393
pq_sendbyte(&buf,format);/* overall format */
394394
pq_sendint16(&buf,natts);
395395
for (i=0;i<natts;i++)
396-
pq_sendint16(&buf,format);/* per-column formats */
396+
pq_sendint16(&buf,format);/* per-column formats */
397397
pq_endmessage(&buf);
398398
cstate->copy_dest=COPY_NEW_FE;
399399
cstate->fe_msgbuf=makeStringInfo();

‎src/backend/commands/vacuumlazy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
355355
params->log_min_duration))
356356
{
357357
StringInfoDatabuf;
358-
char*msgfmt;
358+
char*msgfmt;
359359

360360
TimestampDifference(starttime,endtime,&secs,&usecs);
361361

‎src/backend/executor/execPartition.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
184184
parent=pd[0];
185185
while (true)
186186
{
187-
PartitionDescpartdesc;
187+
PartitionDescpartdesc;
188188
TupleTableSlot*myslot=parent->tupslot;
189189
TupleConversionMap*map=parent->tupmap;
190-
intcur_index=-1;
190+
intcur_index=-1;
191191

192192
rel=parent->reldesc;
193193
partdesc=RelationGetPartitionDesc(rel);

‎src/backend/executor/nodeModifyTable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,8 +1518,8 @@ ExecSetupTransitionCaptureState(ModifyTableState *mtstate, EState *estate)
15181518
if (mtstate->mt_partition_dispatch_info!=NULL)
15191519
{
15201520
/*
1521-
* For tuple routing among partitions, we need TupleDescs based
1522-
*onthe partition routing table.
1521+
* For tuple routing among partitions, we need TupleDescs based on
1522+
* the partition routing table.
15231523
*/
15241524
ResultRelInfo**resultRelInfos=mtstate->mt_partitions;
15251525

‎src/backend/libpq/auth-scram.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,7 @@ read_client_first_message(scram_state *state, char *input)
791791
switch (*input)
792792
{
793793
case'n':
794+
794795
/*
795796
* The client does not support channel binding or has simply
796797
* decided to not use it. In that case just let it go.
@@ -805,6 +806,7 @@ read_client_first_message(scram_state *state, char *input)
805806
input++;
806807
break;
807808
case'y':
809+
808810
/*
809811
* The client supports channel binding and thinks that the server
810812
* does not. In this case, the server must fail authentication if
@@ -827,12 +829,13 @@ read_client_first_message(scram_state *state, char *input)
827829
input++;
828830
break;
829831
case'p':
832+
830833
/*
831834
* The client requires channel binding. Channel binding type
832835
* follows, e.g., "p=tls-unique".
833836
*/
834837
{
835-
char*channel_binding_type;
838+
char*channel_binding_type;
836839

837840
if (!state->ssl_in_use)
838841
{
@@ -1139,8 +1142,8 @@ read_client_final_message(scram_state *state, char *input)
11391142
b64_message[b64_message_len]='\0';
11401143

11411144
/*
1142-
* Compare the value sent by the client with the value expected by
1143-
*theserver.
1145+
* Compare the value sent by the client with the value expected by the
1146+
* server.
11441147
*/
11451148
if (strcmp(channel_binding,b64_message)!=0)
11461149
ereport(ERROR,

‎src/backend/libpq/auth.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ static struct pam_conv pam_passw_conv = {
100100
NULL
101101
};
102102

103-
staticconstchar*pam_passwd=NULL;/* Workaround for Solaris 2.6 brokenness */
103+
staticconstchar*pam_passwd=NULL;/* Workaround for Solaris 2.6
104+
* brokenness */
104105
staticPort*pam_port_cludge;/* Workaround for passing "Port *port" into
105106
* pam_passwd_conv_proc */
106107
#endif/* USE_PAM */
@@ -914,6 +915,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
914915
pfree(sasl_mechs);
915916

916917
#ifdefUSE_SSL
918+
917919
/*
918920
* Get data for channel binding.
919921
*/
@@ -2343,7 +2345,7 @@ CheckBSDAuth(Port *port, char *user)
23432345
*/
23442346
#ifdefUSE_LDAP
23452347

2346-
staticinterrdetail_for_ldap(LDAP*ldap);
2348+
staticinterrdetail_for_ldap(LDAP*ldap);
23472349

23482350
/*
23492351
* Initialize a connection to the LDAP server, including setting up
@@ -2514,7 +2516,7 @@ CheckLDAPAuth(Port *port)
25142516
char*filter;
25152517
LDAPMessage*search_message;
25162518
LDAPMessage*entry;
2517-
char*attributes[]= {LDAP_NO_ATTRS,NULL};
2519+
char*attributes[]= {LDAP_NO_ATTRS,NULL};
25182520
char*dn;
25192521
char*c;
25202522
intcount;

‎src/backend/optimizer/plan/setrefs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,7 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset)
17951795
staticvoid
17961796
set_param_references(PlannerInfo*root,Plan*plan)
17971797
{
1798-
Assert(IsA(plan,Gather)||IsA(plan,GatherMerge));
1798+
Assert(IsA(plan,Gather)||IsA(plan,GatherMerge));
17991799

18001800
if (plan->lefttree->extParam)
18011801
{

‎src/backend/optimizer/util/clauses.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ is_parallel_safe(PlannerInfo *root, Node *node)
11181118

11191119
foreach(l2,initsubplan->setParam)
11201120
context.safe_param_ids=lcons_int(lfirst_int(l2),
1121-
context.safe_param_ids);
1121+
context.safe_param_ids);
11221122
}
11231123
}
11241124

‎src/backend/optimizer/util/pathnode.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,7 +2412,7 @@ apply_projection_to_path(PlannerInfo *root,
24122412
* workers can help project. But if there is something that is not
24132413
* parallel-safe in the target expressions, then we can't.
24142414
*/
2415-
if ((IsA(path,GatherPath)||IsA(path,GatherMergePath))&&
2415+
if ((IsA(path,GatherPath)||IsA(path,GatherMergePath))&&
24162416
is_parallel_safe(root, (Node*)target->exprs))
24172417
{
24182418
/*
@@ -2421,9 +2421,9 @@ apply_projection_to_path(PlannerInfo *root,
24212421
* It seems unlikely at present that there could be any other
24222422
* references to the subpath, but better safe than sorry.
24232423
*
2424-
* Note that we don't change the parallel path's cost estimates; it might
2425-
* be appropriate to do so, to reflect the fact that the bulk of the
2426-
* target evaluation will happen in workers.
2424+
* Note that we don't change the parallel path's cost estimates; it
2425+
*mightbe appropriate to do so, to reflect the fact that the bulk of
2426+
*thetarget evaluation will happen in workers.
24272427
*/
24282428
if (IsA(path,GatherPath))
24292429
{

‎src/backend/optimizer/util/plancat.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ set_relation_partition_info(PlannerInfo *root, RelOptInfo *rel,
18251825
Relationrelation)
18261826
{
18271827
PartitionDescpartdesc;
1828-
PartitionKeypartkey;
1828+
PartitionKeypartkey;
18291829

18301830
Assert(relation->rd_rel->relkind==RELKIND_PARTITIONED_TABLE);
18311831

@@ -1890,8 +1890,8 @@ find_partition_scheme(PlannerInfo *root, Relation relation)
18901890

18911891
/*
18921892
* Did not find matching partition scheme. Create one copying relevant
1893-
* information from the relcache. We need to copy the contents of the array
1894-
* since the relcache entry may not survive after we have closed the
1893+
* information from the relcache. We need to copy the contents of the
1894+
*arraysince the relcache entry may not survive after we have closed the
18951895
* relation.
18961896
*/
18971897
part_scheme= (PartitionScheme)palloc0(sizeof(PartitionSchemeData));

0 commit comments

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