提交: c94c75fc64170d3bd6444fdcab007ca17ddcd442 - amalsyah12 (git)

firtst release

Commit MetaInfo

• 修訂: c94c75fc64170d3bd6444fdcab007ca17ddcd442 (tree)
• 時間: 2018-11-13 16:00:34
• 作者: Kyotaro Horiguchi <horiguchi.kyotaro@lab....>
• Commiter: Kyotaro Horiguchi

Log Message

Update core.c and make_jion_rel.c following core

Apply changes ever made on core.

Change Summary

• modified: core.c
• modified: make_join_rel.c

差異

--- a/core.c
+++ b/core.c
@@ -39,7 +39,7 @@
  *     restriction_is_constant_false()
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -1076,6 +1076,9 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 	if (!IS_PARTITIONED_REL(joinrel))
 		return;
 
+	/* The join relation should have consider_partitionwise_join set. */
+	Assert(joinrel->consider_partitionwise_join);
+
 	/*
 	 * Since this join relation is partitioned, all the base relations
 	 * 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,
 	Assert(IS_PARTITIONED_REL(rel1) && IS_PARTITIONED_REL(rel2));
 	Assert(REL_HAS_ALL_PART_PROPS(rel1) && REL_HAS_ALL_PART_PROPS(rel2));
 
+	/* The joining relations should have consider_partitionwise_join set. */
+	Assert(rel1->consider_partitionwise_join &&
+		   rel2->consider_partitionwise_join);
+
 	/*
 	 * The partition scheme of the join relation should match that of the
 	 * joining relations.
@@ -1163,4 +1170,3 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 									child_restrictlist);
 	}
 }
-

--- a/make_join_rel.c
+++ b/make_join_rel.c
@@ -7,17 +7,13 @@
  * src/backend/optimizer/path/joinrels.c
  *     make_join_rel()
  *
- * Portions Copyright (c) 2013-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
  */
 
-static void populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1,
-								RelOptInfo *rel2, RelOptInfo *joinrel,
-								SpecialJoinInfo *sjinfo, List *restrictlist);
-
 /*
  * adjust_rows: tweak estimated row numbers according to the hint.
  */