Commitb04599c

committed

Merge branch 'PGPRO9_6-PGPRO-203-sr_plan' into PGPRO9_6

2 parents70461ca +e80ac8e commitb04599cCopy full SHA for b04599c

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ endif`
`23`	`23`
`24`	`24`	`genparser:`
`25`	`25`	`#test -d sr_plan_env \|\|`
`26`		-python gen_parser.py nodes.h `pg_config --includedir-server`
	`26`	+python gen_parser.py nodes.h `$(PG_CONFIG) --includedir-server`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ PlannedStmt sr_planner(Query parse,`
`60`	`60`	`boolfind_ok= false;`
`61`	`61`	`LOCKMODEheap_lock=AccessShareLock;`
`62`	`62`	`Oidquery_index_rel_oid;`
	`63`	`+Oidsr_plans_oid;`
`63`	`64`	`IndexScanDescquery_index_scan;`
`64`	`65`	`ScanKeyDatakey;`
`65`	`66`
`@@ -81,11 +82,19 @@ PlannedStmt sr_planner(Query parse,`
`81`	`82`	`sr_query_walker((Query*)parse,NULL);`
`82`	`83`
`83`	`84`	`sr_plans_table_rv=makeRangeVar("public","sr_plans",-1);`
`84`		`-sr_plans_heap=heap_openrv(sr_plans_table_rv,heap_lock);`
	`85`	`+/* First check existance of "sr_plans" table */`
	`86`	`+sr_plans_oid=RangeVarGetRelid(sr_plans_table_rv,heap_lock, true);`
	`87`	`+if (!OidIsValid(sr_plans_oid))`
	`88`	`+/* Just call standard_planner() if table doesn't exist. */`
	`89`	`+returnstandard_planner(parse,cursorOptions,boundParams);`
	`90`	`+`
	`91`	`+/* Table "sr_plans" exists */`
	`92`	`+sr_plans_heap=heap_open(sr_plans_oid,NoLock);`
`85`	`93`
`86`	`94`	`query_index_rel_oid=DatumGetObjectId(DirectFunctionCall1(to_regclass,PointerGetDatum(cstring_to_text("sr_plans_query_hash_idx"))));`
`87`	`95`	`if (query_index_rel_oid==InvalidOid)`
`88`	`96`	`{`
	`97`	`+heap_close(sr_plans_heap,heap_lock);`
`89`	`98`	`elog(WARNING,"Not found sr_plans_query_hash_idx index");`
`90`	`99`	`returnstandard_planner(parse,cursorOptions,boundParams);`
`91`	`100`	`}`

Comments

(0)