Skip to content

Commit 139c54f

Browse files
ashenBladeashenBlade
committed
test: remove alias for FAM type from configuration
If alias test will fail, then all tests that depends on it also will fail.
1 parent 45df562 commit 139c54f

File tree

11 files changed

+64
-87
lines changed

11 files changed

+64
-87
lines changed

‎src/test/patches/pg10.22.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ new file mode 100644
3535
index 00000000000..358d8795a48
3636
--- /dev/null
3737
+++ b/src/backend/optimizer/plan/vscodehelper.c
38-
@@ -0,0 +1,297 @@
38+
@@ -0,0 +1,295 @@
3939
+#include "postgres.h"
4040
+
4141
+#include "nodes/relation.h"
@@ -65,13 +65,11 @@ index 00000000000..358d8795a48
6565
+ int array[ARRAY_SIZE];
6666
+} TestFixedArray;
6767
+
68-
+typedef struct TestFlexibleArrayMemberData
68+
+typedef struct TestFlexibleArrayMember
6969
+{
7070
+ int length;
7171
+ int array[FLEXIBLE_ARRAY_MEMBER];
72-
+} TestFlexibleArrayMemberData;
73-
+
74-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
72+
+} TestFlexibleArrayMember;
7573
+
7674
+typedef struct CustomListElement
7775
+{
@@ -125,7 +123,7 @@ index 00000000000..358d8795a48
125123
+static testhash_hash *create_simplehash(void);
126124
+static List *create_custom_list(void);
127125
+static ArrayMember *create_special_array_member(void);
128-
+static TestFlexibleArrayMember create_flex_array_member(void);
126+
+static TestFlexibleArrayMember *create_flex_array_member(void);
129127
+
130128
+static HTAB *
131129
+create_htab(void)
@@ -219,10 +217,10 @@ index 00000000000..358d8795a48
219217
+ return array;
220218
+}
221219
+
222-
+static TestFlexibleArrayMember
220+
+static TestFlexibleArrayMember *
223221
+create_flex_array_member(void)
224222
+{
225-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
223+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
226224
+ member->length = ARRAY_SIZE;
227225
+ return member;
228226
+}
@@ -258,7 +256,7 @@ index 00000000000..358d8795a48
258256
+ testhash_hash *simplehash;
259257
+ List *custom_list;
260258
+ HTAB *htab;
261-
+ TestFlexibleArrayMember flexible_array_member;
259+
+ TestFlexibleArrayMember *flexible_array_member;
262260
+
263261
+ /* Node variables */
264262
+ Bitmapset *bms;

‎src/test/patches/pg11.22.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ new file mode 100644
3535
index 00000000000..76f2903e179
3636
--- /dev/null
3737
+++ b/src/backend/optimizer/plan/vscodehelper.c
38-
@@ -0,0 +1,288 @@
38+
@@ -0,0 +1,286 @@
3939
+#include "postgres.h"
4040
+
4141
+#include "nodes/relation.h"
@@ -65,13 +65,11 @@ index 00000000000..76f2903e179
6565
+ int array[ARRAY_SIZE];
6666
+} TestFixedArray;
6767
+
68-
+typedef struct TestFlexibleArrayMemberData
68+
+typedef struct TestFlexibleArrayMember
6969
+{
7070
+ int length;
7171
+ int array[FLEXIBLE_ARRAY_MEMBER];
72-
+} TestFlexibleArrayMemberData;
73-
+
74-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
72+
+} TestFlexibleArrayMember;
7573
+
7674
+typedef struct CustomListElement
7775
+{
@@ -124,7 +122,7 @@ index 00000000000..76f2903e179
124122
+static testhash_hash *create_simplehash(void);
125123
+static List *create_custom_list(void);
126124
+static ArrayMember *create_special_array_member(void);
127-
+static TestFlexibleArrayMember create_flex_array_member(void);
125+
+static TestFlexibleArrayMember *create_flex_array_member(void);
128126
+
129127
+static HTAB *
130128
+create_htab(void)
@@ -209,10 +207,10 @@ index 00000000000..76f2903e179
209207
+ return array;
210208
+}
211209
+
212-
+static TestFlexibleArrayMember
210+
+static TestFlexibleArrayMember *
213211
+create_flex_array_member(void)
214212
+{
215-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
213+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
216214
+ member->length = ARRAY_SIZE;
217215
+ return member;
218216
+}
@@ -249,7 +247,7 @@ index 00000000000..76f2903e179
249247
+ testhash_hash *simplehash;
250248
+ List *custom_list;
251249
+ HTAB *htab;
252-
+ TestFlexibleArrayMember flexible_array_member;
250+
+ TestFlexibleArrayMember *flexible_array_member;
253251
+
254252
+ /* Node variables */
255253
+ Bitmapset *bms;

