Change the schema from pg_catalog to pgivm

Previously, pg_upgrade failed due to the permission denied because the pg_ivm_immv catalog was in the pg_catalog catalog (Issue #79). To fix this, all objects created by pg_ivm are moved to theschema pgivm, which is also created by pg_ivm. pg_ivm is still not relocatable and this must be installed to the pgivm schema because the catalog and some internal functions are referred to unqualified by the schema name from the pg_ivm module. In future, this might be able to relocatable during installation, though. This commit affects compatibility with previous releases. To allow to access objects like create_immv function as previous, you need to qualify them with the schema name or setup search_path properly.
2025-02-17 12:03:47 +09:00
35 changed files with 144 additions and 5964 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,30 +1,8 @@
-# Object files
-*.o
-
-# Coverage files
-*.gcno
-*.gcda
-
-# Libraries
-*.lib
-*.a
-
-# LLVM bitcode
+# Global excludes across all subdirectories
 *.bc
-
-# Shared objects (inc. Windows DLLs)
-*.dll
+*.o
 *.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.app
-
-# Dependencies
-.deps
+regression.*

 # Generated subdirectories
 /results/
-/output_iso/
--- a/18
+++ b/18
@ -1,7 +1,5 @@
 # contrib/pg_ivm/Makefile

-PG_CONFIG ?= pg_config
-
 MODULE_big = pg_ivm
 OBJS = \
 	$(WIN32RES) \
@ -18,22 +16,10 @@ DATA = pg_ivm--1.0.sql \
       pg_ivm--1.3--1.4.sql pg_ivm--1.4--1.5.sql pg_ivm--1.5--1.6.sql \
       pg_ivm--1.6--1.7.sql pg_ivm--1.7--1.8.sql pg_ivm--1.8--1.9.sql \
       pg_ivm--1.9--1.10.sql \
-       pg_ivm--1.10.sql \
-       pg_ivm--1.10--1.11.sql pg_ivm--1.11--1.12.sql
+	   pg_ivm--1.10.sql

 REGRESS = pg_ivm create_immv refresh_immv

-PGVER = $(shell $(PG_CONFIG) --version | sed "s/^[^ ]* \([0-9]*\).*$$/\1/" 2>/dev/null)
-
-# We assume PG13 is the only version that is supported by pg_ivm but
-# missing pg_isolation_regress.
-
-ifneq ($(PGVER),13)
-ISOLATION = create_insert  refresh_insert  insert_insert \
-            create_insert2 refresh_insert2 insert_insert2 \
-            create_insert3 refresh_insert3 insert_insert3
-ISOLATION_OPTS = --load-extension=pg_ivm
-endif
-
+PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 The `pg_ivm` module provides Incremental View Maintenance (IVM) feature for PostgreSQL.

-The extension is compatible with PostgreSQL 13, 14, 15, 16, 17, and 18.
+The extension is compatible with PostgreSQL 13, 14, 15, 16, and 17.

 ## Description

@ -68,32 +68,19 @@ If you installed PostgreSQL from rpm or deb, you will need the devel package (fo

 > **Important:** Don't forget to set the `PG_CONFIG` variable (`make PG_CONFIG=...`) or the `PATH` to the `pg_config` command in case you want to use `pg_ivm` on a non-default or custom build of PostgreSQL. Read more [here](https://wiki.postgresql.org/wiki/Building_and_Installing_PostgreSQL_Extension_Modules).

-Once installed, execute `CREATE EXTENSION` comand.
+And, execute CREATE EXTENSION comand.

 ```sql
 CREATE EXTENSION pg_ivm;
 ```

-### Configuration
-
-To ensure `pg_ivm` maintains IMMVs correctly, add it to either shared_preload_libraries or session_preload_libraries in postgresql.conf:
-
-```
-# Add pg_ivm to preload libraries
-shared_preload_libraries = 'pg_ivm'
-# OR
-session_preload_libraries = 'pg_ivm'
-```
-
-After making this change, restart PostgreSQL for the configuration to take effect.
-
 ### RPM packages and yum repository

 RPM packages of pg_ivm are available from the [PostgreSQL yum repository](https://yum.postgresql.org/). See the [instruction](https://yum.postgresql.org/howto/) for details. Note that we are not the maintainer of this yum repository and RPMs for pg_ivm in it may be not always latest.

 ## Objects

-When `pg_ivm` is installed, the 'pgivm' schema is created, along with the following objects within this schema.
+When `pg_ivm` is installed, the following objects are created in the schema `pgivm`.

 ### Functions

@ -101,14 +88,12 @@ When `pg_ivm` is installed, the 'pgivm' schema is created, along with the follow

 Use `create_immv` function to create IMMV.
 ```
-pgivm.create_immv(immv_name text, view_definition text) RETURNS bigint
+pgivim.create_immv(immv_name text, view_definition text) RETURNS bigint
 ```
 `create_immv` defines a new IMMV of a query. A table of the name `immv_name` is created and a query specified by `view_definition` is executed and used to populate the IMMV. The query is stored in `pg_ivm_immv`, so that it can be refreshed later upon incremental view maintenance. `create_immv` returns the number of rows in the created IMMV.

 When an IMMV is created, some triggers are automatically created so that the view's contents are immediately updated when its base tables are modified. In addition, a unique index is created on the IMMV automatically if possible.  If the view definition query has a GROUP BY clause, a unique index is created on the columns of GROUP BY expressions. Also, if the view has DISTINCT clause, a unique index is created on all columns in the target list. Otherwise, if the IMMV contains all primary key attributes of its base tables in the target list, a unique index is created on these attributes.  In other cases, no index is created.

-`create_immv` acquires an `AccessExclusiveLock` on the view. However, even if we are able to acquire the lock, a concurrent transaction may have already incrementally updated and committed the view before we can acquire it. In the `REPEATABLE READ` or `SERIALIZABLE` isolation levels, this could lead to an inconsistent state of the view. Unfortunately, this situation cannot be detected during the creation of the view. As a result, `create_immv` raises a warning in these isolation levels, suggesting that the command be used in `READ COMMITTED` or that `refresh_immv` be executed afterward to make the view's contents remain consistent.
-
 Note that if you use PostgreSQL 17 or later, while `create_immv` is running, the `search_path` is temporarily changed to `pg_catalog, pg_temp`.

 #### refresh_immv
@ -120,9 +105,7 @@ pgivm.refresh_immv(immv_name text, with_data bool) RETURNS bigint

 `refresh_immv` completely replaces the contents of an IMMV as `REFRESH MATERIALIZED VIEW` command does for a materialized view. To execute this function you must be the owner of the IMMV (with PostgreSQL 16 or earlier) or have the `MAINTAIN` privilege on the IMMV (with PostgreSQL 17 or later).  The old contents are discarded.

-The with_data flag is corresponding to `WITH [NO] DATA` option of `REFRESH MATERIALIZED VIEW` command. If with_data is true, the backing query is executed to provide the new data, and if the IMMV is unpopulated, triggers for maintaining the view are created. Also, a unique index is created for IMMV if it is possible and the view doesn't have that yet. If with_data is false, no new data is generated and the IMMV become unpopulated, and the triggers are dropped from the IMMV. Note that unpopulated IMMV is still scannable although the result is empty. This behaviour may be changed in future to raise an error when an unpopulated IMMV is scanned.
-
-`refresh_immv` acquires `AccessExclusiveLock` on the view. However, even if we are able to acquire the lock, a concurrent transaction may have already incrementally updated and committed the view before we can acquire the lock.  In `REPEATABLE READ` or `SERIALIZABLE` isolation level, this could lead to an inconsistent state of the view. Therefore, an error is raised to prevent anomalies when this situation is detected.
+The with_data flag is corresponding to `WITH [NO] DATA` option of REFRESH MATERIALIZED VIEW` command. If with_data is true, the backing query is executed to provide the new data, and if the IMMV is unpopulated, triggers for maintaining the view are created. Also, a unique index is created for IMMV if it is possible and the view doesn't have that yet. If with_data is false, no new data is generated and the IMMV become unpopulated, and the triggers are dropped from the IMMV. Note that unpopulated IMMV is still scannable although the result is empty. This behaviour may be changed in future to raise an error when an unpopulated IMMV is scanned.

 Note that if you use PostgreSQL 17 or later, while `refresh_immv` is running, the `search_path` is temporarily changed to `pg_catalog, pg_temp`.

@ -142,13 +125,10 @@ The catalog `pgivm.pg_ivm_immv` stores IMMV information.
 |immvrelid|regclass|The OID of the IMMV|
 |viewdef|text|Query tree (in the form of a nodeToString() representation) for the view definition|
 |ispopulated|bool|True if IMMV is currently populated|
-|lastivmupdate|xid8|The transaction ID of the most recent incremental update to the view|


 ## Example

-### `CREATE MATERIALIZED VIEW` and `REFRESH MATERIALIZED VIEW`
-
 In general, IMMVs allow faster updates than `REFRESH MATERIALIZED VIEW` at the price of slower updates to their base tables. Update of base tables is slower because triggers will be invoked and the IMMV is updated in triggers per modification statement.

 For example, suppose a normal materialized view defined as below:
@ -172,8 +152,6 @@ REFRESH MATERIALIZED VIEW
 Time: 20575.721 ms (00:20.576)
 ```

-### Creating an IMMV
-
 On the other hand, after creating IMMV with the same view definition as below:

 ```
@ -187,7 +165,7 @@ NOTICE:  created index "immv_index" on immv "immv"
 (1 row)
 ```

-Updating a tuple in a base table takes more than the normal view, but its content is updated automatically and this is faster than the `REFRESH MATERIALIZED VIEW` command.
+updating a tuple in a base table takes more than the normal view, but its content is updated automatically and this is faster than the `REFRESH MATERIALIZED VIEW` command.

 ```sql
 test=# UPDATE pgbench_accounts SET abalance = 1234 WHERE aid = 1;
@ -216,131 +194,6 @@ UPDATE 1
 Time: 3224.741 ms (00:03.225)
 ```

-### IMMV with Aggregate Functions
-
-You can create an IMMV that includes aggregate functions.
-
-```sql
-test=# SELECT pgivm.create_immv('immv_agg',
-        'SELECT bid, count(*), sum(abalance), avg(abalance)
-         FROM pgbench_accounts JOIN pgbench_branches USING(bid) GROUP BY bid');
-NOTICE:  created index "immv_agg_index" on immv "immv_agg"
- create_immv 
-------------
-         100
-(1 row)
-
-Time: 5772.625 ms (00:05.773)
-```
-
-Creating this view takes about five seconds, and the normal refresh operation requires a similar amount of time. The following example demonstrates refreshing the IMMV using `refresh_immv`. The execution time would be approximately the same if you used `REFRESH MATERIALIZED VIEW` on a regular materialized view with the same definition.
-
-```sql
-test=# SELECT pgivm.refresh_immv('immv_agg',true);
- refresh_immv
--------------
-          100
-(1 row)
-
-Time: 5766.292 ms (00:05.766)
-```
-
-When a base table is updated, the IMMV is also automatically updated incrementally, as expected.
-
-```sql
-test=# SELECT bid, count, sum, avg FROM immv_agg WHERE bid = 42;
- bid | count  |  sum  |          avg
-----+--------+-------+------------------------
-  42 | 100000 | 38774 | 0.38774000000000000000
-(1 row)
-
-Time: 3.123 ms
-
-test=# UPDATE pgbench_accounts SET abalance = abalance + 1000 WHERE aid = 4112345 AND bid = 42;
-UPDATE 1
-Time: 16.616 ms
-
-test=# SELECT bid, count, sum, avg FROM immv_agg WHERE bid = 42;
- bid | count  |  sum  |          avg
-----+--------+-------+------------------------
-  42 | 100000 | 39774 | 0.39774000000000000000
-(1 row)
-
-Time: 1.987 ms
-```
-
-After updating a row in the `pgbench_accounts` table, you can see that the aggregated values in `immv_agg` are updated automatically.
-
-### Listing IMMVs and Viewing Their Definitions
-
-You can find all IMMVs in the `pg_ivm_immv` catalog and view their definition queries by executing the `get_immv_def` function."
-
-```sql
-test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM pgivm.pg_ivm_immv;
-   immv   |                  immv_def
----------+--------------------------------------------
- immv_agg |  SELECT pgbench_accounts.bid,             +
-          |     count(*) AS count,                    +
-          |     sum(pgbench_accounts.abalance) AS sum,+
-          |     avg(pgbench_accounts.abalance) AS avg +
-          |    FROM (pgbench_accounts                 +
-          |      JOIN pgbench_branches USING (bid))   +
-          |   GROUP BY pgbench_accounts.bid
- immv     |  SELECT a.aid,                            +
-          |     b.bid,                                +
-          |     a.abalance,                           +
-          |     b.bbalance                            +
-          |    FROM (pgbench_accounts a               +
-          |      JOIN pgbench_branches b USING (bid))
-(2 rows)
-```
-
-### Dropping an IMMV
-
-An IMMV can be dropped using the `DROP TABLE` command. Once an IMMV is dropped, its entry is automatically removed from the `pg_ivm_immv` catalog.
-
-```sql
-test=# DROP TABLE immv
-DROP TABLE
-
-test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM pgivm.pg_ivm_immv;
-   immv   |                  immv_def
----------+--------------------------------------------
- immv_agg |  SELECT pgbench_accounts.bid,             +
-          |     count(*) AS count,                    +
-          |     sum(pgbench_accounts.abalance) AS sum,+
-          |     avg(pgbench_accounts.abalance) AS avg +
-          |    FROM (pgbench_accounts                 +
-          |      JOIN pgbench_branches USING (bid))   +
-          |   GROUP BY pgbench_accounts.bid
-(1 row)
-```
-
-### Renaming an IMMV
-
-An IMMV can be renamed using the `ALTER TABLE` command.
-
-```sql
-test=# ALTER TABLE immv_agg RENAME TO immv_agg2;
-ALTER TABLE
-
-test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM pgivm.pg_ivm_immv;
-   immv    |                  immv_def
-----------+--------------------------------------------
- immv_agg2 |  SELECT pgbench_accounts.bid,             +
-           |     count(*) AS count,                    +
-           |     sum(pgbench_accounts.abalance) AS sum,+
-           |     avg(pgbench_accounts.abalance) AS avg +
-           |    FROM (pgbench_accounts                 +
-           |      JOIN pgbench_branches USING (bid))   +
-           |   GROUP BY pgbench_accounts.bid
-(1 row)
-```
-
-## `pg_dump` and `pg_upgrade`
-
-After restoring data from a `pg_dump` backup or upgrading `PostgreSQL` using `pg_upgrade`, all IMMVs must be manually dropped and recreated.
-
 ## Supported View Definitions and Restriction

 Currently, IMMV's view definition can contain inner joins, DISTINCT clause, some built-in aggregate functions, simple sub-queries in `FROM` clause, EXISTS sub-queries, and simple CTE (`WITH` query). Inner joins including self-join are supported, but outer joins are not supported. Supported aggregate functions are count, sum, avg, min and max. Other aggregates, sub-queries which contain an aggregate or `DISTINCT` clause, sub-queries in other than `FROM` clause, window functions, `HAVING`, `ORDER BY`, `LIMIT`/`OFFSET`, `UNION`/`INTERSECT`/`EXCEPT`, `DISTINCT ON`, `TABLESAMPLE`, `VALUES`, and `FOR UPDATE`/`SHARE` can not be used in view definition.
@ -406,19 +259,11 @@ When a base table is truncated, the IMMV is also truncated and the contents beco

 ### Concurrent Transactions

-Incremental updates of a view are basically performed in sequentially even with concurrent transactions running.
-
-Suppose an IMMV is defined on two base tables and each table is modified in different concurrent transactions simultaneously. In the transaction which was committed first, the IMMV can be updated considering only the change made in that transaction. However, to update the IMMV correctly in the transaction that commits later, we need to account for the changes made in both transactions.
-
- For this reason, `ExclusiveLock` is held on an IMMV immediately after a base table is modified in `READ COMMITTED` isolation level. This ensures that the IMMV is updated in the latter transaction only after the former transaction has committed.  In `REPEATABLE READ` or `SERIALIZABLE` isolation level, an error is raised immediately if lock acquisition fails, as changes made by other transactions are not visible in these levels,  and the IMMV cannot be updated correctly in such situations.
-
-However, as an exception if the IMMV has only one base table, does not  use DISTINCT or GROUP BY, and is modified by `INSERT`, then the lock held on the IMMV is `RowExclusiveLock`.
-
-Even if we are able to acquire a lock, a concurrent transaction may have already incrementally updated and committed the view before we can acquire the lock.  In `REPEATABLE READ` or `SERIALIZABLE` isolation level, this could lead to an inconsistent state of the view. Therefore, an error is raised to prevent anomalies when this situation is detected.
+Suppose an IMMV is defined on two base tables and each table was modified in different a concurrent transaction simultaneously. In the transaction which was committed first, the IMMV can be updated considering only the change which happened in this transaction. On the other hand, in order to update the IMMV correctly in the transaction which was committed later, we need to know the changes occurred in both transactions.  For this reason, `ExclusiveLock` is held on an IMMV immediately after a base table is modified in `READ COMMITTED` mode to make sure that the IMMV is updated in the latter transaction after the former transaction is committed.  In `REPEATABLE READ` or `SERIALIZABLE` mode, an error is raised immediately if lock acquisition fails because any changes which occurred in other transactions are not visible in these modes and IMMV cannot be updated correctly in such situations. However, as an exception if the IMMV has only one base table and doesn't use DISTINCT or GROUP BY, and the table is modified by `INSERT`, then the lock held on the IMMV is `RowExclusiveLock`.

 ### Row Level Security

-If some base tables have row level security policy, rows that are not visible to the materialized view's owner are excluded from the result.  In addition, such rows are excluded as well when views are incrementally maintained.  However, if a new policy is defined or policies are changed after the materialized view was created, the new policy will not be applied to the view contents.  To apply the new policy, you need to refresh or recreate the IMMV.
+If some base tables have row level security policy, rows that are not visible to the materialized view's owner are excluded from the result.  In addition, such rows are excluded as well when views are incrementally maintained.  However, if a new policy is defined or policies are changed after the materialized view was created, the new policy will not be applied to the view contents.  To apply the new policy, you need to recreate IMMV.

 ### How to Disable or Enable Immediate Maintenance

--- a/createas.c
+++ b/createas.c
@ -101,11 +101,7 @@ create_immv_internal(List *attrList, IntoClause *into)
 	CreateStmt *create = makeNode(CreateStmt);
 	char		relkind;
 	Datum		toast_options;
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	const char *const validnsps[] = HEAP_RELOPT_NAMESPACES;
-#else
 	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
-#endif
 	ObjectAddress intoRelationAddr;

 	/* This code supports both CREATE TABLE AS and CREATE MATERIALIZED VIEW */
@ -152,12 +148,7 @@ create_immv_internal(List *attrList, IntoClause *into)
 	NewRelationCreateToastTable(intoRelationAddr.objectId, toast_options);

 	/* Create the "view" part of an IMMV. */
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	StoreImmvQuery(intoRelationAddr.objectId, into->viewQuery);
-#else
 	StoreImmvQuery(intoRelationAddr.objectId, (Query *) into->viewQuery);
-#endif
-
 	CommandCounterIncrement();

 	return intoRelationAddr;
@ -294,7 +285,7 @@ ExecCreateImmv(ParseState *pstate, CreateTableAsStmt *stmt,
 	{
 		Relation matviewRel;

-		RefreshImmvByOid(address.objectId, true, false, pstate->p_sourcetext, qc);
+		RefreshImmvByOid(address.objectId, false, pstate->p_sourcetext, qc);

 		if (qc)
 			qc->commandTag = CMDTAG_SELECT;
@ -304,17 +295,10 @@ ExecCreateImmv(ParseState *pstate, CreateTableAsStmt *stmt,
 		/* Create an index on incremental maintainable materialized view, if possible */
 		CreateIndexOnIMMV(query, matviewRel);

-		/* Create triggers to prevent IMMV from being changed */
+		/* Create triggers to prevent IMMV from beeing changed */
 		CreateChangePreventTrigger(address.objectId);

 		table_close(matviewRel, NoLock);
-
-		if (IsolationUsesXactSnapshot())
-			ereport(WARNING,
-					(errmsg("inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ"),
-					 errdetail("The view may not include effects of a concurrent transaction."),
-					 errhint("create_immv should be used in isolation level READ COMMITTED, "
-							 "or execute refresh_immv to make sure the view is consistent.")));
 	}

 	return address;
@ -341,7 +325,7 @@ rewriteQueryForIMMV(Query *query, List *colNames)
 	FuncCall *fn;

 	/*
-	 * Check the length of column name list not to override names of
+	 * Check the length of colunm name list not to override names of
 	 * additional columns
 	 */
 	if (list_length(colNames) > list_length(query->targetList))
@ -1010,7 +994,7 @@ check_ivm_restriction_walker(Node *node, check_ivm_restriction_context *context)
 							 errmsg("WITH query name %s is not supported on incrementally maintainable materialized view", cte->ctename)));

 				/*
-				 * When a table in an unreferenced CTE is TRUNCATEd, the contents of the
+				 * When a table in a unreferenced CTE is TRUNCATEd, the contents of the
 				 * IMMV is not affected so it must not be truncated. For confirming it
 				 * at the maintenance time, we have to check if the modified table used
 				 * in a CTE is actually referenced. Although it would be possible, we
@ -1052,7 +1036,7 @@ check_ivm_restriction_walker(Node *node, check_ivm_restriction_context *context)
 				check_ivm_restriction_walker((Node *) from->fromlist, context);

 				/*
-				 * EXIST is allowed directly under FROM clause
+				 * EXIEST is allowed directly under FROM clause
 				 */
 				context->allow_exists = true;
 				check_ivm_restriction_walker(from->quals, context);
@ -1124,7 +1108,7 @@ check_ivm_restriction_walker(Node *node, check_ivm_restriction_context *context)
 							Node *opnode = (Node *) lfirst(lc);

 							/*
-							 * EXIST is allowed under AND expression only if it is
+							 * EXIEST is allowed under AND expression only if it is
 							 * directly under WHERE.
 							 */
 							if (allow_exists)
@ -1363,8 +1347,8 @@ check_aggregate_supports_ivm(Oid aggfnoid)
 * Create a unique index on incremental maintainable materialized view.
 * If the view definition query has a GROUP BY clause, the index is created
 * on the columns of GROUP BY expressions. Otherwise, if the view contains
- * all primary key attributes of its base tables in the target list, the index
- * is created on these attributes. In other cases, no index is created.
+ * all primary key attritubes of its base tables in the target list, the index
+ * is created on these attritubes. In other cases, no index is created.
 */
 void
 CreateIndexOnIMMV(Query *query, Relation matviewRel)
@ -1523,18 +1507,10 @@ CreateIndexOnIMMV(Query *query, Relation matviewRel)

 		indexRel = index_open(indexoid, AccessShareLock);

-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-		if (CheckIndexCompatible(indexRel->rd_id,
-								index->accessMethod,
-								index->indexParams,
-								index->excludeOpNames,
-								false))
-#else
 		if (CheckIndexCompatible(indexRel->rd_id,
 								index->accessMethod,
 								index->indexParams,
 								index->excludeOpNames))
-#endif
 			hasCompatibleIndex = true;

 		index_close(indexRel, AccessShareLock);
@ -1558,7 +1534,7 @@ CreateIndexOnIMMV(Query *query, Relation matviewRel)
 					idxname, RelationGetRelationName(matviewRel))));

 	/*
-	 * Make dependencies so that the index is dropped if any base tables'
+	 * Make dependencies so that the index is dropped if any base tables's
 	 * primary key is dropped.
 	 */
 	foreach(lc, constraintList)
