clean up

Author: zilder

src/include/compat/debug_compat_features.h

@@ -12,8 +12,6 @@
 #define ENABLE_PGPRO_PATCHES
 
 /* PgPro exclusive features */
-//#define ENABLE_EXPAND_RTE_HOOK
-//#define ENABLE_RELATION_TAGS
 #define ENABLE_PATHMAN_AWARE_COPY_WIN32
 
 /* Hacks for vanilla */

src/include/partition_filter.h

@@ -135,15 +135,10 @@ Oid * find_partitions_for_value(Datum value, Oid value_type,
 								const PartRelationInfo *prel,
 								int *nparts);
 
-// ResultRelInfoHolder * select_partition_for_insert(Datum value, Oid value_type,
-// 												  const PartRelationInfo *prel,
-// 												  ResultPartsStorage *parts_storage,
-// 												  EState *estate);
-ResultRelInfoHolder *
-select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
-							const PartRelationInfo *prel,
-							ResultPartsStorage *parts_storage,
-							EState *estate);
+ResultRelInfoHolder *select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
+												 const PartRelationInfo *prel,
+												 ResultPartsStorage *parts_storage,
+												 EState *estate);
 
 Plan * make_partition_filter(Plan *subplan,
 							 Oid parent_relid,

src/partition_creation.c

@@ -1300,7 +1300,6 @@ build_raw_hash_check_tree(Node *raw_expression,
 	A_Expr		   *eq_oper			= makeNode(A_Expr);
 	FuncCall	   *part_idx_call	= makeNode(FuncCall),
 				   *hash_call		= makeNode(FuncCall);
-	//ColumnRef	   *hashed_column	= makeNode(ColumnRef);
 	A_Const		   *part_idx_c		= makeNode(A_Const),
 				   *part_count_c	= makeNode(A_Const);
 

src/partition_filter.c

@@ -427,8 +427,6 @@ select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
 	Oid						selected_partid = InvalidOid;
 	Oid					   *parts;
 	int						nparts;
-	TupleTableSlot		   *tmp_slot;
-	// const PartRelationInfo *subprel;
 	bool					isnull;
 	ExprDoneCond			itemIsDone;
 	Datum					value;
@@ -457,7 +455,6 @@ select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
 	}
 	else selected_partid = parts[0];
 
-	// subprel = get_pathman_relation_info(state->partitioned_table))
 	/* Replace parent table with a suitable partition */
 	old_mcxt = MemoryContextSwitchTo(estate->es_query_cxt);
 	rri_holder = scan_result_parts_storage(selected_partid, parts_storage);
@@ -665,9 +662,6 @@ partition_filter_exec(CustomScanState *node)
 		MemoryContext				old_mcxt;
 		const PartRelationInfo	   *prel;
 		ResultRelInfoHolder		   *rri_holder;
-		// bool						isnull;
-		// Datum						value;
-		// ExprDoneCond				itemIsDone;
 		TupleTableSlot			   *tmp_slot;
 
 		/* Fetch PartRelationInfo for this partitioned relation */

src/pg_pathman.c

@@ -249,10 +249,14 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	child_rte = copyObject(parent_rte);
 	child_rte->relid			= child_oid;
 	child_rte->relkind			= child_relation->rd_rel->relkind;
-	// child_rte->inh				= false;	/* relation has no children */
+	child_rte->requiredPerms	= 0;		/* perform all checks on parent */
+	/*
+	 * If it is the parent relation, then set inh flag to false to prevent
+	 * further recursive unrolling. Else if relation is a child and has subclass
+	 * then we will need to check if there are subpartitions
+	 */
 	child_rte->inh = (child_oid != parent_rte->relid) ?
 		child_relation->rd_rel->relhassubclass : false;
-	child_rte->requiredPerms	= 0;		/* perform all checks on parent */
 
 	/* Add 'child_rte' to rtable and 'root->simple_rte_array' */
 	root->parse->rtable = lappend(root->parse->rtable, child_rte);
@@ -394,7 +398,7 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	}
 
 	/*
-	 * TODO: new!!!
+	 * Recursively expand child partition if it has subpartitions
 	 */
 	if (child_rte->inh)
 	{
@@ -1660,29 +1664,36 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti,
 			set_rel_consider_parallel_compat(root, childrel, childRTE);
 #endif
 
-		/* Compute child's access paths & sizes */
-		if (childRTE->relkind == RELKIND_FOREIGN_TABLE)
+		/*
+		 * If inh is True and pathlist is not null then it is a partitioned
+		 * table and we've already filled it, skip it. Otherwise build a
+		 * pathlist for it
+		 */
+		if(!childRTE->inh || childrel->pathlist == NIL)
 		{
-			/* childrel->rows should be >= 1 */
-			set_foreign_size(root, childrel, childRTE);
+			/* Compute child's access paths & sizes */
+			if (childRTE->relkind == RELKIND_FOREIGN_TABLE)
+			{
+				/* childrel->rows should be >= 1 */
+				set_foreign_size(root, childrel, childRTE);
 
-			/* If child IS dummy, ignore it */
-			if (IS_DUMMY_REL(childrel))
-				continue;
+				/* If child IS dummy, ignore it */
+				if (IS_DUMMY_REL(childrel))
+					continue;
 
-			set_foreign_pathlist(root, childrel, childRTE);
-		}
-		/* TODO: temporary!!! */
-		else if(!childRTE->inh || childrel->pathlist == NIL)
-		{
-			/* childrel->rows should be >= 1 */
-			set_plain_rel_size(root, childrel, childRTE);
+				set_foreign_pathlist(root, childrel, childRTE);
+			}
+			else 
+			{
+				/* childrel->rows should be >= 1 */
+				set_plain_rel_size(root, childrel, childRTE);
 
-			/* If child IS dummy, ignore it */
-			if (IS_DUMMY_REL(childrel))
-				continue;
+				/* If child IS dummy, ignore it */
+				if (IS_DUMMY_REL(childrel))
+					continue;
 
-			set_plain_rel_pathlist(root, childrel, childRTE);
+				set_plain_rel_pathlist(root, childrel, childRTE);
+			}
 		}
 
 		/* Set cheapest path for child */

src/utility_stmt_hooking.c

@@ -597,11 +597,8 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 	{
 		TupleTableSlot		   *slot,
 							   *tmp_slot;
-		// ExprDoneCond			itemIsDone;
 		bool					skip_tuple;
-								// isnull;
 		Oid						tuple_oid = InvalidOid;
-		// Datum					value;
 
 		const PartRelationInfo *prel;
 		ResultRelInfoHolder	   *rri_holder;
@@ -641,16 +638,8 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 		/* Execute expression */
 		tmp_slot = econtext->ecxt_scantuple;
 		econtext->ecxt_scantuple = slot;
-		// value = ExecEvalExpr(expr_state, econtext, &isnull, &itemIsDone);
-
-		// if (isnull)
-		// 	elog(ERROR, ERR_PART_ATTR_NULL);
-
-		// if (itemIsDone != ExprSingleResult)
-		// 	elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
 
 		/* Search for a matching partition */
-		// rri_holder = select_partition_for_insert(value,
 		rri_holder = select_partition_for_insert(econtext, expr_state, prel,
 												 &parts_storage, estate);
 		econtext->ecxt_scantuple = tmp_slot;