‎src/test/patches/pg12.22.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ new file mode 100644
3535
index 00000000000..76f2903e179
3636
--- /dev/null
3737
+++ b/src/backend/optimizer/plan/vscodehelper.c
38-
@@ -0,0 +1,290 @@
38+
@@ -0,0 +1,288 @@
3939
+#include "postgres.h"
4040
+
4141
+#include "nodes/bitmapset.h"
@@ -68,13 +68,11 @@ index 00000000000..76f2903e179
6868
+ int array[ARRAY_SIZE];
6969
+} TestFixedArray;
7070
+
71-
+typedef struct TestFlexibleArrayMemberData
71+
+typedef struct TestFlexibleArrayMember
7272
+{
7373
+ int length;
7474
+ int array[FLEXIBLE_ARRAY_MEMBER];
75-
+} TestFlexibleArrayMemberData;
76-
+
77-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
75+
+} TestFlexibleArrayMember;
7876
+
7977
+typedef struct CustomListElement
8078
+{
@@ -127,7 +125,7 @@ index 00000000000..76f2903e179
127125
+static testhash_hash *create_simplehash(void);
128126
+static List *create_custom_list(void);
129127
+static ArrayMember *create_special_array_member(void);
130-
+static TestFlexibleArrayMember create_flex_array_member(void);
128+
+static TestFlexibleArrayMember *create_flex_array_member(void);
131129
+
132130
+static HTAB *
133131
+create_htab(void)
@@ -212,10 +210,10 @@ index 00000000000..76f2903e179
212210
+ return array;
213211
+}
214212
+
215-
+static TestFlexibleArrayMember
213+
+static TestFlexibleArrayMember *
216214
+create_flex_array_member(void)
217215
+{
218-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
216+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
219217
+ member->length = ARRAY_SIZE;
220218
+ return member;
221219
+}
@@ -251,7 +249,7 @@ index 00000000000..76f2903e179
251249
+ testhash_hash *simplehash;
252250
+ List *custom_list;
253251
+ HTAB *htab;
254-
+ TestFlexibleArrayMember flexible_array_member;
252+
+ TestFlexibleArrayMember *flexible_array_member;
255253
+
256254
+ /* Node variables */
257255
+ Bitmapset *bms;

‎src/test/patches/pg13.20.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ new file mode 100644
3636
index 00000000000..76f2903e179
3737
--- /dev/null
3838
+++ b/src/backend/optimizer/plan/vscodehelper.c
39-
@@ -0,0 +1,290 @@
39+
@@ -0,0 +1,288 @@
4040
+#include "postgres.h"
4141
+
4242
+#include "nodes/bitmapset.h"
@@ -69,13 +69,11 @@ index 00000000000..76f2903e179
6969
+ int array[ARRAY_SIZE];
7070
+} TestFixedArray;
7171
+
72-
+typedef struct TestFlexibleArrayMemberData
72+
+typedef struct TestFlexibleArrayMember
7373
+{
7474
+ int length;
7575
+ int array[FLEXIBLE_ARRAY_MEMBER];
76-
+} TestFlexibleArrayMemberData;
77-
+
78-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
76+
+} TestFlexibleArrayMember;
7977
+
8078
+typedef struct CustomListElement
8179
+{
@@ -128,7 +126,7 @@ index 00000000000..76f2903e179
128126
+static testhash_hash *create_simplehash(void);
129127
+static List *create_custom_list(void);
130128
+static ArrayMember *create_special_array_member(void);
131-
+static TestFlexibleArrayMember create_flex_array_member(void);
129+
+static TestFlexibleArrayMember *create_flex_array_member(void);
132130
+
133131
+static HTAB *
134132
+create_htab(void)
@@ -213,10 +211,10 @@ index 00000000000..76f2903e179
213211
+ return array;
214212
+}
215213
+
216-
+static TestFlexibleArrayMember
214+
+static TestFlexibleArrayMember *
217215
+create_flex_array_member(void)
218216
+{
219-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
217+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
220218
+ member->length = ARRAY_SIZE;
221219
+ return member;
222220
+}
@@ -252,7 +250,7 @@ index 00000000000..76f2903e179
252250
+ testhash_hash *simplehash;
253251
+ List *custom_list;
254252
+ HTAB *htab;
255-
+ TestFlexibleArrayMember flexible_array_member;
253+
+ TestFlexibleArrayMember *flexible_array_member;
256254
+
257255
+ /* Node variables */
258256
+ Bitmapset *bms;