@ -1721,7 +1697,7 @@ get_primary_key_attnos_from_query(Query *query, List **constraintList)
 }

 /*
- * Store the query for the IMMV to pg_ivm_immv
+ * Store the query for the IMMV to pg_ivwm_immv
 */
 static void
 StoreImmvQuery(Oid viewOid, Query *viewQuery)
@ -1740,7 +1716,6 @@ StoreImmvQuery(Oid viewOid, Query *viewQuery)
 	values[Anum_pg_ivm_immv_immvrelid -1 ] = ObjectIdGetDatum(viewOid);
 	values[Anum_pg_ivm_immv_ispopulated -1 ] = BoolGetDatum(false);
 	values[Anum_pg_ivm_immv_viewdef -1 ] = CStringGetTextDatum(querytree);
-	isNulls[Anum_pg_ivm_immv_lastivmupdate -1 ] = true;

 	pgIvmImmv = table_open(PgIvmImmvRelationId(), RowExclusiveLock);

--- a/expected/create_insert.out
+++ b/expected/create_insert.out
@ -1,325 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 create s2 insert c1 check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 create s2 c1 insert check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 create insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert create c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: <... completed>
-create_immv
-----------
-          2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 create c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 create c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: <... completed>
-create_immv
-----------
-          2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 create check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 create check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/create_insert2.out
+++ b/expected/create_insert2.out
@ -1,345 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 create s2 insert c1 check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 create s2 c1 insert check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 create insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert create c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: <... completed>
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s1 s2 create c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 create c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: <... completed>
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 create check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 create check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
--- a/expected/create_insert3.out
+++ b/expected/create_insert3.out
@ -1,329 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 create s2 insert c1 check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-ERROR:  could not serialize access due to read/write dependencies among transactions
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 create s2 c1 insert check2 c2 mv
-step s1: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not serialize access due to read/write dependencies among transactions
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 create insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-ERROR:  could not serialize access due to read/write dependencies among transactions
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert create c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: <... completed>
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s1 s2 create c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not serialize access due to read/write dependencies among transactions
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 create c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
- <waiting ...>
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: <... completed>
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 create check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 create check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-tx1: NOTICE:  could not create an index on immv "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
-HINT:  Create an index on the immv for efficient incremental maintenance.
-tx1: WARNING:  inconsistent view can be created in isolation level SERIALIZABLE or REPEATABLE READ
-DETAIL:  The view may not include effects of a concurrent transaction.
-HINT:  create_immv should be used in isolation level READ COMMITTED, or execute refresh_immv to make sure the view is consistent.
-step create: 
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-
-create_immv
-----------
-          1
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ng      
-(1 row)
-
--- a/expected/insert_insert.out
+++ b/expected/insert_insert.out
@ -1,497 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 update1 s2 update2 c1 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1; <waiting ...>
-step c1: COMMIT;
-step update2: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 update1 s2 c1 update2 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 update2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step update2: UPDATE b SET j = 111 WHERE i = 1; <waiting ...>
-step c1: COMMIT;
-step update2: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update2 update1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step update1: UPDATE a SET j = 11 WHERE i = 1; <waiting ...>
-step c2: COMMIT;
-step update1: <... completed>
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 c1 update2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 update1 c2 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1; <waiting ...>
-step c2: COMMIT;
-step update1: <... completed>
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 c2 update1 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 update2 c2 update1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201); <waiting ...>
-step c1: COMMIT;
-step insert2: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201); <waiting ...>
-step c1: COMMIT;
-step insert2: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert2 insert1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200); <waiting ...>
-step c2: COMMIT;
-step insert1: <... completed>
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 insert1 c2 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200); <waiting ...>
-step c2: COMMIT;
-step insert1: <... completed>
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert2 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-20|20|200
-20|20|201
-20|21|200
-20|21|201
-21|20|200
-21|20|201
-21|21|200
-21|21|201
-(12 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/insert_insert2.out
+++ b/expected/insert_insert2.out
@ -1,373 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 update1 s2 update2 c1 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 update1 s2 c1 update2 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 update2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update2 update1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 c1 update2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 update1 c2 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 c2 update1 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 update2 c2 update1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert2 insert1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 insert1 c2 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert2 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/insert_insert3.out
+++ b/expected/insert_insert3.out
@ -1,373 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 update1 s2 update2 c1 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 update1 s2 c1 update2 check2 c2 mv
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step s2: SELECT;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 update2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update2 update1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 update1 c1 update2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-step c1: COMMIT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-11|11|100
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 update1 c2 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 update2 s1 c2 update1 check1 c1 mv
-step s2: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step s1: SELECT;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 update2 c2 update1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step update2: UPDATE b SET j = 111 WHERE i = 1;
-step c2: COMMIT;
-step update1: UPDATE a SET j = 11 WHERE i = 1;
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|111
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 insert1 s2 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step s2: SELECT;
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 insert2 c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert2 insert1 c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert1 c1 insert2 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-step c1: COMMIT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-20|20|200
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 insert1 c2 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c2: COMMIT;
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert2 s1 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step s1: SELECT;
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert2 c2 insert1 check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert2: INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201);
-step c2: COMMIT;
-step insert1: INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv();
- x| y|  z
--+--+---
-10|10|100
-10|11|100
-11|10|100
-11|11|100
-21|21|201
-(5 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/pg_ivm.out
+++ b/expected/pg_ivm.out
@ -1,19 +1,14 @@
 CREATE EXTENSION pg_ivm;
 GRANT ALL ON SCHEMA public TO public;
 -- create a table to use as a basis for views and materialized views in various combinations
-CREATE TABLE mv_base_a (x int, i int, y int, j int);
-CREATE TABLE mv_base_b (x int, i int, y int, k int);
-- test for base tables with dropped columns
-ALTER TABLE mv_base_a DROP COLUMN x;
-ALTER TABLE mv_base_a DROP COLUMN y;
-ALTER TABLE mv_base_b DROP COLUMN x;
-ALTER TABLE mv_base_b DROP COLUMN y;
+CREATE TABLE mv_base_a (i int, j int);
 INSERT INTO mv_base_a VALUES
  (1,10),
  (2,20),
  (3,30),
  (4,40),
  (5,50);
+CREATE TABLE mv_base_b (i int, k int);
 INSERT INTO mv_base_b VALUES
  (1,101),
  (2,102),
@ -81,21 +76,6 @@ SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
 4 | 40 | 104
 (4 rows)

-- test for renaming column name to camel style
-BEGIN;
-ALTER TABLE mv_base_a RENAME i TO "I";
-ALTER TABLE mv_base_a RENAME j TO "J";
-UPDATE mv_base_a SET "J" = 0 WHERE "I" = 1;
-SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
- i | j  |  k  
---+----+-----
- 1 |  0 | 101
- 2 | 20 | 102
- 3 | 30 | 103
- 4 | 40 | 104
-(4 rows)
-
-ROLLBACK;
 -- TRUNCATE a base table in join views
 BEGIN;
 TRUNCATE mv_base_a;
@ -1395,8 +1375,6 @@ CREATE FUNCTION mytype_out(mytype)
 RETURNS cstring AS 'int4out'
 LANGUAGE INTERNAL STRICT IMMUTABLE;
 NOTICE:  argument type mytype is only a shell
-LINE 1: CREATE FUNCTION mytype_out(mytype)
-                                   ^
 CREATE TYPE mytype (
 LIKE = int4,
 INPUT = mytype_in,
@ -1533,17 +1511,17 @@ ERROR:  VALUES is not supported on incrementally maintainable materialized view
 SELECT pgivm.create_immv('mv_ivm_only_values2',  'SELECT * FROM (values(1)) AS tmp');
 ERROR:  VALUES is not supported on incrementally maintainable materialized view
 -- views containing base tables with Row Level Security
-DROP USER IF EXISTS regress_ivm_admin;
-NOTICE:  role "regress_ivm_admin" does not exist, skipping
-DROP USER IF EXISTS regress_ivm_user;
-NOTICE:  role "regress_ivm_user" does not exist, skipping
-CREATE USER regress_ivm_admin;
-CREATE USER regress_ivm_user;
+DROP USER IF EXISTS ivm_admin;
+NOTICE:  role "ivm_admin" does not exist, skipping
+DROP USER IF EXISTS ivm_user;
+NOTICE:  role "ivm_user" does not exist, skipping
+CREATE USER ivm_admin;
+CREATE USER ivm_user;
 --- create a table with RLS
-SET SESSION AUTHORIZATION regress_ivm_admin;
+SET SESSION AUTHORIZATION ivm_admin;
 CREATE TABLE rls_tbl(id int, data text, owner name);
 INSERT INTO rls_tbl VALUES
-  (1,'foo','regress_ivm_user'),
+  (1,'foo','ivm_user'),
  (2,'bar','postgres');
 CREATE TABLE num_tbl(id int, num text);
 INSERT INTO num_tbl VALUES
@ -1558,8 +1536,8 @@ CREATE POLICY rls_tbl_policy ON rls_tbl FOR SELECT TO PUBLIC USING(owner = curre
 ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
 GRANT ALL on rls_tbl TO PUBLIC;
 GRANT ALL on num_tbl TO PUBLIC;
--- create a view owned by regress_ivm_user
-SET SESSION AUTHORIZATION regress_ivm_user;
+--- create a view owned by ivm_user
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls', 'SELECT * FROM rls_tbl');
 NOTICE:  could not create an index on immv "ivm_rls" automatically
 DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
@ -1570,42 +1548,42 @@ HINT:  Create an index on the immv for efficient incremental maintenance.
 (1 row)

 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data |      owner       
----+------+------------------
-  1 | foo  | regress_ivm_user
+ id | data |  owner   
+----+------+----------
+  1 | foo  | ivm_user
 (1 row)

 RESET SESSION AUTHORIZATION;
 --- inserts rows owned by different users
 INSERT INTO rls_tbl VALUES
-  (3,'baz','regress_ivm_user'),
+  (3,'baz','ivm_user'),
  (4,'qux','postgres');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data |      owner       
----+------+------------------
-  1 | foo  | regress_ivm_user
-  3 | baz  | regress_ivm_user
+ id | data |  owner   
+----+------+----------
+  1 | foo  | ivm_user
+  3 | baz  | ivm_user
 (2 rows)

 --- combination of diffent kinds of commands
 WITH
- i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','regress_ivm_user')),
+ i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','ivm_user')),
 u AS (UPDATE rls_tbl SET owner = 'postgres' WHERE id = 1),
- u2 AS (UPDATE rls_tbl SET owner = 'regress_ivm_user' WHERE id = 2)
+ u2 AS (UPDATE rls_tbl SET owner = 'ivm_user' WHERE id = 2)
 SELECT;
 --
 (1 row)

 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data  |      owner       
----+-------+------------------
-  2 | bar   | regress_ivm_user
-  3 | baz   | regress_ivm_user
-  6 | corge | regress_ivm_user
+ id | data  |  owner   
+----+-------+----------
+  2 | bar   | ivm_user
+  3 | baz   | ivm_user
+  6 | corge | ivm_user
 (3 rows)

 ---
-SET SESSION AUTHORIZATION regress_ivm_user;
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls2', 'SELECT * FROM rls_tbl JOIN num_tbl USING(id)');
 NOTICE:  could not create an index on immv "ivm_rls2" automatically
 DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
@ -1624,11 +1602,11 @@ SELECT;
 (1 row)

 SELECT * FROM ivm_rls2 ORDER BY 1,2,3;
- id | data  |      owner       |   num   
----+-------+------------------+---------
-  2 | bar   | regress_ivm_user | two
-  3 | baz_2 | regress_ivm_user | three_2
-  6 | corge | regress_ivm_user | six
+ id | data  |  owner   |   num   
+----+-------+----------+---------
+  2 | bar   | ivm_user | two
+  3 | baz_2 | ivm_user | three_2
+  6 | corge | ivm_user | six
 (3 rows)

 DROP TABLE rls_tbl CASCADE;
@ -1636,8 +1614,8 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table ivm_rls
 drop cascades to table ivm_rls2
 DROP TABLE num_tbl CASCADE;
-DROP USER regress_ivm_user;
-DROP USER regress_ivm_admin;
+DROP USER ivm_user;
+DROP USER ivm_admin;
 -- automatic index creation
 BEGIN;
 CREATE TABLE base_a (i int primary key, j int);
--- a/expected/pg_ivm_0.out
+++ b/expected/pg_ivm_0.out
--- a/expected/refresh_insert.out
+++ b/expected/refresh_insert.out
@ -1,253 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 refresh s2 insert c1 check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 refresh s2 c1 insert check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2); <waiting ...>
-step c1: COMMIT;
-step insert: <... completed>
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert refresh c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-refresh_immv
------------
-           2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 refresh c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-refresh_immv
------------
-           2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 refresh check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 refresh check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           2
-(1 row)
-
-step check1: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/refresh_insert2.out
+++ b/expected/refresh_insert2.out
@ -1,211 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 refresh s2 insert c1 check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 refresh s2 c1 insert check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert refresh c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 refresh c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 refresh check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 refresh check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/expected/refresh_insert3.out
+++ b/expected/refresh_insert3.out
@ -1,211 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1 refresh s2 insert c1 check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 refresh s2 c1 insert check2 c2 mv
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step s2: SELECT;
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh insert c1 check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step insert: INSERT INTO a VALUES (2);
-ERROR:  could not obtain lock on materialized view "mv" during incremental maintenance
-step c1: COMMIT;
-step check2: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-(1 row)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 insert refresh c2 check1 c1 mv
-step s1: SELECT;
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s1 s2 refresh c1 insert check2 c2 mv
-step s1: SELECT;
-step s2: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-refresh_immv
------------
-           1
-(1 row)
-
-step c1: COMMIT;
-step insert: INSERT INTO a VALUES (2);
-step check2: SELECT check_mv();
-check_mv
--------
-ok      
-(1 row)
-
-step c2: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 refresh c2 check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step refresh: SELECT pgivm.refresh_immv('mv', true); <waiting ...>
-step c2: COMMIT;
-step refresh: <... completed>
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 insert s1 c2 refresh check1 c1 mv
-step s2: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step s1: SELECT;
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
-
-starting permutation: s2 s1 insert c2 refresh check1 c1 mv
-step s2: SELECT;
-step s1: SELECT;
-step insert: INSERT INTO a VALUES (2);
-step c2: COMMIT;
-step refresh: SELECT pgivm.refresh_immv('mv', true);
-ERROR:  the materialized view is incrementally updated in concurrent transaction
-step check1: SELECT check_mv();
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step c1: COMMIT;
-step mv: SELECT * FROM mv ORDER BY 1,2; SELECT check_mv();
-x|y
-+-
-1|1
-2|2
-(2 rows)
-
-check_mv
--------
-ok      
-(1 row)
-
--- a/matview.c
+++ b/matview.c
@ -50,7 +50,6 @@
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/typcache.h"
-#include "utils/xid8.h"

 #include "pg_ivm.h"

@ -108,15 +107,6 @@ typedef struct MV_TriggerHashEntry
 	List   *tables;		/* List of MV_TriggerTable */
 	bool	has_old;	/* tuples are deleted from any table? */
 	bool	has_new;	/* tuples are inserted into any table? */
-
-	/*
-	 * List of sub-transaction IDs that incrementally updated the view.
-	 * This list is maintained through a transaction, and an ID is removed
-	 * when a sub-transaction is aborted. If any ID is left when the
-	 * transaction is committed, this means the view is incrementally
-	 * updated in this transaction.
-	 */
-	List   *subxids;
 } MV_TriggerHashEntry;

 /*
@ -169,12 +159,11 @@ static void CloseImmvIncrementalMaintenance(void);
 static Query *rewrite_query_for_preupdate_state(Query *query, List *tables,
 								  ParseState *pstate, List *rte_path, Oid matviewid);
 static void register_delta_ENRs(ParseState *pstate, Query *query, List *tables);
-static char*make_subquery_targetlist_from_table(MV_TriggerTable *table);
 static char *make_delta_enr_name(const char *prefix, Oid relid, int count);
 static RangeTblEntry *get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
 				 QueryEnvironment *queryEnv, Oid matviewid);
-static RangeTblEntry *union_ENRs(RangeTblEntry *rte, MV_TriggerTable *table, List *enr_rtes,
-		   const char *prefix, QueryEnvironment *queryEnv);
+static RangeTblEntry *union_ENRs(RangeTblEntry *rte, Oid relid, List *enr_rtes, const char *prefix,
+		   QueryEnvironment *queryEnv);
 static Query *rewrite_query_for_distinct_and_aggregates(Query *query, ParseState *pstate);

 static void calc_delta(MV_TriggerTable *table, List *rte_path, Query *query,
@ -228,11 +217,7 @@ static void mv_InitHashTables(void);
 static SPIPlanPtr mv_FetchPreparedPlan(MV_QueryKey *key);
 static void mv_HashPreparedPlan(MV_QueryKey *key, SPIPlanPtr plan);
 static void mv_BuildQueryKey(MV_QueryKey *key, Oid matview_id, int32 query_type);
-static void clean_up_IVM_hash_entry(MV_TriggerHashEntry *entry, bool is_abort,
-						SubTransactionId subxid);
-static void setLastUpdateXid(Oid immv_oid, FullTransactionId xid);
-static FullTransactionId getLastUpdateXid(Oid immv_oid);
-
+static void clean_up_IVM_hash_entry(MV_TriggerHashEntry *entry, bool is_abort);

 /* SQL callable functions */
 PG_FUNCTION_INFO_V1(IVM_immediate_before);
@ -271,18 +256,16 @@ ExecRefreshImmv(const RangeVar *relation, bool skipData,
 										  NULL);
 #endif

-	return RefreshImmvByOid(matviewOid, false, skipData, queryString, qc);
+	return RefreshImmvByOid(matviewOid, skipData, queryString, qc);
 }

 /*
 * RefreshMatViewByOid -- refresh IMMV view by OID
 *
- * This is also used to populate the IMMV created by create_immv command.
- *
 * This imitates PostgreSQL's RefreshMatViewByOid().
 */
 ObjectAddress
-RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
+RefreshImmvByOid(Oid matviewOid, bool skipData,
 				 const char *queryString, QueryCompletion *qc)
 {
 	Relation	matviewRel;
@ -462,19 +445,6 @@ RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
 		free_object_addresses(immv_triggers);
 	}

-	/*
-	 * Create triggers on incremental maintainable materialized view
-	 * This argument should use 'dataQuery'. This needs to use a rewritten query,
-	 * because a sublink in jointree is not supported by this function.
-	 *
-	 * This is performed before generating data because we have to wait
-	 * concurrent transactions modifying a base table and then take a snapshot
-	 * to see changes by these transactions to make sure a consistent view
-	 * is created.
-	 */
-	if (!skipData && !oldPopulated)
-		CreateIvmTriggersOnBaseTables(dataQuery, matviewOid);
-
 	/*
 	 * Create the transient table that will receive the regenerated data. Lock
 	 * it against access by any other process until commit (by which time it
@ -490,41 +460,10 @@ RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
 	LockRelationOid(OIDNewHeap, AccessExclusiveLock);
 	dest = CreateTransientRelDestReceiver(OIDNewHeap);

-	/*
-	 * In READ COMMITTED, get and push the latest snapshot again to see the
-	 * results of concurrent transactions committed after the current
-	 * transaction started.
-	 */
-	if (!IsolationUsesXactSnapshot())
-		PushActiveSnapshot(GetTransactionSnapshot());
-
-	/*
-	 * If a concurrent transaction updated the view incrementally and was
-	 * committed before we acquired the lock, the results of refresh_immv could
-	 * be inconsistent. Therefore, we have to check the transaction ID of the
-	 * most recent update of the view, and if this was in progress at the
-	 * transaction start, raise an error to prevent anomalies.
-	 */
-	if (!is_create)
-	{
-		FullTransactionId xid;
-
-		xid = getLastUpdateXid(matviewOid);
-		if (XidInMVCCSnapshot(XidFromFullTransactionId(xid), GetActiveSnapshot()))
-			ereport(ERROR,
-					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-					 errmsg("the materialized view is incrementally updated in concurrent transaction"),
-					 errhint("The transaction might succeed if retried.")));
-	}
-
 	/* Generate the data, if wanted. */
 	if (!skipData)
 		processed = refresh_immv_datafill(dest, dataQuery, NULL, NULL, queryString);

