Add vops_initialize and ifnull functions

Author: knizhnik

expected/test.out

@@ -58,3 +58,9 @@ select count(*),count(x),sum(x),avg(x),min(x),max(x),variance(x),var_pop(x),var_
      3 |     3 |   9 |   3 |   2 |   4 |        1 | 0.666666666666667 |        1 |      1 | 0.816496580927726 |           1
 (1 row)
 
+select count(*) from v where ifnull(x, 0) >= 0;
+ count 
+-------
+    64
+(1 row)
+

sql/test.sql

@@ -11,3 +11,4 @@ select count(*),count(x),sum(x),avg(x),min(x),max(x),variance(x),var_pop(x),var_
 select count(*),count(x),sum(x),avg(x),min(x),max(x),variance(x),var_pop(x),var_samp(x),stddev(x),stddev_pop(x),stddev_samp(x) from s where x >= 0.0;
 select count(*),count(x),sum(x),avg(x),min(x),max(x),variance(x),var_pop(x),var_samp(x),stddev(x),stddev_pop(x),stddev_samp(x) from v where x > 1.0;
 select count(*),count(x),sum(x),avg(x),min(x),max(x),variance(x),var_pop(x),var_samp(x),stddev(x),stddev_pop(x),stddev_samp(x) from s where x > 1.0;
+select count(*) from v where ifnull(x, 0) >= 0;

vops--1.0.sql

@@ -191,6 +191,8 @@ create operator <= (leftarg=int4, rightarg=vops_char, procedure=vops_char_le_lco
 
 create function betwixt(opd vops_char, low int4, high int4) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_char' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_char, subst int4) returns vops_char as 'MODULE_PATHNAME','vops_ifnull_char' language C parallel safe immutable;
+
 create function vops_char_neg(right vops_char) returns vops_char as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_char, procedure=vops_char_neg);
 
@@ -402,6 +404,8 @@ create operator <= (leftarg=int4, rightarg=vops_int2, procedure=vops_int2_le_lco
 
 create function betwixt(opd vops_int2, low int4, high int4) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_int2' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_int2, subst int4) returns vops_int2 as 'MODULE_PATHNAME','vops_ifnull_int2' language C parallel safe immutable;
+
 create function vops_int2_neg(right vops_int2) returns vops_int2 as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_int2, procedure=vops_int2_neg);
 
@@ -603,6 +607,8 @@ create operator <= (leftarg=int4, rightarg=vops_int4, procedure=vops_int4_le_lco
 
 create function betwixt(opd vops_int4, low int4, high int4) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_int4' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_int4, subst int4) returns vops_int4 as 'MODULE_PATHNAME','vops_ifnull_int4' language C parallel safe immutable;
+
 create function vops_int4_neg(right vops_int4) returns vops_int4 as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_int4, procedure=vops_int4_neg);
 
