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

Commitfaab7a9

Browse files
committed
Remove unnecessary local variables to work around an icc optimization bug.
Buildfarm member dunlin has been crashing since commit8b49a60, but othermachines seem fine with that code. It turns out that removing the localvariables in ordered_set_startup() that are copies of fields in "qstate"dodges the problem. This might cost a few cycles on register-richmachines, but it's probably a wash on others, and in any case this codeisn't performance-critical. Thanks to Jeremy Drake for off-listinvestigation.
1 parent192b4aa commitfaab7a9

File tree

1 file changed

+15
-25
lines changed

1 file changed

+15
-25
lines changed

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

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -159,27 +159,17 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
159159
if (use_tuples)
160160
{
161161
boolishypothetical= (aggref->aggkind==AGGKIND_HYPOTHETICAL);
162-
AttrNumber*sortColIdx;
163-
Oid*sortOperators;
164-
Oid*eqOperators;
165-
Oid*sortCollations;
166-
bool*sortNullsFirsts;
167162
ListCell*lc;
168163
inti;
169164

170165
if (ishypothetical)
171166
numSortCols++;/* make space for flag column */
172167
qstate->numSortCols=numSortCols;
173-
qstate->sortColIdx=sortColIdx=
174-
(AttrNumber*)palloc(numSortCols*sizeof(AttrNumber));
175-
qstate->sortOperators=sortOperators=
176-
(Oid*)palloc(numSortCols*sizeof(Oid));
177-
qstate->eqOperators=eqOperators=
178-
(Oid*)palloc(numSortCols*sizeof(Oid));
179-
qstate->sortCollations=sortCollations=
180-
(Oid*)palloc(numSortCols*sizeof(Oid));
181-
qstate->sortNullsFirsts=sortNullsFirsts=
182-
(bool*)palloc(numSortCols*sizeof(bool));
168+
qstate->sortColIdx= (AttrNumber*)palloc(numSortCols*sizeof(AttrNumber));
169+
qstate->sortOperators= (Oid*)palloc(numSortCols*sizeof(Oid));
170+
qstate->eqOperators= (Oid*)palloc(numSortCols*sizeof(Oid));
171+
qstate->sortCollations= (Oid*)palloc(numSortCols*sizeof(Oid));
172+
qstate->sortNullsFirsts= (bool*)palloc(numSortCols*sizeof(bool));
183173

184174
i=0;
185175
foreach(lc,sortlist)
@@ -191,22 +181,22 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
191181
/* the parser should have made sure of this */
192182
Assert(OidIsValid(sortcl->sortop));
193183

194-
sortColIdx[i]=tle->resno;
195-
sortOperators[i]=sortcl->sortop;
196-
eqOperators[i]=sortcl->eqop;
197-
sortCollations[i]=exprCollation((Node*)tle->expr);
198-
sortNullsFirsts[i]=sortcl->nulls_first;
184+
qstate->sortColIdx[i]=tle->resno;
185+
qstate->sortOperators[i]=sortcl->sortop;
186+
qstate->eqOperators[i]=sortcl->eqop;
187+
qstate->sortCollations[i]=exprCollation((Node*)tle->expr);
188+
qstate->sortNullsFirsts[i]=sortcl->nulls_first;
199189
i++;
200190
}
201191

202192
if (ishypothetical)
203193
{
204194
/* Add an integer flag column as the last sort column */
205-
sortColIdx[i]=list_length(aggref->args)+1;
206-
sortOperators[i]=Int4LessOperator;
207-
eqOperators[i]=Int4EqualOperator;
208-
sortCollations[i]=InvalidOid;
209-
sortNullsFirsts[i]= false;
195+
qstate->sortColIdx[i]=list_length(aggref->args)+1;
196+
qstate->sortOperators[i]=Int4LessOperator;
197+
qstate->eqOperators[i]=Int4EqualOperator;
198+
qstate->sortCollations[i]=InvalidOid;
199+
qstate->sortNullsFirsts[i]= false;
210200
i++;
211201
}
212202

0 commit comments

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