-	/* Pop the original snapshot. */
-	if (!IsolationUsesXactSnapshot())
-		PopActiveSnapshot();
-
 	/* Make the matview match the newly generated data. */
 	refresh_by_heap_swap(matviewOid, OIDNewHeap, relpersistence);

@ -538,6 +477,14 @@ RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
 	if (!skipData)
 		pgstat_count_heap_insert(matviewRel, processed);

+	/*
+	 * Create triggers on incremental maintainable materialized view
+	 * This argument should use 'dataQuery'. This needs to use a rewritten query,
+	 * because a sublink in jointree is not supported by this function.
+	 */
+	if (!skipData && !oldPopulated)
+		CreateIvmTriggersOnBaseTables(dataQuery, matviewOid);
+
 	table_close(matviewRel, NoLock);

 	/* Roll back any GUC changes */
@ -617,11 +564,7 @@ refresh_immv_datafill(DestReceiver *dest, Query *query,
 	ExecutorStart(queryDesc, 0);

 	/* run the plan */
-#if PG_VERSION_NUM < 180000
 	ExecutorRun(queryDesc, ForwardScanDirection, 0, true);
-#else
-	ExecutorRun(queryDesc, ForwardScanDirection, 0);
-#endif

 	processed = queryDesc->estate->es_processed;

@ -763,8 +706,6 @@ IVM_immediate_before(PG_FUNCTION_ARGS)
 	/* If the view has more than one tables, we have to use an exclusive lock. */
 	if (ex_lock)
 	{
-		FullTransactionId xid;
-
 		/*
 		 * Wait for concurrent transactions which update this materialized view at
 		 * READ COMMITED. This is needed to see changes committed in other
@ -789,21 +730,6 @@ IVM_immediate_before(PG_FUNCTION_ARGS)
 					errmsg("could not obtain lock on materialized view \"%s\" during incremental maintenance",
 							relname)));
 		}
-
-		/*
-		 * Even if we can acquire an lock, a concurrent transaction could have
-		 * updated the view incrementally and been committed before we acquired
-		 * the lock. Therefore, we have to check the transaction ID of the most
-		 * recent update of the view, and if this was in progress at the
-		 * transaction start, raise an error to prevent anomalies.
-		 */
-		xid = getLastUpdateXid(matviewOid);
-		if (XidInMVCCSnapshot(XidFromFullTransactionId(xid), GetTransactionSnapshot()))
-			ereport(ERROR,
-					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-					 errmsg("the materialized view is incrementally updated in concurrent transaction"),
-					 errhint("The transaction might succeed if retried.")));
-
 	}
 	else
 		LockRelationOid(matviewOid, RowExclusiveLock);
