Changeset: 57e885708deb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57e885708deb
Added Files:
        sql/test/analytics/Tests/analytics16.sql
        sql/test/analytics/Tests/analytics16.stable.err
        sql/test/analytics/Tests/analytics16.stable.out
Modified Files:
        monetdb5/modules/kernel/00_aggr_hge.mal
        monetdb5/modules/kernel/00_aggr_hge.mal.sh
        monetdb5/modules/kernel/aggr.mal
        monetdb5/modules/kernel/aggr.mal.sh
        sql/backends/monet5/sql_statement.c
        sql/test/analytics/Tests/All
Branch: statistics-analytics
Log Message:

Fix and approved output


diffs (truncated from 1343 to 300 lines):

diff --git a/monetdb5/modules/kernel/00_aggr_hge.mal 
b/monetdb5/modules/kernel/00_aggr_hge.mal
--- a/monetdb5/modules/kernel/00_aggr_hge.mal
+++ b/monetdb5/modules/kernel/00_aggr_hge.mal
@@ -210,27 +210,27 @@ command subvariancep(b:bat[:hge],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:hge],c:bat[:hge],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:hge],b2:bat[:hge],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
diff --git a/monetdb5/modules/kernel/00_aggr_hge.mal.sh 
b/monetdb5/modules/kernel/00_aggr_hge.mal.sh
--- a/monetdb5/modules/kernel/00_aggr_hge.mal.sh
+++ b/monetdb5/modules/kernel/00_aggr_hge.mal.sh
@@ -158,27 +158,27 @@ EOF
     done
 
     cat <<EOF
-command covariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
diff --git a/monetdb5/modules/kernel/aggr.mal b/monetdb5/modules/kernel/aggr.mal
--- a/monetdb5/modules/kernel/aggr.mal
+++ b/monetdb5/modules/kernel/aggr.mal
@@ -462,27 +462,27 @@ command subvariancep(b:bat[:bte],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:bte],c:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:bte],b2:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
@@ -582,27 +582,27 @@ command subvariancep(b:bat[:sht],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:sht],c:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:sht],b2:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
@@ -702,27 +702,27 @@ command subvariancep(b:bat[:int],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:int],c:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:int],b2:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
@@ -822,27 +822,27 @@ command subvariancep(b:bat[:lng],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:lng],c:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:lng],b2:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
@@ -942,27 +942,27 @@ command subvariancep(b:bat[:flt],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:flt],c:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:flt],b2:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
@@ -1062,27 +1062,27 @@ command subvariancep(b:bat[:dbl],g:bat[:
 address AGGRsubvariancepcand_dbl
 comment "Grouped variance (population/biased) aggregate with candidates list";
 
-command covariance(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancecand
 comment "Grouped covariance sample aggregate with candidate list";
 
-command covariancep(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariancep(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariancep
 comment "Covariance population aggregate";
 
-command 
subcovariancep(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancep
 comment "Grouped covariance population aggregate";
 
-command 
subcovariancep(b:bat[:dbl],c:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariancep(b1:bat[:dbl],b2:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariancepcand
 comment "Grouped covariance population aggregate with candidate list";
 
diff --git a/monetdb5/modules/kernel/aggr.mal.sh 
b/monetdb5/modules/kernel/aggr.mal.sh
--- a/monetdb5/modules/kernel/aggr.mal.sh
+++ b/monetdb5/modules/kernel/aggr.mal.sh
@@ -177,27 +177,27 @@ EOF
     done
 
     cat <<EOF
-command covariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
+command covariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) 
:bat[:dbl]
 address AGGRcovariance
 comment "Covariance sample aggregate";
 
-command 
subcovariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
 address AGGRsubcovariance
 comment "Grouped covariance sample aggregate";
 
-command 
subcovariance(b:bat[:${tp}],c:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
+command 
subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
 :bat[:dbl]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to