File tree Expand file tree Collapse file tree 2 files changed +7
-9
lines changed Expand file tree Collapse file tree 2 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -2970,7 +2970,7 @@ Datum vops_import(PG_FUNCTION_ARGS)
29702970 text * t = DatumGetTextP (val );
29712971 int elem_size = types [i ].len ;
29722972 int len = VARSIZE (t ) - VARHDRSZ ;
2973- char * dst = (char * )(tile + 1 );
2973+ dst = (char * )(tile + 1 );
29742974 if (len < elem_size ) {
29752975 memcpy (dst + j * elem_size , VARDATA (t ), len );
29762976 memset (dst + j * elem_size + len , 0 , elem_size - len );
Original file line number Diff line number Diff line change @@ -1215,10 +1215,11 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
12151215 */
12161216 foreach (l , aggvars )
12171217 {
1218- Expr * expr = (Expr * ) lfirst (l );
1218+ Expr * current_expr = (Expr * ) lfirst (l );
12191219
1220- if (IsA (expr , Aggref ))
1221- tlist = add_to_flat_tlist (tlist , list_make1 (expr ));
1220+ if (IsA (current_expr , Aggref ))
1221+ tlist = add_to_flat_tlist (tlist ,
1222+ list_make1 (current_expr ));
12221223 }
12231224 }
12241225 }
@@ -1240,8 +1241,6 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
12401241 */
12411242 if (root -> hasHavingQual && query -> havingQual )
12421243 {
1243- ListCell * lc ;
1244-
12451244 foreach (lc , (List * ) query -> havingQual )
12461245 {
12471246 Expr * expr = (Expr * ) lfirst (lc );
@@ -1259,9 +1258,8 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
12591258 */
12601259 if (fpinfo -> local_conds )
12611260 {
1262- ListCell * lc ;
1263- List * aggvars = pull_var_clause ((Node * ) fpinfo -> local_conds ,
1264- PVC_INCLUDE_AGGREGATES );
1261+ aggvars = pull_var_clause ((Node * ) fpinfo -> local_conds ,
1262+ PVC_INCLUDE_AGGREGATES );
12651263
12661264 foreach (lc , aggvars )
12671265 {
You can’t perform that action at this time.
0 commit comments