@@ -4042,18 +4042,26 @@ vops_substitute_tables_with_projections(char const* queryString, Query *query)
40424042TupleDesc tupDesc = SPI_tuptable -> tupdesc ;
40434043bool isnull ;
40444044char * projectionName = SPI_getvalue (tuple ,tupDesc ,1 );
4045- ArrayType * vectorColumns = ( ArrayType * ) DatumGetPointer ( PG_DETOAST_DATUM ( SPI_getbinval ( tuple , tupDesc , 3 , & isnull ))) ;
4046- ArrayType * scalarColumns = ( ArrayType * ) DatumGetPointer ( PG_DETOAST_DATUM ( SPI_getbinval ( tuple , tupDesc , 4 , & isnull ))) ;
4045+ ArrayType * vectorColumns ;
4046+ ArrayType * scalarColumns ;
40474047char * keyName = SPI_getvalue (tuple ,tupDesc ,5 );
40484048Datum * vectorAttnos ;
40494049Datum * scalarAttnos ;
4050+ Datum datum ;
40504051int nScalarColumns ;
40514052int nVectorColumns ;
40524053Bitmapset * vectorAttrs = NULL ;
40534054Bitmapset * scalarAttrs = NULL ;
40544055Bitmapset * allAttrs ;
40554056
4056- /* Construct set of used vector columns */
4057+
4058+ datum = SPI_getbinval (tuple ,tupDesc ,3 ,& isnull );
4059+ vectorColumns = isnull ?NULL : (ArrayType * )DatumGetPointer (PG_DETOAST_DATUM (datum ));
4060+
4061+ datum = SPI_getbinval (tuple ,tupDesc ,4 ,& isnull );
4062+ scalarColumns = isnull ?NULL : (ArrayType * )DatumGetPointer (PG_DETOAST_DATUM (datum ));
4063+
4064+ /* Construct set of used vector columns */
40574065deconstruct_array (vectorColumns ,INT4OID ,4 , true,'i' ,& vectorAttnos ,NULL ,& nVectorColumns );
40584066for (j = 0 ;j < nVectorColumns ;j ++ )
40594067{