postgres-xc-committers Mailing List for Postgres-XC

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Project "Postgres-XC".

The branch, master has been updated
       via  4eb6e0b9b6d0a1d75ade7c80b2d22f64e8a84544 (commit)
      from  28f420edd65be1966f96bce37893a93f5cf10470 (commit)


- Log -----------------------------------------------------------------
commit 4eb6e0b9b6d0a1d75ade7c80b2d22f64e8a84544
Author: Michael P <mic...@us...>
Date:   Fri Jul 8 15:55:21 2011 +0900

    Improvement of expression push-down analysis to foreign servers
    
    This patch controls expressions by using the functionalities
    of XC's foreign data wrapper analysis functions.
    Basically, immutable functions/operators can be safely pushed down
    as well as arrays, constant values, booleans, external parameters, etc.
    
    For functions and operators, the expression can be pushed down if it has
    the same meaning for local and foreign server.
    
    This commit also cleans up a part of PGXC planner.

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 5022e84..7b28b89 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -39,6 +39,7 @@
 #ifdef PGXC
 #include "pgxc/pgxc.h"
 #include "pgxc/planner.h"
+#include "pgxc/postgresql_fdw.h"
 #include "access/sysattr.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
@@ -191,7 +192,6 @@ static Material *make_material(Plan *lefttree);
 
 #ifdef PGXC
 static void findReferencedVars(List *parent_vars, Plan *plan, List **out_tlist, Relids *out_relids);
-extern bool is_foreign_qual(Node *clause);
 static void create_remote_clause_expr(PlannerInfo *root, Plan *parent, StringInfo clauses,
 	  List *qual, RemoteQuery *scan);
 static void create_remote_expr(PlannerInfo *root, Plan *parent, StringInfo expr,
diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index 1cd33d1..098f8c9 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -36,6 +36,7 @@
 #include "pgxc/pgxc.h"
 #include "pgxc/locator.h"
 #include "pgxc/planner.h"
+#include "pgxc/postgresql_fdw.h"
 #include "tcop/pquery.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
@@ -170,7 +171,6 @@ static int handle_limit_offset(RemoteQuery *query_step, Query *query, PlannedStm
 static void InitXCWalkerContext(XCWalkerContext *context);
 static RemoteQuery *makeRemoteQuery(void);
 static void validate_part_col_updatable(const Query *query);
-static bool	is_pgxc_safe_func(Oid funcid);
 
 
 /*
@@ -1239,6 +1239,13 @@ examine_conditions_walker(Node *expr_node, XCWalkerContext *context)
 					 */
 					return false;
 				}
+				else
+				{
+					/* Check if this node can be pushed down. */
+					if (!is_foreign_qual((Node *) arg2))
+						return true;
+				}
+
 				/*
 				 * Check if it is an expression like pcol = expr, where pcol is
 				 * a partitioning column of the rel1 and planner could not
@@ -1267,13 +1274,19 @@ examine_conditions_walker(Node *expr_node, XCWalkerContext *context)
 					return false;
 				}
 			}
+			else
+			{
+				/* Check if this node can be pushed down. */
+				if (!is_foreign_qual((Node *) arg2))
+					return true;
+			}
 		}
 	}
 
 	/* See if the function is immutable, otherwise give up */
 	if (IsA(expr_node, FuncExpr))
 	{
-		if (!is_pgxc_safe_func(((FuncExpr*) expr_node)->funcid))
+		if (!is_foreign_qual((Node *) expr_node))
 			return true;
 	}
 
@@ -3143,64 +3156,6 @@ validate_part_col_updatable(const Query *query)
 	}
 }
 
-/*
- * See if it is safe to use this function in single step.
- *
- * Based on is_immutable_func from postgresql_fdw.c
- * We add an exeption for base postgresql functions, to
- * allow now() and others to still execute as part of single step
- * queries.
- *
- * PGXCTODO - we currently make the false assumption that immutable
- * functions will not write to the database. This could be addressed
- * by either a more thorough analysis of functions at
- * creation time or additional tags at creation time (preferably
- * in standard PostgreSQL). Ideally such functionality could be
- * committed back to standard PostgreSQL.
- */
-bool
-is_pgxc_safe_func(Oid funcid)
-{
-	HeapTuple		tp;
-	bool			isnull;
-	Datum			datum;
-	bool			ret_val = false;
-
-	tp = SearchSysCache(PROCOID, ObjectIdGetDatum(funcid), 0, 0, 0);
-	if (!HeapTupleIsValid(tp))
-		elog(ERROR, "cache lookup failed for function %u", funcid);
-
-#ifdef DEBUG_FDW
-	/* print function name and its immutability */
-	{
-		char		   *proname;
-		datum = SysCacheGetAttr(PROCOID, tp, Anum_pg_proc_proname, &isnull);
-		proname = pstrdup(DatumGetName(datum)->data);
-		elog(DEBUG1, "func %s(%u) is%s immutable", proname, funcid,
-			(DatumGetChar(datum) == PROVOLATILE_IMMUTABLE) ? "" : " not");
-		pfree(proname);
-	}
-#endif
-
-	datum = SysCacheGetAttr(PROCOID, tp, Anum_pg_proc_provolatile, &isnull);
-
-	if (DatumGetChar(datum) == PROVOLATILE_IMMUTABLE)
-		ret_val = true;
-	/*
-	 * Also allow stable and volatile ones that are in the PG_CATALOG_NAMESPACE
-	 * this allows now() and others that do not update the database
-	 * PGXCTODO - examine default functions carefully for those that may
-	 * write to the database.
-	 */
-	else
-	{
-		datum = SysCacheGetAttr(PROCOID, tp, Anum_pg_proc_pronamespace, &isnull);
-		if (DatumGetObjectId(datum) == PG_CATALOG_NAMESPACE)
-			ret_val = true;
-	}
-	ReleaseSysCache(tp);
-	return ret_val;
-}
 
 /*
  * GetHashExecNodes -
diff --git a/src/backend/pgxc/pool/postgresql_fdw.c b/src/backend/pgxc/pool/postgresql_fdw.c
index 93c30b2..1a158a6 100644
--- a/src/backend/pgxc/pool/postgresql_fdw.c
+++ b/src/backend/pgxc/pool/postgresql_fdw.c
@@ -10,30 +10,25 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
-
+#include "pgxc/postgresql_fdw.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "funcapi.h"
-//#include "libpq-fe.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
 #include "parser/scansup.h"
-#include "pgxc/execRemote.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 
-//#include "dblink.h"
-
 #define DEBUG_FDW
 
 /*
- * WHERE caluse optimization level
+ * WHERE clause optimization level
  */
 #define EVAL_QUAL_LOCAL		0	/* evaluate none in foreign, all in local */
 #define EVAL_QUAL_BOTH		1	/* evaluate some in foreign, all in local */