‎src/test/patches/pg14.18.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ new file mode 100644
3636
index 00000000000..76f2903e179
3737
--- /dev/null
3838
+++ b/src/backend/optimizer/plan/vscodehelper.c
39-
@@ -0,0 +1,290 @@
39+
@@ -0,0 +1,288 @@
4040
+#include "postgres.h"
4141
+
4242
+#include "nodes/bitmapset.h"
@@ -69,13 +69,11 @@ index 00000000000..76f2903e179
6969
+ int array[ARRAY_SIZE];
7070
+} TestFixedArray;
7171
+
72-
+typedef struct TestFlexibleArrayMemberData
72+
+typedef struct TestFlexibleArrayMember
7373
+{
7474
+ int length;
7575
+ int array[FLEXIBLE_ARRAY_MEMBER];
76-
+} TestFlexibleArrayMemberData;
77-
+
78-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
76+
+} TestFlexibleArrayMember;
7977
+
8078
+typedef struct CustomListElement
8179
+{
@@ -128,7 +126,7 @@ index 00000000000..76f2903e179
128126
+static testhash_hash *create_simplehash(void);
129127
+static List *create_custom_list(void);
130128
+static ArrayMember *create_special_array_member(void);
131-
+static TestFlexibleArrayMember create_flex_array_member(void);
129+
+static TestFlexibleArrayMember *create_flex_array_member(void);
132130
+
133131
+static HTAB *
134132
+create_htab(void)
@@ -213,10 +211,10 @@ index 00000000000..76f2903e179
213211
+ return array;
214212
+}
215213
+
216-
+static TestFlexibleArrayMember
214+
+static TestFlexibleArrayMember *
217215
+create_flex_array_member(void)
218216
+{
219-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
217+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
220218
+ member->length = ARRAY_SIZE;
221219
+ return member;
222220
+}
@@ -252,7 +250,7 @@ index 00000000000..76f2903e179
252250
+ testhash_hash *simplehash;
253251
+ List *custom_list;
254252
+ HTAB *htab;
255-
+ TestFlexibleArrayMember flexible_array_member;
253+
+ TestFlexibleArrayMember *flexible_array_member;
256254
+
257255
+ /* Node variables */
258256
+ Bitmapset *bms;

