| Revision | c94c75fc64170d3bd6444fdcab007ca17ddcd442 (tree) |
|---|---|
| Time | 2018-11-13 16:00:34 |
| Author | Kyotaro Horiguchi <horiguchi.kyotaro@lab....> |
| Commiter | Kyotaro Horiguchi |
Update core.c and make_jion_rel.c following core
Apply changes ever made on core.
core.c (diff) make_join_rel.c (diff)| @@ -39,7 +39,7 @@ | ||
| 39 | 39 | * restriction_is_constant_false() |
| 40 | 40 | * |
| 41 | 41 | * |
| 42 | - * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group | |
| 42 | + * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group | |
| 43 | 43 | * Portions Copyright (c) 1994, Regents of the University of California |
| 44 | 44 | * |
| 45 | 45 | *------------------------------------------------------------------------- |
| @@ -1076,6 +1076,9 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, | ||
| 1076 | 1076 | if (!IS_PARTITIONED_REL(joinrel)) |
| 1077 | 1077 | return; |
| 1078 | 1078 | |
| 1079 | + /* The join relation should have consider_partitionwise_join set. */ | |
| 1080 | + Assert(joinrel->consider_partitionwise_join); | |
| 1081 | + | |
| 1079 | 1082 | /* |
| 1080 | 1083 | * Since this join relation is partitioned, all the base relations |
| 1081 | 1084 | * participating in this join must be partitioned and so are all the |
| @@ -1084,6 +1087,10 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, | ||
| 1084 | 1087 | Assert(IS_PARTITIONED_REL(rel1) && IS_PARTITIONED_REL(rel2)); |
| 1085 | 1088 | Assert(REL_HAS_ALL_PART_PROPS(rel1) && REL_HAS_ALL_PART_PROPS(rel2)); |
| 1086 | 1089 | |
| 1090 | + /* The joining relations should have consider_partitionwise_join set. */ | |
| 1091 | + Assert(rel1->consider_partitionwise_join && | |
| 1092 | + rel2->consider_partitionwise_join); | |
| 1093 | + | |
| 1087 | 1094 | /* |
| 1088 | 1095 | * The partition scheme of the join relation should match that of the |
| 1089 | 1096 | * joining relations. |
| @@ -1163,4 +1170,3 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, | ||
| 1163 | 1170 | child_restrictlist); |
| 1164 | 1171 | } |
| 1165 | 1172 | } |
| 1166 | - |
| @@ -7,17 +7,13 @@ | ||
| 7 | 7 | * src/backend/optimizer/path/joinrels.c |
| 8 | 8 | * make_join_rel() |
| 9 | 9 | * |
| 10 | - * Portions Copyright (c) 2013-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION | |
| 11 | - * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group | |
| 10 | + * Portions Copyright (c) 2013-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION | |
| 11 | + * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group | |
| 12 | 12 | * Portions Copyright (c) 1994, Regents of the University of California |
| 13 | 13 | * |
| 14 | 14 | *------------------------------------------------------------------------- |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -static void populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1, | |
| 18 | - RelOptInfo *rel2, RelOptInfo *joinrel, | |
| 19 | - SpecialJoinInfo *sjinfo, List *restrictlist); | |
| 20 | - | |
| 21 | 17 | /* |
| 22 | 18 | * adjust_rows: tweak estimated row numbers according to the hint. |
| 23 | 19 | */ |
Fork