Merge branch 'master' of https://github.com/postgrespro/vops

Author: knizhnik

expected/test.out

@@ -301,6 +301,7 @@ select sum(x) over (order by id rows between 9 preceding and current row) from s
  955
 (100 rows)
 
+set vops.auto_substitute_projections=on;
 create table it(i interval, t varchar(4));
 insert into it values ('1 second','sec'), ('1 minute','min'), ('1 hour','hour');
 select create_projection('vit','it',array['i','t']);

sql/test.sql

@@ -23,6 +23,7 @@ select populate(destination:='v2'::regclass, source:='s2'::regclass,sort:='id');
 select unnest(t.*) from (select msum(x,10) over (order by first(id)) from v2) t;
 select sum(x) over (order by id rows between 9 preceding and current row) from s2;
 
+set vops.auto_substitute_projections=on;
 create table it(i interval, t varchar(4));
 insert into it values ('1 second','sec'), ('1 minute','min'), ('1 hour','hour');
 select create_projection('vit','it',array['i','t']);

vops.c

@@ -4042,30 +4042,44 @@ vops_substitute_tables_with_projections(char const* queryString, Query *query)
 			TupleDesc tupDesc = SPI_tuptable->tupdesc;
 			bool isnull;
 			char* projectionName = SPI_getvalue(tuple, tupDesc, 1);
-			ArrayType* vectorColumns = (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(SPI_getbinval(tuple, tupDesc, 3, &isnull)));
-			ArrayType* scalarColumns = (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(SPI_getbinval(tuple, tupDesc, 4, &isnull)));
+			ArrayType* vectorColumns = NULL;
+			ArrayType* scalarColumns = NULL;
 			char* keyName = SPI_getvalue(tuple, tupDesc, 5);
 			Datum* vectorAttnos;
 			Datum* scalarAttnos;
+			Datum  datum;
 			int    nScalarColumns;
 			int    nVectorColumns;
 			Bitmapset* vectorAttrs = NULL;
 			Bitmapset* scalarAttrs = NULL;
 			Bitmapset* allAttrs;
 
-			/* Construct set of used vector columns */
-			deconstruct_array(vectorColumns, INT4OID, 4, true, 'i', &vectorAttnos, NULL, &nVectorColumns);
-			for (j = 0; j < nVectorColumns; j++)
+
+			datum = SPI_getbinval(tuple, tupDesc, 3, &isnull);
+			if (!isnull)
 			{
-				vectorAttrs = bms_add_member(vectorAttrs, DatumGetInt32(vectorAttnos[j]));
+				vectorColumns = (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(datum));
+
+				/* Construct set of used vector columns */
+				deconstruct_array(vectorColumns, INT4OID, 4, true, 'i', &vectorAttnos, NULL, &nVectorColumns);
+				for (j = 0; j < nVectorColumns; j++)
+				{
+					vectorAttrs = bms_add_member(vectorAttrs, DatumGetInt32(vectorAttnos[j]));
+				}
 			}
 
-			/* Construct set of used scalar columns */
-			deconstruct_array(scalarColumns, INT4OID, 4, true, 'i', &scalarAttnos, NULL, &nScalarColumns);
-			for (j = 0; j < nScalarColumns; j++)
+			datum = SPI_getbinval(tuple, tupDesc, 4, &isnull);
+			if (!isnull)
 			{
-				scalarAttrs = bms_add_member(scalarAttrs, DatumGetInt32(scalarAttnos[j]));
-			}
+				scalarColumns = isnull ? NULL : (ArrayType*)DatumGetPointer(PG_DETOAST_DATUM(datum));
+
+				/* Construct set of used scalar columns */
+				deconstruct_array(scalarColumns, INT4OID, 4, true, 'i', &scalarAttnos, NULL, &nScalarColumns);
+				for (j = 0; j < nScalarColumns; j++)
+				{
+					scalarAttrs = bms_add_member(scalarAttrs, DatumGetInt32(scalarAttnos[j]));
+				}
+			} 
 			allAttrs = bms_union(vectorAttrs, vectorAttrs);
 
 			hasAggregates |= refs->agg != NULL;