@@ -41,14 +36,8 @@
 
 #define OPTIMIZE_WHERE_CLAUSE	EVAL_QUAL_FOREIGN
 
-
-
 /* deparse SQL from the request */
-bool is_immutable_func(Oid funcid);
-bool is_foreign_qual(Node *node);
 static bool foreign_qual_walker(Node *node, void *context);
-char *deparseSql(RemoteQueryState *scanstate);
-
 
 /*
  * Check whether the function is IMMUTABLE.
diff --git a/src/include/pgxc/planner.h b/src/include/pgxc/planner.h
index 1a18c9f..4228fbf 100644
--- a/src/include/pgxc/planner.h
+++ b/src/include/pgxc/planner.h
@@ -138,8 +138,6 @@ extern PlannedStmt *pgxc_planner(Query *query, int cursorOptions,
 extern Plan *pgxc_grouping_planner(PlannerInfo *root, Plan *agg_plan);
 extern bool IsHashDistributable(Oid col_type);
 
-extern bool is_immutable_func(Oid funcid);
-
 extern bool IsJoinReducible(RemoteQuery *innernode, RemoteQuery *outernode,
 					List *rtable_list, JoinPath *join_path, JoinReduceInfo *join_info);
 
diff --git a/src/include/pgxc/postgresql_fdw.h b/src/include/pgxc/postgresql_fdw.h
new file mode 100644
index 0000000..563236c
--- /dev/null
+++ b/src/include/pgxc/postgresql_fdw.h
@@ -0,0 +1,24 @@
+/*-------------------------------------------------------------------------
+ *
+ * postgresql_fdw.h
+ *
+ *		foreign-data wrapper for PostgreSQL
+ *
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	$PostgreSQL$
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef POSTGRES_FDW_H
+#define POSTGRES_FDW_H
+
+#include "postgres.h"
+#include "pgxc/execRemote.h"
+
+bool is_immutable_func(Oid funcid);
+bool is_foreign_qual(Node *node);
+char *deparseSql(RemoteQueryState *scanstate);
+#endif

-----------------------------------------------------------------------

Summary of changes:
 src/backend/optimizer/plan/createplan.c |    2 +-
 src/backend/pgxc/plan/planner.c         |   75 ++++++------------------------
 src/backend/pgxc/pool/postgresql_fdw.c  |   15 +-----
 src/include/pgxc/planner.h              |    2 -
 src/include/pgxc/postgresql_fdw.h       |   24 ++++++++++
 5 files changed, 42 insertions(+), 76 deletions(-)
 create mode 100644 src/include/pgxc/postgresql_fdw.h


hooks/post-receive
-- 
Postgres-XC




2010	Jan	Feb	Mar	Apr (4)	May (28)	Jun (12)	Jul (11)	Aug (12)	Sep (5)	Oct (19)	Nov (14)	Dec (12)
2011	Jan (18)	Feb (30)	Mar (115)	Apr (89)	May (50)	Jun (44)	Jul (22)	Aug (13)	Sep (11)	Oct (30)	Nov (28)	Dec (39)
2012	Jan (38)	Feb (18)	Mar (43)	Apr (91)	May (108)	Jun (46)	Jul (37)	Aug (44)	Sep (33)	Oct (29)	Nov (36)	Dec (15)
2013	Jan (35)	Feb (611)	Mar (5)	Apr (55)	May (30)	Jun (28)	Jul (458)	Aug (34)	Sep (9)	Oct (39)	Nov (22)	Dec (32)
2014	Jan (16)	Feb (16)	Mar (42)	Apr (179)	May (7)	Jun (6)	Jul (9)	Aug	Sep (4)	Oct	Nov (3)	Dec
2015	Jan	Feb	Mar	Apr (2)	May (4)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
					1	2
3	4	5 (2)	6 (2)	7	8 (2)	9
10	11 (1)	12 (1)	13	14 (2)	15 (2)	16
17	18 (1)	19	20	21 (2)	22	23
24	25 (1)	26	27 (2)	28 (2)	29 (2)	30
31

postgres-xc-committers Mailing List for Postgres-XC

postgres-xc-committers — Announces PG-XC repository commits