Merge master, resolve conflicts

funbringer · funbringer · commit 0fb9f6b06f0a · 2016-05-10T14:48:20.000+03:00
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -190,6 +190,16 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value = 2 OR value = 1;
          Filter: (value = 2)
 (5 rows)
 
+EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value BETWEEN 1 AND 2;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Append
+   ->  Seq Scan on hash_rel_1
+         Filter: ((value >= 1) AND (value <= 2))
+   ->  Seq Scan on hash_rel_2
+         Filter: ((value >= 1) AND (value <= 2))
+(5 rows)
+
 EXPLAIN (COSTS OFF) SELECT * FROM test.num_range_rel WHERE id > 2500;
             QUERY PLAN             
 -----------------------------------
diff --git a/hooks.c b/hooks.c
@@ -42,6 +42,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 					   *otherclauses;
 	ListCell		   *lc;
 	double				paramsel;
+	WalkerContext		context;
 
 	if (set_join_pathlist_next)
 		set_join_pathlist_next(root, joinrel, outerrel,
@@ -81,7 +82,12 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	{
 		WrapperNode	   *wrap;
 
-		wrap = walk_expr_tree(NULL, (Expr *) lfirst(lc), inner_prel);
+		context.prel = inner_prel;
+		context.econtext = NULL;
+		context.hasLeast = false;
+		context.hasGreatest = false;
+
+		wrap = walk_expr_tree((Expr *) lfirst(lc), &context);
 		paramsel *= wrap->paramsel;
 	}
 
@@ -146,14 +152,15 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 
 	if (prel != NULL && found)
 	{
-		ListCell   *lc;
-		int			i;
-		Oid		   *dsm_arr;
-		List	   *ranges,
-				   *wrappers;
-		PathKey	   *pathkeyAsc = NULL,
-				   *pathkeyDesc = NULL;
-		double		paramsel = 1.0;
+		ListCell	   *lc;
+		int				i;
+		Oid			   *dsm_arr;
+		List		   *ranges,
+					   *wrappers;
+		PathKey		   *pathkeyAsc = NULL,
+					   *pathkeyDesc = NULL;
+		double			paramsel = 1.0;
+		WalkerContext	context;
 
 		if (prel->parttype == PT_RANGE)
 		{
@@ -192,15 +199,22 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		dsm_arr = (Oid *) dsm_array_get_pointer(&prel->children);
 		ranges = list_make1_int(make_irange(0, prel->children_count - 1, false));
 
+		context.prel = prel;
+		context.econtext = NULL;
+		context.hasLeast = false;
+		context.hasGreatest = false;
+
 		/* Make wrappers over restrictions and collect final rangeset */
 		wrappers = NIL;
 		foreach(lc, rel->baserestrictinfo)
 		{
-			WrapperNode *wrap;
+			WrapperNode	   *wrap;
+			RestrictInfo   *rinfo = (RestrictInfo*) lfirst(lc);
 
-			RestrictInfo *rinfo = (RestrictInfo*) lfirst(lc);
+			wrap = walk_expr_tree(rinfo->clause, &context);
+			if (!lc->next)
+				finish_least_greatest(wrap, &context);
 
-			wrap = walk_expr_tree(NULL, rinfo->clause, prel);
 			paramsel *= wrap->paramsel;
 			wrappers = lappend(wrappers, wrap);
 			ranges = irange_list_intersect(ranges, wrap->rangeset);
diff --git a/init.c b/init.c
@@ -284,7 +284,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)
 	Datum	vals[1];
 	Oid		oids[1] = {INT4OID};
 	bool	nulls[1] = {false};
-	
+
 	vals[0] = Int32GetDatum(parent_oid);
 	prel = get_pathman_relation_info(parent_oid, NULL);
 
@@ -351,7 +351,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)
 					 HeapTupleGetOid(tuple));
 			conbin = TextDatumGetCString(val);
 			expr = (Expr *) stringToNode(conbin);
-			
+
 			switch(prel->parttype)
 			{
 				case PT_RANGE:
@@ -378,7 +378,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)
 					re.child_oid = con->conrelid;
 					ranges[i] = re;
 					break;
-			
+
 				case PT_HASH:
 					if (!validate_hash_constraint(expr, prel, &hash))
 					{
diff --git a/nodes_common.c b/nodes_common.c
@@ -350,16 +350,20 @@ rescan_append_common(CustomScanState *node)
 	ListCell		   *lc;
 	Oid				   *parts;
 	int					nparts;
+	WalkerContext		wcxt;
 
 	ranges = list_make1_int(make_irange(0, prel->children_count - 1, false));
 
+	wcxt.prel = prel;
+	wcxt.econtext = econtext;
+	wcxt.hasLeast = false;
+	wcxt.hasGreatest = false;
+
 	foreach (lc, scan_state->custom_exprs)
 	{
 		WrapperNode	   *wn;
-		WalkerContext	wcxt;
 
-		wcxt.econtext = econtext;
-		wn = walk_expr_tree(&wcxt, (Expr *) lfirst(lc), prel);
+		wn = walk_expr_tree((Expr *) lfirst(lc), &wcxt);
 
 		ranges = irange_list_intersect(ranges, wn->rangeset);
 	}
diff --git a/pathman.h b/pathman.h
@@ -217,10 +217,17 @@ typedef struct
 
 typedef struct
 {
-	PlanState	   *pstate;
-	ExprContext	   *econtext;
+	const PartRelationInfo *prel;
+	bool					hasLeast,
+							hasGreatest;
+	Datum					least,
+							greatest;
+
+	PlanState			   *pstate;
+	ExprContext			   *econtext;
 } WalkerContext;
 
-WrapperNode *walk_expr_tree(WalkerContext *wcxt, Expr *expr, const PartRelationInfo *prel);
+WrapperNode *walk_expr_tree(Expr *expr, WalkerContext *context);
+void finish_least_greatest(WrapperNode *wrap, WalkerContext *context);
 
 #endif   /* PATHMAN_H */
diff --git a/pg_pathman.c b/pg_pathman.c
diff --git a/sql/pg_pathman.sql b/sql/pg_pathman.sql
