@@ -948,7 +948,7 @@ boolexpr_startup_fn(Node *clause, PredIterInfo info)
948
948
typedef struct
949
949
{
950
950
OpExpr opexpr ;
951
- Const constexpr ;
951
+ Const const_expr ;
952
952
int next_elem ;
953
953
int num_elems ;
954
954
Datum * elem_values ;
@@ -992,13 +992,13 @@ arrayconst_startup_fn(Node *clause, PredIterInfo info)
992
992
state -> opexpr .args = list_copy (saop -> args );
993
993
994
994
/* Set up a dummy Const node to hold the per-element values */
995
- state -> constexpr .xpr .type = T_Const ;
996
- state -> constexpr .consttype = ARR_ELEMTYPE (arrayval );
997
- state -> constexpr .consttypmod = -1 ;
998
- state -> constexpr .constcollid = arrayconst -> constcollid ;
999
- state -> constexpr .constlen = elmlen ;
1000
- state -> constexpr .constbyval = elmbyval ;
1001
- lsecond (state -> opexpr .args ) = & state -> constexpr ;
995
+ state -> const_expr .xpr .type = T_Const ;
996
+ state -> const_expr .consttype = ARR_ELEMTYPE (arrayval );
997
+ state -> const_expr .consttypmod = -1 ;
998
+ state -> const_expr .constcollid = arrayconst -> constcollid ;
999
+ state -> const_expr .constlen = elmlen ;
1000
+ state -> const_expr .constbyval = elmbyval ;
1001
+ lsecond (state -> opexpr .args ) = & state -> const_expr ;
1002
1002
1003
1003
/* Initialize iteration state */
1004
1004
state -> next_elem = 0 ;
@@ -1011,8 +1011,8 @@ arrayconst_next_fn(PredIterInfo info)
1011
1011
1012
1012
if (state -> next_elem >= state -> num_elems )
1013
1013
return NULL ;
1014
- state -> constexpr .constvalue = state -> elem_values [state -> next_elem ];
1015
- state -> constexpr .constisnull = state -> elem_nulls [state -> next_elem ];
1014
+ state -> const_expr .constvalue = state -> elem_values [state -> next_elem ];
1015
+ state -> const_expr .constisnull = state -> elem_nulls [state -> next_elem ];
1016
1016
state -> next_elem ++ ;
1017
1017
return (Node * ) & (state -> opexpr );
1018
1018
}
0 commit comments