Recovery sr_plan commits for version_1.1_stable branch

As part of the inclusion of scheduled mirroring, a significant part of the commits in the sr_plan repository was lost. This commit restores all the difference between the state of the code on gitlab and the actual code in the Std and EE branches

Author: dlepikhova

.gitignore

@@ -18,7 +18,6 @@ deserialize.c
 serialize.c
 
 sr_plan--1.1.sql
-sr_plan--1.2.sql
 pycparser
 /Mako*
 /site-packages

Makefile

@@ -6,12 +6,12 @@ OBJS = sr_plan.o $(WIN32RES)
 PGFILEDESC = "sr_plan - save and read plan"
 
 EXTENSION = sr_plan
-EXTVERSION = 1.2
+EXTVERSION = 1.1
 DATA_built = sr_plan--$(EXTVERSION).sql
-DATA = sr_plan--1.0--1.1.sql sr_plan--1.1--1.2.sql
+DATA = sr_plan--1.0--1.1.sql
 
 EXTRA_CLEAN = sr_plan--$(EXTVERSION).sql
-REGRESS = sr_plan sr_plan_schema joins explain
+REGRESS = security sr_plan sr_plan_schema
 
 ifdef USE_PGXS
 ifndef PG_CONFIG

README.md

@@ -41,7 +41,7 @@ Make an example query:
 select query_hash from sr_plans where query_hash=10;
 ```
 
-Disable saving the plan for the query:
+Disable saving the query:
 ```SQL
 set sr_plan.write_mode = false;
 ```
@@ -68,64 +68,3 @@ If we keep the plan for the query and enable it to be used also for the followin
 select query_hash from sr_plans where query_hash=1000+_p(11);
 select query_hash from sr_plans where query_hash=1000+_p(-5);
 ```
-
-## EXPLAIN for saved plans
-
-It is possible to see saved plans by using `show_plan` function. It requires
-knowing query hash which could be fetched from `sr_plans` table.
-
-Examples:
-
-Show enabled plan for query hash:
-
-```SQL
-SELECT show_plan(1);
-                  show_plan                   
-----------------------------------------------
- ("Seq Scan on public.explain_test")
- ("  Output: test_attr1, test_attr2")
- ("  Filter: (explain_test.test_attr1 = 10)")
-(3 rows)
-```
-
-Get second saved plan by using `index` parameter (ignores `enable` attribute):
-
-```SQL
-SELECT show_plan(1, index := 2);
-                  show_plan                   
-----------------------------------------------
- ("Seq Scan on public.explain_test")
- ("  Output: test_attr1, test_attr2")
- ("  Filter: (explain_test.test_attr1 = 10)")
-(3 rows)
-```
-
-Use another output format (supported formats are `json`, `text`, `xml`, `yaml`):
-
-```SQL
-SELECT show_plan(1, format := 'json');
-                      show_plan                       
-------------------------------------------------------
- ("[                                                 +
-   {                                                 +
-     ""Plan"": {                                     +
-       ""Node Type"": ""Seq Scan"",                  +
-       ""Parallel Aware"": false,                    +
-       ""Relation Name"": ""explain_test"",          +
-       ""Schema"": ""public"",                       +
-       ""Alias"": ""explain_test"",                  +
-       ""Output"": [""test_attr1"", ""test_attr2""], +
-       ""Filter"": ""(explain_test.test_attr1 = 10)""+
-     }                                               +
-   }                                                 +
- ]")
-(1 row)
-```
-
-## `pg_stat_statements` integration
-
-`sr_plans` table contains `query_id` columns which could be used to make
-joins with `pg_stat_statements` tables and views.
-
-Note: in `shared_preload_libraries` list `pg_stat_statements` should be
-specified after `sr_plan`.

expected/sr_plan.out

@@ -112,5 +112,4 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 (0 rows)
 
 DROP EXTENSION sr_plan CASCADE;
-NOTICE:  sr_plan was disabled
 DROP TABLE test_table;

init.sql

@@ -5,11 +5,10 @@
 
 CREATE TABLE sr_plans (
 	query_hash	int NOT NULL,
-	query_id	int8 NOT NULL,
 	plan_hash	int NOT NULL,
-	enable		boolean NOT NULL,
 	query		varchar NOT NULL,
 	plan		text NOT NULL,
+	enable		boolean NOT NULL,
 
 	reloids				oid[],
 	index_reloids		oid[]
@@ -21,17 +20,10 @@ CREATE INDEX sr_plans_query_index_oids ON sr_plans USING gin(index_reloids);
 
 CREATE FUNCTION _p(anyelement)
 RETURNS anyelement
-AS 'MODULE_PATHNAME', 'do_nothing'
+AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT VOLATILE;
 
-CREATE FUNCTION show_plan(query_hash int4,
-							index int4 default null,
-							format cstring default null)
-RETURNS SETOF RECORD
-AS 'MODULE_PATHNAME', 'show_plan'
-LANGUAGE C VOLATILE;
-
-CREATE OR REPLACE FUNCTION sr_plan_invalid_table() RETURNS event_trigger
+CREATE FUNCTION sr_plan_invalid_table() RETURNS event_trigger
 LANGUAGE plpgsql AS $$
 DECLARE
     obj		 record;

sql/sr_plan.sql

@@ -15,7 +15,6 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 
 UPDATE sr_plans SET enable = true;
 
-
 SELECT * FROM test_table WHERE test_attr1 = _p(10);
 SELECT * FROM test_table WHERE test_attr1 = _p(15);
 SELECT * FROM test_table WHERE test_attr1 = 10;

sr_plan--1.0--1.1.sql

@@ -1,5 +1,3 @@
-DROP FUNCTION sr_plan_invalid_table() CASCADE;
-DROP FUNCTION explain_jsonb_plan(jsonb) CASCADE;
 DROP TABLE sr_plans CASCADE;
 CREATE TABLE sr_plans (
 	query_hash	int NOT NULL,
@@ -16,25 +14,5 @@ CREATE INDEX sr_plans_query_hash_idx ON sr_plans (query_hash);
 CREATE INDEX sr_plans_query_oids ON sr_plans USING gin(reloids);
 CREATE INDEX sr_plans_query_index_oids ON sr_plans USING gin(index_reloids);
 
-CREATE OR REPLACE FUNCTION sr_plan_invalid_table() RETURNS event_trigger
-LANGUAGE plpgsql AS $$
-DECLARE
-    obj		 record;
-	indobj	 record;
-BEGIN
-    FOR obj IN SELECT * FROM pg_event_trigger_dropped_objects()
-		WHERE object_type = 'table' OR object_type = 'index'
-    LOOP
-		IF obj.object_type = 'table' THEN
-			DELETE FROM @[email protected]_plans WHERE reloids @> ARRAY[obj.objid];
-		ELSE
-			IF obj.object_type = 'index' THEN
-				DELETE FROM @[email protected]_plans WHERE index_reloids @> ARRAY[obj.objid];
-			END IF;
-		END IF;
-    END LOOP;
-END
-$$;
-
-CREATE EVENT TRIGGER sr_plan_invalid_table ON sql_drop
-    EXECUTE PROCEDURE sr_plan_invalid_table();
+DROP FUNCTION explain_jsonb_plan(jsonb) CASCADE;
+DROP FUNCTION sr_plan_invalid_table() CASCADE;