@@ -800,6 +806,8 @@ create operator <= (leftarg=date, rightarg=vops_date, procedure=vops_date_le_lco
 
 create function betwixt(opd vops_date, low date, high date) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_int4' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_date, subst date) returns vops_date as 'MODULE_PATHNAME','vops_ifnull_int4' language C parallel safe immutable;
+
 create function vops_date_neg(right vops_date) returns vops_date as 'MODULE_PATHNAME','vops_int4_neg' language C parallel safe immutable strict;
 create operator - (rightarg=vops_date, procedure=vops_date_neg);
 
@@ -997,6 +1005,8 @@ create operator <= (leftarg=timestamp, rightarg=vops_timestamp, procedure=vops_t
 
 create function betwixt(opd vops_timestamp, low timestamp, high timestamp) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_int8' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_timestamp, subst timestamp) returns vops_timestamp as 'MODULE_PATHNAME','vops_ifnull_int8' language C parallel safe immutable;
+
 create function vops_timestamp_neg(right vops_timestamp) returns vops_timestamp as 'MODULE_PATHNAME','vops_int8_neg' language C parallel safe immutable strict;
 create operator - (rightarg=vops_timestamp, procedure=vops_timestamp_neg);
 
@@ -1194,6 +1204,8 @@ create operator <= (leftarg=int8, rightarg=vops_int8, procedure=vops_int8_le_lco
 
 create function betwixt(opd vops_int8, low int8, high int8) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_int8' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_int8, subst int8) returns vops_int8 as 'MODULE_PATHNAME','vops_ifnull_int8' language C parallel safe immutable;
+
 create function vops_int8_neg(right vops_int8) returns vops_int8 as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_int8, procedure=vops_int8_neg);
 
@@ -1382,6 +1394,8 @@ create operator <= (leftarg=float8, rightarg=vops_float4, procedure=vops_float4_
 
 create function betwixt(opd vops_float4, low float8, high float8) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_float4' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_float4, subst float8) returns vops_float4 as 'MODULE_PATHNAME','vops_ifnull_float4' language C parallel safe immutable;
+
 create function vops_float4_neg(right vops_float4) returns vops_float4 as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_float4, procedure=vops_float4_neg);
 
@@ -1569,6 +1583,8 @@ create operator <= (leftarg=float8, rightarg=vops_float8, procedure=vops_float8_
 
 create function betwixt(opd vops_float8, low float8, high float8) returns vops_bool as 'MODULE_PATHNAME','vops_betwixt_float8' language C parallel safe immutable strict;
 
+create function ifnull(opd vops_float8, subst float8) returns vops_float8 as 'MODULE_PATHNAME','vops_ifnull_float8' language C parallel safe immutable;
+
 create function vops_float8_neg(right vops_float8) returns vops_float8 as 'MODULE_PATHNAME' language C parallel safe immutable strict;
 create operator - (rightarg=vops_float8, procedure=vops_float8_neg);
 
@@ -1706,6 +1722,9 @@ CREATE AGGREGATE countall(*) (
 
 -- Generic functions
 
+-- Call this function to force loading of VOPS extension (if it is not registered in shared_preload_libraries list
+create function vops_initialize() returns void as 'MODULE_PATHNAME' language C;
+
 create function filter(condition vops_bool) returns bool as 'MODULE_PATHNAME','vops_filter' language C parallel safe strict immutable;
 
 create function populate(destination regclass, source regclass, predicate cstring default null, sort cstring default null) returns void as 'MODULE_PATHNAME','vops_populate' language C;
@@ -1719,3 +1738,4 @@ create cast (vops_bool as bool) with function filter(vops_bool) AS IMPLICIT;
 
 create function is_null(anyelement) returns vops_bool as 'MODULE_PATHNAME','vops_is_null'  language C parallel safe immutable;
 create function is_not_null(anyelement) returns vops_bool as 'MODULE_PATHNAME','vops_is_not_null'  language C parallel safe immutable;
+

vops.c

@@ -299,6 +299,21 @@ static bool is_vops_type(Oid typeid)
 		PG_RETURN_POINTER(result);										\
 	}																	\
 
+#define IFNULL_OP(TYPE,CTYPE,GXTYPE)									\
+	PG_FUNCTION_INFO_V1(vops_ifnull_##TYPE);							\
+	Datum vops_ifnull_##TYPE(PG_FUNCTION_ARGS)							\
+	{																	\
+	    vops_##TYPE* opd = (vops_##TYPE*)PG_GETARG_POINTER(0);			\
+		CTYPE subst = (CTYPE)PG_GETARG_##GXTYPE(1);						\
+		vops_##TYPE* result = (vops_##TYPE*)palloc(sizeof(vops_##TYPE)); \
+		int i;															\
+		for (i = 0; i < TILE_SIZE; i++) {								\
+			result->payload[i] = (opd->nullmask & ((uint64)1 << i)) ? subst : opd->payload[i]; \
+		}																\
+		result->nullmask = 0;						                    \
+		PG_RETURN_POINTER(result);										\
+	}																	\
+
 #define BIN_RCONST_OP(TYPE,XTYPE,GXTYPE,OP,COP)							\
 	PG_FUNCTION_INFO_V1(vops_##TYPE##_##OP##_rconst);	                \
 	Datum vops_##TYPE##_##OP##_rconst(PG_FUNCTION_ARGS)					\
@@ -1056,6 +1071,7 @@ Datum vops_agg_deserial(PG_FUNCTION_ARGS)
 	CMP_LCONST_OP(TYPE,XTYPE,GXTYPE,ge,>=)					\
 	CMP_RCONST_OP(TYPE,XTYPE,GXTYPE,ge,>=)					\
 	BETWIXT_OP(TYPE,XTYPE,GXTYPE)							\
+	IFNULL_OP(TYPE,CTYPE,GXTYPE)							\
     COUNT_AGG(TYPE)											\
 	SUM_AGG(TYPE,STYPE,GSTYPE)								\
 	AVG_AGG(TYPE)											\
@@ -1963,6 +1979,13 @@ Datum vops_is_not_null(PG_FUNCTION_ARGS)
 	}
 	PG_RETURN_POINTER(result);
 }
+
+PG_FUNCTION_INFO_V1(vops_initialize);
+Datum vops_initialize(PG_FUNCTION_ARGS) 
+{
+	PG_RETURN_VOID();
+}
+
 
 static Oid vops_bool_oid;
 static Oid filter_oid;

vops.html

@@ -256,7 +256,10 @@ <h3><a name="operators">Vector operators</a></h3>
 <tr><td><code>&</code></td><td>Boolean AND</td></tr>
 <tr><td><code>|</code></td><td>Boolean OR</td></tr>
 <tr><td><code>!</code></td><td>Boolean NOT</td></tr>
-<tr><td><code>BITWIXT</code></td><td>Analog of BETWEEN</td></tr>
+<tr><td><code>bitwixt(x,low,high)</code></td><td>Analog of BETWEEN</td></tr>
+<tr><td><code>is_null(x)</code></td><td>Analog of IS NULL</td></tr>
+<tr><td><code>is_not_null(x)</code></td><td>Analog of IS NOT NULL</td></tr>
+<tr><td><code>ifnull(x,subst)</code></td><td>Analog of COALESCE</td></tr>
 </table>
 
 <h3><a name="aggregates">Vector aggregates</a></h3>
@@ -571,6 +574,8 @@ <h2><a name="transform">Standard SQL query transformation</a></h2>
 But if extension was not registered in <code>shared_preload_libraries</code> list, then it will be loaded on demand when any function of this extension is requested.
 Unfortunately it happens <b>after</b> parse analyze is done. So first time you execute VOPS query, it will not be transformed. You can get wrong result in this case.
 Either take it in account, either add <code>vops</code> to <code>shared_preload_libraries</code> configuration string.
+VOPS extension provides special function <code>vops_initialize()</code> which can be invoked to force initialization of VOPS extension.
+After invocation of this function, extension will be loaded and all subsequent queries will be normally transformed and produce expected results.
 </p>
 
 <h2><a name="example">Example</a></h2>