Add nested planner support

ildus · ildus · commit d38e9a757ab1 · 2018-10-22T15:27:42.000+03:00
diff --git a/Makefile b/Makefile
@@ -28,5 +28,5 @@ dir='$(top_srcdir)/src/include'
 endif
 
 # uncomment this if you need autogeneration
-#serialize.c deserialize.c: gen_parser.py nodes.h serialize.mako deserialize.mako
-#	python gen_parser.py nodes.h $(dir)
+serialize.c deserialize.c: gen_parser.py nodes.h serialize.mako deserialize.mako
+	python gen_parser.py nodes.h $(dir)
diff --git a/install_python_deps.sh b/install_python_deps.sh
@@ -21,6 +21,7 @@ popd
 pushd $current_dir
 git clone https://github.com/pypa/setuptools.git
 pushd setuptools
+python bootstrap.py
 python setup.py install --install-lib $pythondir --install-scripts=$pythondir/bin
 popd
 rm -rf ./setuptools
@@ -29,12 +30,10 @@ popd
 # Mako
 pushd $currentdir
 makover=1.0.7
-curl -O https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-$makover.tar.gz
-tar xf Mako-$makover.tar.gz
-pushd Mako-$makover
+git clone https://bitbucket.org/zzzeek/mako.git
+pushd mako
 python setup.py install --install-lib $pythondir --install-scripts=$pythondir/bin
 popd
 
-rm Mako-$makover.tar.gz
-rm -rf ./Mako-$makover
+rm -rf ./mako
 popd
diff --git a/sr_plan.c b/sr_plan.c
@@ -176,6 +176,10 @@ sr_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	LOCKMODE		heap_lock =  AccessShareLock;
 	struct QueryParamsContext qp_context = {NULL};
 
+	static int		level = 0;
+
+	level++;
+
 #define call_standard_planner() \
 	(srplan_planner_hook_next ? \
 		srplan_planner_hook_next(parse, cursorOptions, boundParams) : \
@@ -185,7 +189,9 @@ sr_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	if (!OidIsValid(schema_oid))
 	{
 		/* Just call standard_planner() if schema doesn't exist. */
-		return call_standard_planner();
+		pl_stmt = call_standard_planner();
+		level--;
+		return pl_stmt;
 	}
 
 	if (sr_plan_fake_func)
@@ -235,10 +241,11 @@ sr_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	if (pl_stmt != NULL)
 		goto cleanup;
 
-	if (!sr_plan_write_mode)
+	if (!sr_plan_write_mode || level > 1)
 	{
 		/* quick way out if not in write mode */
 		pl_stmt = call_standard_planner();
+		level--;
 		goto cleanup;
 	}
 
@@ -260,6 +267,7 @@ sr_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	/* from now on we use this new plan */
 	pl_stmt = call_standard_planner();
+	level--;
 	out_jsonb2 = node_tree_to_jsonb(pl_stmt, 0, false);
 	plan_hash = DirectFunctionCall1(jsonb_hash, PointerGetDatum(out_jsonb2));
 