@ -819,22 +745,13 @@ IVM_immediate_before(PG_FUNCTION_ARGS)
 											  HASH_ENTER, &found);

 	/* On the first BEFORE to update the view, initialize trigger data */
-	if (!found || entry->snapshot == InvalidSnapshot)
+	if (!found)
 	{
-		Snapshot snapshot;
-
 		/*
 		 * Get a snapshot just before the table was modified for checking
 		 * tuple visibility in the pre-update state of the table.
-		 *
-		 * In READ COMMITTED, use the latest snapshot again to see the
-		 * results of concurrent transactions committed after the current
-		 * transaction started.
 		 */
-		if (IsolationUsesXactSnapshot())
-			snapshot = GetActiveSnapshot();
-		else
-			snapshot = GetTransactionSnapshot();
+		Snapshot snapshot = GetActiveSnapshot();

 		entry->matview_id = matviewOid;
 		entry->before_trig_count = 0;
@ -843,17 +760,11 @@ IVM_immediate_before(PG_FUNCTION_ARGS)
 		entry->tables = NIL;
 		entry->has_old = false;
 		entry->has_new = false;
-
-		/*
-		 * If this is the first table modifying query in the transaction,
-		 * initialize the list of subxids.
-		 */
-		if (!found)
-			entry->subxids = NIL;
 	}

 	entry->before_trig_count++;

+
 	return PointerGetDatum(NULL);
 }

@ -876,7 +787,6 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 	char	   *matviewOid_text = trigdata->tg_trigger->tgargs[0];
 	Relation	matviewRel;
 	int old_depth = immv_maintenance_depth;
-	SubTransactionId subxid;

 	Oid			relowner;
 	Tuplestorestate *old_tuplestore = NULL;
@ -942,7 +852,6 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 		table->new_rtes = NIL;
 		table->rte_paths = NIL;
 		table->slot = MakeSingleTupleTableSlot(RelationGetDescr(rel), table_slot_callbacks(rel));
-		/* We assume we have at least RowExclusiveLock on modified tables. */
 		table->rel = table_open(RelationGetRelid(rel), NoLock);
 		entry->tables = lappend(entry->tables, table);

@ -975,23 +884,7 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 	 */

 	/*
-	 * record the subxid that updated the view incrementally
-	 *
-	 * Note:
-	 * PG16 or later has list_member_xid and lappend_xid. It would be better
-	 * to use them, but we use integer for supporting older PGs since there
-	 * is no problem or now.
-	 */
-	subxid = GetCurrentSubTransactionId();
-	if (!list_member_int(entry->subxids, subxid))
-	{
-		oldcxt = MemoryContextSwitchTo(TopTransactionContext);
-		entry->subxids = lappend_int(entry->subxids, subxid);
-		MemoryContextSwitchTo(oldcxt);
-	}
-
-	/*
-	 * Advance command counter to make the updated base table rows locally
+	 * Advance command counter to make the updated base table row locally
 	 * visible.
 	 */
 	CommandCounterIncrement();
@ -1002,12 +895,10 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 	Assert(matviewRel->rd_rel->relkind == RELKIND_RELATION);

 	/*
-	 * In READ COMMITTED, get and push the latest snapshot again to see the
-	 * results of concurrent transactions committed after the current
-	 * transaction started.
+	 * Get and push the latast snapshot to see any changes which is committed
+	 * during waiting in other transactions at READ COMMITTED level.
 	 */
-	if (!IsolationUsesXactSnapshot())
-		PushActiveSnapshot(GetTransactionSnapshot());
+	PushActiveSnapshot(GetTransactionSnapshot());

 	/*
 	 * Check for active uses of the relation in the current transaction, such
@ -1092,11 +983,10 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 		}

 		/* Clean up hash entry and delete tuplestores */
-		clean_up_IVM_hash_entry(entry, false, InvalidSubTransactionId);
+		clean_up_IVM_hash_entry(entry, false);

 		/* Pop the original snapshot. */
-		if (!IsolationUsesXactSnapshot())
-			PopActiveSnapshot();
+		PopActiveSnapshot();

 		table_close(matviewRel, NoLock);

@ -1256,7 +1146,7 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 	}

 	/* Clean up hash entry and delete tuplestores */
-	clean_up_IVM_hash_entry(entry, false, InvalidSubTransactionId);
+	clean_up_IVM_hash_entry(entry, false);
 	if (old_tuplestore)
 	{
 		dest_old->rDestroy(dest_old);
@ -1269,8 +1159,7 @@ IVM_immediate_maintenance(PG_FUNCTION_ARGS)
 	}

 	/* Pop the original snapshot. */
-	if (!IsolationUsesXactSnapshot())
-		PopActiveSnapshot();
+	PopActiveSnapshot();

 	table_close(matviewRel, NoLock);

@ -1368,7 +1257,6 @@ rewrite_query_for_preupdate_state(Query *query, List *tables,
 					lfirst(lc) = rte_pre;

 					table->rte_paths = lappend(table->rte_paths, lappend_int(list_copy(rte_path), i));
-
 					break;
 				}
 			}
@ -1512,20 +1400,24 @@ get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
 	StringInfoData str;
 	RawStmt *raw;
 	Query *subquery;
+	Relation rel;
 	ParseState *pstate;
 	char *relname;
-	static char *subquery_tl;
 	int i;

 	pstate = make_parsestate(NULL);
 	pstate->p_queryEnv = queryEnv;
 	pstate->p_expr_kind = EXPR_KIND_SELECT_TARGET;

+	/*
+	 * We can use NoLock here since AcquireRewriteLocks should
+	 * have locked the relation already.
+	 */
+	rel = table_open(table->table_id, NoLock);
 	relname = quote_qualified_identifier(
-					get_namespace_name(RelationGetNamespace(table->rel)),
-									   RelationGetRelationName(table->rel));
-
-	subquery_tl = make_subquery_targetlist_from_table(table);
+					get_namespace_name(RelationGetNamespace(rel)),
+									   RelationGetRelationName(rel));
+	table_close(rel, NoLock);

 	/*
 	 * Filtering inserted row using the snapshot taken before the table
@ -1533,9 +1425,9 @@ get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
 	 */
 	initStringInfo(&str);
 	appendStringInfo(&str,
-		"SELECT %s FROM %s t"
+		"SELECT t.* FROM %s t"
 		" WHERE pgivm.ivm_visible_in_prestate(t.tableoid, t.ctid, %d::pg_catalog.oid)",
-			subquery_tl, relname, matviewid);
+			relname, matviewid);

 	/*
 	 * Append deleted rows contained in old transition tables.
@ -1543,8 +1435,8 @@ get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
 	for (i = 0; i < list_length(table->old_tuplestores); i++)
 	{
 		appendStringInfo(&str, " UNION ALL ");
-		appendStringInfo(&str," SELECT %s FROM %s",
-			subquery_tl, make_delta_enr_name("old", table->table_id, i));
+		appendStringInfo(&str," SELECT * FROM %s",
+			make_delta_enr_name("old", table->table_id, i));
 	}

 	/* Get a subquery representing pre-state of the table */
@ -1583,45 +1475,6 @@ get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
 	return rte;
 }

-/*
- * make_subquery_targetlist_from_table
- *
- * Make a targetlist string of a subquery representing a delta table or a
- * pre-update state table. This subquery substitutes a modified table RTE
- * in the view definition query during view maintenance. In the targetlist,
- * column names appear in order of the table definition. However, for
- * attribute numbers of vars in the query tree to reference columns of the
- * subquery  correctly even though the table has a dropped column, put "null"
- * as a dummy value at the position of a dropped column.
- *
- * We would also able to walk the query tree to rewrite varattnos, but
- * crafting targetlist is more simple and reasonable.
- */
-static char*
-make_subquery_targetlist_from_table(MV_TriggerTable *table)
-{
-	StringInfoData str;
-	TupleDesc	tupdesc;
-	int			i;
-
-	tupdesc = RelationGetDescr(table->rel);
-	initStringInfo(&str);
-	for (i = 0; i < tupdesc->natts; i++)
-	{
-		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
-
-		if (i > 0)
-			appendStringInfo(&str, ", ");
-
-		if (attr->attisdropped)
-			appendStringInfo(&str, "null");
-		else
-			appendStringInfo(&str, "%s", quote_identifier(NameStr(attr->attname)));
-	}
-
-	return str.data;
-}
-
 /*
 * make_delta_enr_name
 *
@ -1647,8 +1500,8 @@ make_delta_enr_name(const char *prefix, Oid relid, int count)
 * all transition tables.
 */
 static RangeTblEntry*