‎src/test/patches/pg15.12.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ new file mode 100644
3636
index 00000000000..76f2903e179
3737
--- /dev/null
3838
+++ b/src/backend/optimizer/plan/vscodehelper.c
39-
@@ -0,0 +1,290 @@
39+
@@ -0,0 +1,288 @@
4040
+#include "postgres.h"
4141
+
4242
+#include "nodes/bitmapset.h"
@@ -69,13 +69,11 @@ index 00000000000..76f2903e179
6969
+ int array[ARRAY_SIZE];
7070
+} TestFixedArray;
7171
+
72-
+typedef struct TestFlexibleArrayMemberData
72+
+typedef struct TestFlexibleArrayMember
7373
+{
7474
+ int length;
7575
+ int array[FLEXIBLE_ARRAY_MEMBER];
76-
+} TestFlexibleArrayMemberData;
77-
+
78-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
76+
+} TestFlexibleArrayMember;
7977
+
8078
+typedef struct CustomListElement
8179
+{
@@ -128,7 +126,7 @@ index 00000000000..76f2903e179
128126
+static testhash_hash *create_simplehash(void);
129127
+static List *create_custom_list(void);
130128
+static ArrayMember *create_special_array_member(void);
131-
+static TestFlexibleArrayMember create_flex_array_member(void);
129+
+static TestFlexibleArrayMember *create_flex_array_member(void);
132130
+
133131
+static HTAB *
134132
+create_htab(void)
@@ -213,10 +211,10 @@ index 00000000000..76f2903e179
213211
+ return array;
214212
+}
215213
+
216-
+static TestFlexibleArrayMember
214+
+static TestFlexibleArrayMember *
217215
+create_flex_array_member(void)
218216
+{
219-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
217+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
220218
+ member->length = ARRAY_SIZE;
221219
+ return member;
222220
+}
@@ -252,7 +250,7 @@ index 00000000000..76f2903e179
252250
+ testhash_hash *simplehash;
253251
+ List *custom_list;
254252
+ HTAB *htab;
255-
+ TestFlexibleArrayMember flexible_array_member;
253+
+ TestFlexibleArrayMember *flexible_array_member;
256254
+
257255
+ /* Node variables */
258256
+ Bitmapset *bms;

‎src/test/patches/pg16.8.patch‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ new file mode 100644
3636
index 00000000000..76f2903e179
3737
--- /dev/null
3838
+++ b/src/backend/optimizer/plan/vscodehelper.c
39-
@@ -0,0 +1,290 @@
39+
@@ -0,0 +1,288 @@
4040
+#include "postgres.h"
4141
+
4242
+#include "nodes/bitmapset.h"
@@ -69,13 +69,11 @@ index 00000000000..76f2903e179
6969
+ int array[ARRAY_SIZE];
7070
+} TestFixedArray;
7171
+
72-
+typedef struct TestFlexibleArrayMemberData
72+
+typedef struct TestFlexibleArrayMember
7373
+{
7474
+ int length;
7575
+ int array[FLEXIBLE_ARRAY_MEMBER];
76-
+} TestFlexibleArrayMemberData;
77-
+
78-
+typedef TestFlexibleArrayMemberData *TestFlexibleArrayMember;
76+
+} TestFlexibleArrayMember;
7977
+
8078
+typedef struct CustomListElement
8179
+{
@@ -128,7 +126,7 @@ index 00000000000..76f2903e179
128126
+static testhash_hash *create_simplehash(void);
129127
+static List *create_custom_list(void);
130128
+static ArrayMember *create_special_array_member(void);
131-
+static TestFlexibleArrayMember create_flex_array_member(void);
129+
+static TestFlexibleArrayMember *create_flex_array_member(void);
132130
+
133131
+static HTAB *
134132
+create_htab(void)
@@ -213,10 +211,10 @@ index 00000000000..76f2903e179
213211
+ return array;
214212
+}
215213
+
216-
+static TestFlexibleArrayMember
214+
+static TestFlexibleArrayMember *
217215
+create_flex_array_member(void)
218216
+{
219-
+ TestFlexibleArrayMember member = palloc(offsetof(TestFlexibleArrayMemberData, array) + sizeof(int) * ARRAY_SIZE);
217+
+ TestFlexibleArrayMember *member = palloc(offsetof(TestFlexibleArrayMember, array) + sizeof(int) * ARRAY_SIZE);
220218
+ member->length = ARRAY_SIZE;
221219
+ return member;
222220
+}
@@ -252,7 +250,7 @@ index 00000000000..76f2903e179
252250
+ testhash_hash *simplehash;
253251
+ List *custom_list;
254252
+ HTAB *htab;
255-
+ TestFlexibleArrayMember flexible_array_member;
253+
+ TestFlexibleArrayMember *flexible_array_member;
256254
+
257255
+ /* Node variables */
258256
+ Bitmapset *bms;

0 commit comments

Comments
 (0)