-union_ENRs(RangeTblEntry *rte, MV_TriggerTable *table, List *enr_rtes,
-		   const char *prefix, QueryEnvironment *queryEnv)
+union_ENRs(RangeTblEntry *rte, Oid relid, List *enr_rtes, const char *prefix,
+		   QueryEnvironment *queryEnv)
 {
 	StringInfoData str;
 	ParseState	*pstate;
@ -1665,15 +1518,15 @@ union_ENRs(RangeTblEntry *rte, MV_TriggerTable *table, List *enr_rtes,
 	pstate->p_expr_kind = EXPR_KIND_SELECT_TARGET;

 	initStringInfo(&str);
+
 	for (i = 0; i < list_length(enr_rtes); i++)
 	{
 		if (i > 0)
 			appendStringInfo(&str, " UNION ALL ");

 		appendStringInfo(&str,
-			" SELECT %s FROM %s",
-			make_subquery_targetlist_from_table(table),
-			make_delta_enr_name(prefix, table->table_id, i));
+			" SELECT * FROM %s",
+			make_delta_enr_name(prefix, relid, i));
 	}

 #if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 140000)
@ -1948,18 +1801,18 @@ calc_delta(MV_TriggerTable *table, List *rte_path, Query *query,
 	in_delta_calculation = true;

 	/* Generate old delta */
-	if (dest_old && list_length(table->old_rtes) > 0)
+	if (list_length(table->old_rtes) > 0)
 	{
 		/* Replace the modified table with the old delta table and calculate the old view delta. */
-		lfirst(lc) = union_ENRs(rte, table, table->old_rtes, "old", queryEnv);
+		lfirst(lc) = union_ENRs(rte, table->table_id, table->old_rtes, "old", queryEnv);
 		refresh_immv_datafill(dest_old, query, queryEnv, tupdesc_old, "");
 	}

 	/* Generate new delta */
-	if (dest_new && list_length(table->new_rtes) > 0)
+	if (list_length(table->new_rtes) > 0)
 	{
 		/* Replace the modified table with the new delta table and calculate the new view delta*/
-		lfirst(lc) = union_ENRs(rte, table, table->new_rtes, "new", queryEnv);
+		lfirst(lc) = union_ENRs(rte, table->table_id, table->new_rtes, "new", queryEnv);
 		refresh_immv_datafill(dest_new, query, queryEnv, tupdesc_new, "");
 	}

@ -2761,7 +2614,6 @@ apply_new_delta_with_count(const char *matviewname, const char* deltaname_new,
 					matviewname, target_list->data,
 					target_list->data, deltaname_new_for_insert.data,
 					match_cond);
-
 	if (SPI_exec(querybuf.data, 0) != SPI_OK_INSERT)
 		elog(ERROR, "SPI_exec failed: %s", querybuf.data);
 }
@ -3328,11 +3180,10 @@ mv_BuildQueryKey(MV_QueryKey *key, Oid matview_id, int32 query_type)
 * AtAbort_IVM
 *
 * Clean up hash entries for all materialized views. This is called at
- * (sub-)transaction abort. When the top-level transaction is aborted,
- * InvalidSubTransactionId is set to subxid.
+ * transaction abort.
 */
 void
-AtAbort_IVM(SubTransactionId subxid)
+AtAbort_IVM()
 {
 	HASH_SEQ_STATUS seq;
 	MV_TriggerHashEntry *entry;
@ -3341,38 +3192,7 @@ AtAbort_IVM(SubTransactionId subxid)
 	{
 		hash_seq_init(&seq, mv_trigger_info);
 		while ((entry = hash_seq_search(&seq)) != NULL)
-			clean_up_IVM_hash_entry(entry, true, subxid);
-	}
-
-	in_delta_calculation = false;
-}
-
-/*
- * AtPreCommit_IVM
- *
- * Store the transaction ID that updated the view incrementally
- * into the pg_ivm_immv catalog at transaction commit.
- */
-void
-AtPreCommit_IVM()
-{
-	HASH_SEQ_STATUS seq;
-	MV_TriggerHashEntry *entry;
-
-	if (mv_trigger_info)
-	{
-		/*
-		 * For each view that was incrementally updated in the transaction,
-		 * record the transaction ID into the pg_ivm_immv catalog, and perform
-		 * the final clean up of the entry.
-		 */
-		hash_seq_init(&seq, mv_trigger_info);
-		while ((entry = hash_seq_search(&seq)) != NULL)
-		{
-			bool found;
-			setLastUpdateXid(entry->matview_id, GetTopFullTransactionId());
-			hash_search(mv_trigger_info, (void *) &entry->matview_id, HASH_REMOVE, &found);
-		}
+			clean_up_IVM_hash_entry(entry, true);
 	}

 	in_delta_calculation = false;
@ -3382,18 +3202,14 @@ AtPreCommit_IVM()
 * clean_up_IVM_hash_entry
 *
 * Clean up tuple stores and hash entries for a materialized view after its
- * maintenance finished. This is called at the end of table modifying query
- * or (sub-)transaction abort. When the top-level transaction is aborted,
- * InvalidSubTransactionId is set to subxid.
+ * maintenance finished.
 */
 static void
-clean_up_IVM_hash_entry(MV_TriggerHashEntry *entry, bool is_abort,
-						SubTransactionId subxid)
+clean_up_IVM_hash_entry(MV_TriggerHashEntry *entry, bool is_abort)
 {
 	bool found;
 	ListCell *lc;

-	/* clean up tuple stores */
 	foreach(lc, entry->tables)
 	{
 		MV_TriggerTable *table = (MV_TriggerTable *) lfirst(lc);
@ -3419,140 +3235,12 @@ clean_up_IVM_hash_entry(MV_TriggerHashEntry *entry, bool is_abort,
 		}
 	}
 	list_free(entry->tables);
-	entry->tables = NIL;

-	if (is_abort)
-	{
-		bool	remove_entry = false;
-
-		/*
-		 * When the top-level transaction is aborted, remove all subxids.
-		 * When a sub-transaction is aborted, remove only its subxid.
-		 */
-		if (subxid == InvalidSubTransactionId)
-			remove_entry = true;
-		else
-		{
-			foreach(lc, entry->subxids)
-			{
-				/* Note:
-				 * PG16 or later has lfirst_xid, but we use lfirst_int for
-				 * supporting older PGs since there is no problem or now.
-				 */
-				if (lfirst_int(lc) == subxid)
-				{
-					entry->subxids = list_delete_cell(entry->subxids, lc);
-					break;
-				}
-			}
-
-			/*
-			 * If all the subxid are removed, it means that the view was not
-			 * updated at all in this transaction.
-			 */
-			if (list_length(entry->subxids) == 0)
-				remove_entry = true;
-		}
-
-
-		/*
-		 * Remove entries of not updated views from the hash table.
-		 */
-		if (remove_entry)
-			hash_search(mv_trigger_info, (void *) &entry->matview_id, HASH_REMOVE, &found);
-	}
-	else
-	{
-		/* When the query sucsessully finished, unregister the snapshot */
+	if (!is_abort)
 		UnregisterSnapshot(entry->snapshot);
-	}

-	entry->snapshot = InvalidSnapshot;
-}

-/*
- * setLastUpdateXid
- *
- * Store the transaction ID that updated the view incremenally into the
- * pg_ivm_immv catalog.
- */
-static void
-setLastUpdateXid(Oid immv_oid, FullTransactionId xid)
-{
-	Relation pgIvmImmv = table_open(PgIvmImmvRelationId(), ShareRowExclusiveLock);
-	TupleDesc tupdesc = RelationGetDescr(pgIvmImmv);
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple tup;
-	Datum values[Natts_pg_ivm_immv];
-	bool nulls[Natts_pg_ivm_immv];
-	bool replaces[Natts_pg_ivm_immv];
-	HeapTuple newtup = NULL;
-
-	ScanKeyInit(&key,
-			    Anum_pg_ivm_immv_immvrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(immv_oid));
-	scan = systable_beginscan(pgIvmImmv, PgIvmImmvPrimaryKeyIndexId(),
-								  true, NULL, 1, &key);
-	tup = systable_getnext(scan);
-
-	memset(values, 0, sizeof(values));
-	values[Anum_pg_ivm_immv_lastivmupdate -1 ] = FullTransactionIdGetDatum(xid);
-	MemSet(nulls, false, sizeof(nulls));
-	MemSet(replaces, false, sizeof(replaces));
-	replaces[Anum_pg_ivm_immv_lastivmupdate -1 ] = true;
-
-	newtup = heap_modify_tuple(tup, tupdesc, values, nulls, replaces);
-
-	CatalogTupleUpdate(pgIvmImmv, &newtup->t_self, newtup);
-	heap_freetuple(newtup);
-
-	/*
-	 * Advance command counter to make the updated pg_ivm_immv row locally
-	 * visible.
-	 */
-	CommandCounterIncrement();
-
-	systable_endscan(scan);
-	table_close(pgIvmImmv, ShareRowExclusiveLock);
-}
-
-/*
- * getLastUpdateXid
- *
- * Get the most recent transaction ID that updated the view incrementally
- * from the pg_ivm_immv catalog.
- */
-static FullTransactionId
-getLastUpdateXid(Oid immv_oid)
-{
-	Relation pgIvmImmv = table_open(PgIvmImmvRelationId(), AccessShareLock);
-	TupleDesc tupdesc = RelationGetDescr(pgIvmImmv);
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple tup;
-	bool isnull;
-	Datum datum;
-	FullTransactionId xid = InvalidFullTransactionId;
-
-	ScanKeyInit(&key,
-			    Anum_pg_ivm_immv_immvrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(immv_oid));
-	scan = systable_beginscan(pgIvmImmv, PgIvmImmvPrimaryKeyIndexId(),
-								  true, NULL, 1, &key);
-
-	tup = systable_getnext(scan);
-	datum = heap_getattr(tup, Anum_pg_ivm_immv_lastivmupdate, tupdesc, &isnull);
-
-	if (!isnull)
-		xid = DatumGetFullTransactionId(datum);
-
-	systable_endscan(scan);
-	table_close(pgIvmImmv, NoLock);
-
-	return xid;
+	hash_search(mv_trigger_info, (void *) &entry->matview_id, HASH_REMOVE, &found);
 }

 /*
--- a/meson.build
+++ b/meson.build
@ -1,101 +0,0 @@
-project('pg_ivm', ['c'])
-
-pg_config = find_program('pg_config')
-
-bindir = run_command(pg_config, '--bindir', check: true).stdout().strip()
-includedir_server = run_command(pg_config, '--includedir-server', check: true).stdout().strip()
-includedir = run_command(pg_config, '--includedir', check: true).stdout().strip()
-pkglibdir = run_command(pg_config, '--pkglibdir', check: true).stdout().strip()
-sharedir = run_command(pg_config, '--sharedir', check: true).stdout().strip()
-libdir = run_command(pg_config, '--libdir', check: true).stdout().strip()
-
-module_name = meson.project_name()
-
-# ruleutils.c includes ruleutils_13.c or ruleutils_14.c based on PostgreSQL version
-# Note: We don't need to explicitly add these files since they're included by ruleutils.c
-pg_ivm_sources = files(
-  'createas.c',
-  'matview.c',
-  'pg_ivm.c',
-  'ruleutils.c',
-  'subselect.c',
-)
-
-if meson.get_compiler('c').get_id() == 'msvc'
-  incdir = [includedir_server / 'port/win32_msvc',
-            includedir_server / 'port/win32',
-            includedir_server,
-            includedir]
-  postgres_lib = meson.get_compiler('c').find_library(
-                                           'postgres',
-                                            dirs: libdir,
-                                            static: true,
-                                            required: true
-                                         )
-else
-  incdir = [ includedir_server ]
-  postgres_lib = []
-endif
-
-shared_module(module_name,
-  pg_ivm_sources,
-  include_directories: incdir,
-  install: true,
-  install_dir: pkglibdir,
-  name_prefix: '',
-  dependencies: postgres_lib,
-)
-
-install_data(
-  'pg_ivm--1.0.sql',
-  'pg_ivm--1.0--1.1.sql',
-  'pg_ivm--1.1--1.2.sql',
-  'pg_ivm--1.2--1.3.sql',
-  'pg_ivm--1.3--1.4.sql',
-  'pg_ivm--1.4--1.5.sql',
-  'pg_ivm--1.5--1.6.sql',
-  'pg_ivm--1.6--1.7.sql',
-  'pg_ivm--1.7--1.8.sql', 
-  'pg_ivm--1.8--1.9.sql',
-  'pg_ivm--1.9--1.10.sql',
-  'pg_ivm--1.10.sql',
-  'pg_ivm--1.10--1.11.sql',
-  'pg_ivm--1.11--1.12.sql',
-  'pg_ivm.control',
-  install_dir: sharedir / 'extension',
-) 
-
-pg_regress = find_program('pg_regress',
-  dirs: [pkglibdir / 'pgxs/src/test/regress']
-)
-
-regress_tests = ['pg_ivm', 'create_immv', 'refresh_immv']
-
-test('regress',
- pg_regress,
- args: ['--bindir', bindir,
-        '--inputdir', meson.current_source_dir(),
-       ] + regress_tests,
-)
-
-pg_isolation_regress = find_program('pg_isolation_regress',
-  dirs: [pkglibdir / 'pgxs/src/test/isolation']
-)
-
-isolation_tests = [
- 'create_insert', 'refresh_insert', 'insert_insert',
- 'create_insert2', 'refresh_insert2', 'insert_insert2',
- 'create_insert3', 'refresh_insert3', 'insert_insert3'
-]
-
-isolation_opts = [
-  '--load-extension','pg_ivm',
-]
-
-test('isolation',
- pg_isolation_regress,
- args: ['--bindir', bindir,
-        '--inputdir', meson.current_source_dir(),
-        '--outputdir', 'output_iso',
-       ] + isolation_opts + isolation_tests,
-)
--- a/pg_ivm--1.10--1.11.sql
+++ b/pg_ivm--1.10--1.11.sql
--- a/pg_ivm--1.10.sql
+++ b/pg_ivm--1.10.sql
@ -6,7 +6,6 @@ CREATE TABLE pgivm.pg_ivm_immv(
  immvrelid regclass NOT NULL,
  viewdef text NOT NULL,
  ispopulated bool NOT NULL,
-  lastivmupdate xid8,

  CONSTRAINT pg_ivm_immv_pkey PRIMARY KEY (immvrelid)
 );
--- a/pg_ivm--1.11--1.12.sql
+++ b/pg_ivm--1.11--1.12.sql
--- a/pg_ivm--1.9--1.10.sql
+++ b/pg_ivm--1.9--1.10.sql
@ -12,7 +12,5 @@ ALTER FUNCTION "IVM_prevent_immv_change"() SET SCHEMA pgivm;

 GRANT USAGE ON SCHEMA pgivm TO PUBLIC;

-ALTER TABLE pgivm.pg_ivm_immv ADD COLUMN lastivmupdate xid8;
-
 -- drop a garbage
 DROP SCHEMA __pg_ivm__;
--- a/pg_ivm.c
+++ b/pg_ivm.c
@ -63,10 +63,8 @@ PG_FUNCTION_INFO_V1(get_immv_def);
 static void
 IvmXactCallback(XactEvent event, void *arg)
 {
-	if (event == XACT_EVENT_PRE_COMMIT)
-		AtPreCommit_IVM();
-	else if (event == XACT_EVENT_ABORT)
-		AtAbort_IVM(InvalidSubTransactionId);
+	if (event == XACT_EVENT_ABORT)
+		AtAbort_IVM();
 }

 static void
@ -74,7 +72,7 @@ IvmSubXactCallback(SubXactEvent event, SubTransactionId mySubid,
 				   SubTransactionId parentSubid, void *arg)
 {
 	if (event == SUBXACT_EVENT_ABORT_SUB)
-		AtAbort_IVM(mySubid);
+		AtAbort_IVM();
 }


@ -224,14 +222,10 @@ create_immv(PG_FUNCTION_ARGS)
 	ctas->into->options = NIL;
 	ctas->into->onCommit = ONCOMMIT_NOOP;
 	ctas->into->tableSpaceName = NULL;
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	ctas->into->viewQuery = (Query *) parsetree->stmt;
-#else
 	ctas->into->viewQuery = parsetree->stmt;
-#endif
 	ctas->into->skipData = false;

-	query = transformStmt(pstate, (Node *) ctas);
+	query = transformStmt(pstate, (Node *)ctas);
 	Assert(query->commandType == CMD_UTILITY && IsA(query->utilityStmt, CreateTableAsStmt));

 	ExecCreateImmv(pstate, (CreateTableAsStmt *) query->utilityStmt, &qc);
--- a/pg_ivm.control
+++ b/pg_ivm.control
@ -1,6 +1,6 @@
-# incremental view maintenance extension
+# incremental view maintenance extension_
 comment = 'incremental view maintenance on PostgreSQL'
-default_version = '1.12'
+default_version = '1.10'
 module_pathname = '$libdir/pg_ivm'
 relocatable = false 
 schema = pg_catalog
--- a/pg_ivm.h
+++ b/pg_ivm.h
@ -20,12 +20,11 @@
 #include "tcop/dest.h"
 #include "utils/queryenvironment.h"

-#define Natts_pg_ivm_immv 4
+#define Natts_pg_ivm_immv 3

 #define Anum_pg_ivm_immv_immvrelid 1
 #define Anum_pg_ivm_immv_viewdef 2
 #define Anum_pg_ivm_immv_ispopulated 3
-#define Anum_pg_ivm_immv_lastivmupdate 4

 /* pg_ivm.c */

@ -49,15 +48,14 @@ extern void makeIvmAggColumn(ParseState *pstate, Aggref *aggref, char *resname,
 extern Query *get_immv_query(Relation matviewRel);
 extern ObjectAddress ExecRefreshImmv(const RangeVar *relation, bool skipData,
 									 const char *queryString, QueryCompletion *qc);
-extern ObjectAddress RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
+extern ObjectAddress RefreshImmvByOid(Oid matviewOid, bool skipData,
 									  const char *queryString, QueryCompletion *qc);
 extern bool ImmvIncrementalMaintenanceIsEnabled(void);
-extern PGDLLEXPORT Datum IVM_immediate_before(PG_FUNCTION_ARGS);
-extern PGDLLEXPORT Datum IVM_immediate_maintenance(PG_FUNCTION_ARGS);
+extern Datum IVM_immediate_before(PG_FUNCTION_ARGS);
+extern Datum IVM_immediate_maintenance(PG_FUNCTION_ARGS);
 extern Query* rewrite_query_for_exists_subquery(Query *query);
-extern PGDLLEXPORT Datum ivm_visible_in_prestate(PG_FUNCTION_ARGS);
-extern void AtAbort_IVM(SubTransactionId subtxid);
-extern void AtPreCommit_IVM(void);
+extern Datum ivm_visible_in_prestate(PG_FUNCTION_ARGS);
+extern void AtAbort_IVM(void);
 extern char *getColumnNameStartWith(RangeTblEntry *rte, char *str, int *attnum);
 extern bool isIvmName(const char *s);

--- a/rpm/pg_ivm.spec
+++ b/rpm/pg_ivm.spec
@ -1,6 +1,6 @@
 # How to build RPM:
 #
-#   rpmbuild -bb pg_ivm.spec --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"
+#   rpmbuild -bb pg_ivm.spec --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"

 %global sname pg_ivm

@ -8,11 +8,11 @@
 %global llvm  1
 %endif

-Summary:	Incremental View Maintenance (IVM) feature for PostgreSQL.
+Summary:	PostgreSQL-based distributed RDBMS
 Name:		%{sname}_%{pgmajorversion}
-Version:	1.12
+Version:	1.10
 Release:	1%{dist}
-License:    PostgreSQL
+License:    BSD
 Vendor:     IVM Development Group
 URL:		https://github.com/sraoss/%{sname}
 Source0:	https://github.com/sraoss/%{sname}/archive/v%{version}.tar.gz
@ -55,11 +55,7 @@ PATH=%{pginstdir}/bin:$PATH %{__make} %{?_smp_mflags} INSTALL_PREFIX=%{buildroot
 %endif

 %changelog
-* Mon Sep 4 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.12-1
- Update to 1.12
-* Mon May 25 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.11-1
- Update to 1.11
-* Tue Mar 11 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.10-1
+* xxxxx - Yugo Nagata <nagata@sraoss.co.jp> 1.10-1
 - Update to 1.10
 * Fri Jul 31 2024 - Yugo Nagata <nagata@sraoss.co.jp> 1.9-1
 - Update to 1.9
--- a/specs/create_insert.spec
+++ b/specs/create_insert.spec
@ -1,47 +0,0 @@
-# Test interaction between concurrent transactions performing
-# create_immv and insert in READ COMMITTED isolation level
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s1	{ SELECT; }
-step create {
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 { SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 create s2 insert c1 check2 c2 mv
-permutation s1 create s2 c1 insert check2 c2 mv
-permutation s1 s2 create insert c1 check2 c2 mv
-permutation s1 s2 insert create c2 check1 c1 mv
-permutation s1 s2 create c1 insert check2 c2 mv
-permutation s2 insert s1 create c2 check1 c1 mv
-permutation s2 insert s1 c2 create check1 c1 mv
-permutation s2 s1 insert c2 create check1 c1 mv
--- a/specs/create_insert2.spec
+++ b/specs/create_insert2.spec
@ -1,54 +0,0 @@
-# Test interaction between concurrent transactions performing
-# create_immv and insert in REPEATABLE READ isolation level
-#
-# Note:
-# In this isolation level, it is possible that create_immv could
-# create an inconsistent view not including effects of a concurrent
-# transaction. So, an warning message is raised to suggest using it
-# in READ COMMITTED or executing refresh_immv to make sure to
-# make the view contents consistent.
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s1	{ SELECT; }
-step create {
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 {SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 create s2 insert c1 check2 c2 mv
-permutation s1 create s2 c1 insert check2 c2 mv
-permutation s1 s2 create insert c1 check2 c2 mv
-permutation s1 s2 insert create c2 check1 c1 mv
-permutation s1 s2 create c1 insert check2 c2 mv
-permutation s2 insert s1 create c2 check1 c1 mv
-permutation s2 insert s1 c2 create check1 c1 mv
-permutation s2 s1 insert c2 create check1 c1 mv
--- a/specs/create_insert3.spec
+++ b/specs/create_insert3.spec
@ -1,54 +0,0 @@
-# Test interaction between concurrent transactions performing
-# create_immv and insert in SERIALIZABLE isolation level
-#
-# Note:
-# In this isolation level, it is possible that create_immv could
-# create an inconsistent view not including effects of a concurrent
-# transaction. So, an warning message is raised to suggest using it
-# in READ COMMITTED or executing refresh_immv to make sure to
-# make the view contents consistent.
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s1	{ SELECT; }
-step create {
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 {SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 create s2 insert c1 check2 c2 mv
-permutation s1 create s2 c1 insert check2 c2 mv
-permutation s1 s2 create insert c1 check2 c2 mv
-permutation s1 s2 insert create c2 check1 c1 mv
-permutation s1 s2 create c1 insert check2 c2 mv
-permutation s2 insert s1 create c2 check1 c1 mv
-permutation s2 insert s1 c2 create check1 c1 mv
-permutation s2 s1 insert c2 create check1 c1 mv
--- a/specs/insert_insert.spec
+++ b/specs/insert_insert.spec
@ -1,62 +0,0 @@
-# Test interaction between concurrent transactions performing
-# table modifications in READ COMMITTED isolation level
-
-setup
-{
-	CREATE TABLE a (i int, j int);
-	CREATE TABLE b (i int, j int);
-	INSERT INTO a VALUES (1,10);
-	INSERT INTO b VALUES (1,100);
-	SELECT pgivm.create_immv('mv(x,y,z)',
-		'SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i');
-	CREATE VIEW v(x,y,z) AS
-		SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-	DROP TABLE b;
-}
-
-session tx1
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s1	{ SELECT; }
-step insert1 { INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200); }
-step update1 { UPDATE a SET j = 11 WHERE i = 1; }
-step check1 { SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv(); }
-
-session tx2
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s2 { SELECT; }
-step insert2 { INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201); }
-step update2 { UPDATE b SET j = 111 WHERE i = 1; }
-step check2 { SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 update1 s2 update2 c1 check2 c2 mv
-permutation s1 update1 s2 c1 update2 check2 c2 mv
-permutation s1 s2 update1 update2 c1 check2 c2 mv
-permutation s1 s2 update2 update1 c2 check1 c1 mv
-permutation s1 s2 update1 c1 update2 check2 c2 mv
-permutation s2 update2 s1 update1 c2 check1 c1 mv
-permutation s2 update2 s1 c2 update1 check1 c1 mv
-permutation s2 s1 update2 c2 update1 check1 c1 mv
-
-permutation s1 insert1 s2 insert2 c1 check2 c2 mv
-permutation s1 insert1 s2 c1 insert2 check2 c2 mv
-permutation s1 s2 insert1 insert2 c1 check2 c2 mv
-permutation s1 s2 insert2 insert1 c2 check1 c1 mv
-permutation s1 s2 insert1 c1 insert2 check2 c2 mv
-permutation s2 insert2 s1 insert1 c2 check1 c1 mv
-permutation s2 insert2 s1 c2 insert1 check1 c1 mv
-permutation s2 s1 insert2 c2 insert1 check1 c1 mv
--- a/specs/insert_insert2.spec
+++ b/specs/insert_insert2.spec
@ -1,62 +0,0 @@
-# Test interaction between concurrent transactions performing
-# table modifications in REPEATABLE READ isolation level
-
-setup
-{
-	CREATE TABLE a (i int, j int);
-	CREATE TABLE b (i int, j int);
-	INSERT INTO a VALUES (1,10);
-	INSERT INTO b VALUES (1,100);
-	SELECT pgivm.create_immv('mv(x,y,z)',
-		'SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i');
-	CREATE VIEW v(x,y,z) AS
-		SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-	DROP TABLE b;
-}
-
-session tx1
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s1	{ SELECT; }
-step insert1 { INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200); }
-step update1 { UPDATE a SET j = 11 WHERE i = 1; }
-step check1 { SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv(); }
-
-session tx2
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s2 { SELECT; }
-step insert2 { INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201); }
-step update2 { UPDATE b SET j = 111 WHERE i = 1; }
-step check2 { SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 update1 s2 update2 c1 check2 c2 mv
-permutation s1 update1 s2 c1 update2 check2 c2 mv
-permutation s1 s2 update1 update2 c1 check2 c2 mv
-permutation s1 s2 update2 update1 c2 check1 c1 mv
-permutation s1 s2 update1 c1 update2 check2 c2 mv
-permutation s2 update2 s1 update1 c2 check1 c1 mv
-permutation s2 update2 s1 c2 update1 check1 c1 mv
-permutation s2 s1 update2 c2 update1 check1 c1 mv
-
-permutation s1 insert1 s2 insert2 c1 check2 c2 mv
-permutation s1 insert1 s2 c1 insert2 check2 c2 mv
-permutation s1 s2 insert1 insert2 c1 check2 c2 mv
-permutation s1 s2 insert2 insert1 c2 check1 c1 mv
-permutation s1 s2 insert1 c1 insert2 check2 c2 mv
-permutation s2 insert2 s1 insert1 c2 check1 c1 mv
-permutation s2 insert2 s1 c2 insert1 check1 c1 mv
-permutation s2 s1 insert2 c2 insert1 check1 c1 mv
--- a/specs/insert_insert3.spec
+++ b/specs/insert_insert3.spec
@ -1,62 +0,0 @@
-# Test interaction between concurrent transactions performing
-# table modifications in SERIALIZABLE isolation level
-
-setup
-{
-	CREATE TABLE a (i int, j int);
-	CREATE TABLE b (i int, j int);
-	INSERT INTO a VALUES (1,10);
-	INSERT INTO b VALUES (1,100);
-	SELECT pgivm.create_immv('mv(x,y,z)',
-		'SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i');
-	CREATE VIEW v(x,y,z) AS
-		SELECT a1.j, a2.j,b.j FROM a AS a1, a AS a2,b WHERE a1.i = a2.i AND a1.i = b.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-	DROP TABLE b;
-}
-
-session tx1
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s1	{ SELECT; }
-step insert1 { INSERT INTO a VALUES (2,20); INSERT INTO b VALUES (2,200); }
-step update1 { UPDATE a SET j = 11 WHERE i = 1; }
-step check1 { SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2,3; SELECT check_mv(); }
-
-session tx2
-setup	{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s2 { SELECT; }
-step insert2 { INSERT INTO a VALUES (1,11), (2,21); INSERT INTO b VALUES (2,201); }
-step update2 { UPDATE b SET j = 111 WHERE i = 1; }
-step check2 { SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 update1 s2 update2 c1 check2 c2 mv
-permutation s1 update1 s2 c1 update2 check2 c2 mv
-permutation s1 s2 update1 update2 c1 check2 c2 mv
-permutation s1 s2 update2 update1 c2 check1 c1 mv
-permutation s1 s2 update1 c1 update2 check2 c2 mv
-permutation s2 update2 s1 update1 c2 check1 c1 mv
-permutation s2 update2 s1 c2 update1 check1 c1 mv
-permutation s2 s1 update2 c2 update1 check1 c1 mv
-
-permutation s1 insert1 s2 insert2 c1 check2 c2 mv
-permutation s1 insert1 s2 c1 insert2 check2 c2 mv
-permutation s1 s2 insert1 insert2 c1 check2 c2 mv
-permutation s1 s2 insert2 insert1 c2 check1 c1 mv
-permutation s1 s2 insert1 c1 insert2 check2 c2 mv
-permutation s2 insert2 s1 insert1 c2 check1 c1 mv
-permutation s2 insert2 s1 c2 insert1 check1 c1 mv
-permutation s2 s1 insert2 c2 insert1 check1 c1 mv
--- a/specs/refresh_insert.spec
+++ b/specs/refresh_insert.spec
@ -1,46 +0,0 @@
-# Test interaction between concurrent transactions performing
-# refresh_immv and insert in READ COMMITTED isolation level
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s1	{ SELECT; }
-step refresh { SELECT pgivm.refresh_immv('mv', true); }
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 {SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 refresh s2 insert c1 check2 c2 mv
-permutation s1 refresh s2 c1 insert check2 c2 mv
-permutation s1 s2 refresh insert c1 check2 c2 mv
-permutation s1 s2 insert refresh c2 check1 c1 mv
-permutation s1 s2 refresh c1 insert check2 c2 mv
-permutation s2 insert s1 refresh c2 check1 c1 mv
-permutation s2 insert s1 c2 refresh check1 c1 mv
-permutation s2 s1 insert c2 refresh check1 c1 mv
--- a/specs/refresh_insert2.spec
+++ b/specs/refresh_insert2.spec
@ -1,46 +0,0 @@
-# Test interaction between concurrent transactions performing
-# refresh_immv and insert in REPEATABLE READ isolation level
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s1	{ SELECT; }
-step refresh { SELECT pgivm.refresh_immv('mv', true); }
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 {SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 refresh s2 insert c1 check2 c2 mv
-permutation s1 refresh s2 c1 insert check2 c2 mv
-permutation s1 s2 refresh insert c1 check2 c2 mv
-permutation s1 s2 insert refresh c2 check1 c1 mv
-permutation s1 s2 refresh c1 insert check2 c2 mv
-permutation s2 insert s1 refresh c2 check1 c1 mv
-permutation s2 insert s1 c2 refresh check1 c1 mv
-permutation s2 s1 insert c2 refresh check1 c1 mv
--- a/specs/refresh_insert3.spec
+++ b/specs/refresh_insert3.spec
@ -1,46 +0,0 @@
-# Test interaction between concurrent transactions performing
-# refresh_immv and insert in SERIALIZABLE isolation level
-
-setup
-{
-	CREATE TABLE a (i int);
-	INSERT INTO a VALUES (1);
-	SELECT pgivm.create_immv('mv(x,y)', 'SELECT * FROM a a1, a a2 WHERE a1.i = a2.i');
-	CREATE VIEW v(x,y) AS SELECT * FROM a AS a1, a AS a2 WHERE a1.i = a2.i;
-	CREATE FUNCTION check_mv() RETURNS text AS
-		$$ SELECT CASE WHEN count(*) = 0 THEN 'ok' ELSE 'ng' END
-			FROM ((SELECT * FROM mv EXCEPT ALL SELECT * FROM v) UNION ALL
-				  (SELECT * FROM v EXCEPT ALL SELECT * FROM mv)) v $$ LANGUAGE sql;
-}
-
-teardown
-{
-	DROP FUNCTION check_mv();
-	DROP TABLE mv;
-	DROP VIEW v;
-	DROP TABLE a;
-}
-
-session tx1
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s1	{ SELECT; }
-step refresh { SELECT pgivm.refresh_immv('mv', true); }
-step check1 {SELECT check_mv();}
-step c1 { COMMIT; }
-step mv { SELECT * FROM mv ORDER BY 1,2; SELECT check_mv(); }
-
-session tx2
-setup		{ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE; }
-step s2	{ SELECT; }
-step insert { INSERT INTO a VALUES (2); }
-step check2 {SELECT check_mv(); }
-step c2 { COMMIT; }
-
-permutation s1 refresh s2 insert c1 check2 c2 mv
-permutation s1 refresh s2 c1 insert check2 c2 mv
-permutation s1 s2 refresh insert c1 check2 c2 mv
-permutation s1 s2 insert refresh c2 check1 c1 mv
-permutation s1 s2 refresh c1 insert check2 c2 mv
-permutation s2 insert s1 refresh c2 check1 c1 mv
-permutation s2 insert s1 c2 refresh check1 c1 mv
-permutation s2 s1 insert c2 refresh check1 c1 mv
--- a/sql/pg_ivm.sql
+++ b/sql/pg_ivm.sql
@ -2,21 +2,14 @@ CREATE EXTENSION pg_ivm;
 GRANT ALL ON SCHEMA public TO public;

 -- create a table to use as a basis for views and materialized views in various combinations
-CREATE TABLE mv_base_a (x int, i int, y int, j int);
-CREATE TABLE mv_base_b (x int, i int, y int, k int);
-
-- test for base tables with dropped columns
-ALTER TABLE mv_base_a DROP COLUMN x;
-ALTER TABLE mv_base_a DROP COLUMN y;
-ALTER TABLE mv_base_b DROP COLUMN x;
-ALTER TABLE mv_base_b DROP COLUMN y;
-
+CREATE TABLE mv_base_a (i int, j int);
 INSERT INTO mv_base_a VALUES
  (1,10),
  (2,20),
  (3,30),
  (4,40),
  (5,50);
+CREATE TABLE mv_base_b (i int, k int);
 INSERT INTO mv_base_b VALUES
  (1,101),
  (2,102),
@ -37,14 +30,6 @@ SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
 ROLLBACK;
 SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;

-- test for renaming column name to camel style
-BEGIN;
-ALTER TABLE mv_base_a RENAME i TO "I";
-ALTER TABLE mv_base_a RENAME j TO "J";
-UPDATE mv_base_a SET "J" = 0 WHERE "I" = 1;
-SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
-ROLLBACK;
-
 -- TRUNCATE a base table in join views
 BEGIN;
 TRUNCATE mv_base_a;
@ -596,16 +581,16 @@ SELECT pgivm.create_immv('mv_ivm_only_values2',  'SELECT * FROM (values(1)) AS t


 -- views containing base tables with Row Level Security
-DROP USER IF EXISTS regress_ivm_admin;
-DROP USER IF EXISTS regress_ivm_user;
-CREATE USER regress_ivm_admin;
-CREATE USER regress_ivm_user;
+DROP USER IF EXISTS ivm_admin;
+DROP USER IF EXISTS ivm_user;
+CREATE USER ivm_admin;
+CREATE USER ivm_user;

 --- create a table with RLS
-SET SESSION AUTHORIZATION regress_ivm_admin;
+SET SESSION AUTHORIZATION ivm_admin;
 CREATE TABLE rls_tbl(id int, data text, owner name);
 INSERT INTO rls_tbl VALUES
-  (1,'foo','regress_ivm_user'),
+  (1,'foo','ivm_user'),
  (2,'bar','postgres');
 CREATE TABLE num_tbl(id int, num text);
 INSERT INTO num_tbl VALUES
@ -622,28 +607,28 @@ ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
 GRANT ALL on rls_tbl TO PUBLIC;
 GRANT ALL on num_tbl TO PUBLIC;

--- create a view owned by regress_ivm_user
-SET SESSION AUTHORIZATION regress_ivm_user;
+--- create a view owned by ivm_user
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls', 'SELECT * FROM rls_tbl');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
 RESET SESSION AUTHORIZATION;

 --- inserts rows owned by different users
 INSERT INTO rls_tbl VALUES
-  (3,'baz','regress_ivm_user'),
+  (3,'baz','ivm_user'),
  (4,'qux','postgres');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;

 --- combination of diffent kinds of commands
 WITH
- i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','regress_ivm_user')),
+ i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','ivm_user')),
 u AS (UPDATE rls_tbl SET owner = 'postgres' WHERE id = 1),
- u2 AS (UPDATE rls_tbl SET owner = 'regress_ivm_user' WHERE id = 2)
+ u2 AS (UPDATE rls_tbl SET owner = 'ivm_user' WHERE id = 2)
 SELECT;
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;

 ---
-SET SESSION AUTHORIZATION regress_ivm_user;
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls2', 'SELECT * FROM rls_tbl JOIN num_tbl USING(id)');
 RESET SESSION AUTHORIZATION;

@ -656,8 +641,8 @@ SELECT * FROM ivm_rls2 ORDER BY 1,2,3;
 DROP TABLE rls_tbl CASCADE;
 DROP TABLE num_tbl CASCADE;

-DROP USER regress_ivm_user;
-DROP USER regress_ivm_admin;
+DROP USER ivm_user;
+DROP USER ivm_admin;

 -- automatic index creation
 BEGIN;