Changeset: 5b5dd6c2d7d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b5dd6c2d7d0
Added Files:
        gdk/gdk_orderidx.c
        monetdb5/modules/mal/Tests/orderidx00.malC
        monetdb5/modules/mal/Tests/orderidx00.stable.err
        monetdb5/modules/mal/Tests/orderidx00.stable.out
        monetdb5/modules/mal/Tests/orderidx01.malC
        monetdb5/modules/mal/Tests/orderidx01.stable.err
        monetdb5/modules/mal/Tests/orderidx01.stable.out
        monetdb5/modules/mal/Tests/orderidx02.malC
        monetdb5/modules/mal/Tests/orderidx02.stable.err
        monetdb5/modules/mal/Tests/orderidx02.stable.out
        monetdb5/modules/mal/Tests/orderidx04.malC
        monetdb5/modules/mal/orderidx.c
        monetdb5/modules/mal/orderidx.h
        monetdb5/modules/mal/orderidx.mal
        sql/backends/monet5/sql_orderidx.c
        sql/backends/monet5/sql_orderidx.h
        sql/benchmarks/orderindex/experiment.sh
        sql/benchmarks/tpch/Tests/lowcardinality.sql
        sql/benchmarks/tpch/Tests/lowcardinality.stable.err
        sql/benchmarks/tpch/Tests/lowcardinality.stable.out
        sql/scripts/18_index.sql
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
        sql/test/BugTracker-2016/Tests/data3987.csv
        
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.sql
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.err
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.out
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.sql
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.err
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.sql
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.stable.err
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.stable.out
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.sql.in
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.out
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.sql
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.err
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.sql
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.err
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out
        sql/test/orderidx/Tests/All
        sql/test/orderidx/Tests/simpletable.sql
        sql/test/orderidx/Tests/simpletable.stable.err
        sql/test/orderidx/Tests/simpletable.stable.out
        sql/test/orderidx/Tests/smalltable.sql
        sql/test/orderidx/Tests/smalltable.stable.err
        sql/test/orderidx/Tests/smalltable.stable.out
        sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32
Removed Files:
        sql/test/pg_regress/Tests/oid.stable.err.oid32
Modified Files:
        MacOSX/post-install.sh
        MonetDB.spec
        clients/Tests/All
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        clients/Tests/exports.stable.out
        clients/mapiclient/eventparser.c
        clients/mapiclient/mclient.c
        clients/mapilib/mapi.c
        clients/odbc/driver/SQLBrowseConnect.c
        clients/odbc/winsetup/setup.rc
        clients/python2/monetdb/mapi.py
        clients/python3/monetdb/mapi.py
        common/stream/stream.c
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_align.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_hash.c
        gdk/gdk_hash.h
        gdk/gdk_heap.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_search.c
        gdk/gdk_select.c
        gdk/gdk_storage.c
        gdk/gdk_utils.c
        geom/BugTracker/Tests/All
        geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
        geom/lib/libgeom.c
        geom/lib/libgeom.h
        geom/monetdb5/geom.c
        geom/monetdb5/geom.h
        geom/monetdb5/geomBulk.c
        geom/sql/functions/Tests/ST_LineFromText.stable.err
        geom/sql/functions/Tests/ST_MLineFromText.stable.err
        geom/sql/functions/Tests/ST_MPointFromText.stable.err
        geom/sql/functions/Tests/ST_MPolygonFromText.stable.err
        geom/sql/functions/Tests/ST_PointFromText.stable.err
        geom/sql/functions/Tests/ST_PolygonFromText.stable.err
        geom/sql/functions/Tests/XYZ.stable.err
        java/ChangeLog.Jun2016
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
        java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
        java/tests/Test_Rmetadata.java
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
        monetdb5/mal/Tests/tst611.malC
        monetdb5/mal/mal.h
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_errors.h
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_resolve.c
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/atoms/mtime.mal
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/Tests/All
        monetdb5/modules/mal/Tests/inspect05.stable.out
        monetdb5/modules/mal/Tests/inspect05.stable.out.int128
        monetdb5/modules/mal/Tests/remote03.stable.err
        monetdb5/modules/mal/mal_init.mal
        monetdb5/modules/mal/tablet.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_reorder.c
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.h
        sql/backends/monet5/sql.mal
        sql/backends/monet5/sql_aggr_bte.mal
        sql/backends/monet5/sql_aggr_dbl.mal
        sql/backends/monet5/sql_aggr_flt.mal
        sql/backends/monet5/sql_aggr_hge.mal
        sql/backends/monet5/sql_aggr_int.mal
        sql/backends/monet5/sql_aggr_lng.mal
        sql/backends/monet5/sql_aggr_sht.mal
        sql/backends/monet5/sql_aggr_wrd.mal
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_upgrades.c
        sql/benchmarks/ssbm/Tests/load.SQL.py
        sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
        sql/benchmarks/tpch/Tests/04-explain.stable.out
        sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out
        sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/13-plan.stable.out
        sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/All
        sql/benchmarks/tpch/Tests/load.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
        sql/include/sql_catalog.h
        sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
        sql/scripts/75_storagemodel.sql
        sql/scripts/Makefile.ag
        sql/server/rel_optimizer.c
        sql/server/rel_rel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_select.h
        sql/server/sql_parser.y
        sql/server/sql_scan.c
        sql/storage/bat/bat_storage.c
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-1.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-2.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_OK-0.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_OK-4.sql.in
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
        sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/segfault_in_aggregation.Bug-3225.sql.in
        sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.sql.in
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
        sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
        sql/test/BugTracker-2016/Tests/All
        sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.err
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
        sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
        
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.sql
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
        
sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.sql.in
        sql/test/Dependencies/Tests/Dependencies.stable.err
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.out.int128
        sql/test/Tests/All
        sql/test/Tests/median_stdev.stable.out
        sql/test/Tests/outerref_in_selection.stable.out
        sql/test/Tests/outerref_in_selection.stable.out.int128
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/Users/Tests/copyinto.stable.err
        sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
        sql/test/Users/Tests/grantMonetdb.stable.err
        sql/test/leaks/Tests/All
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/leaks/Tests/drop3.stable.out
        sql/test/leaks/Tests/drop3.stable.out.int128
        sql/test/leaks/Tests/select1.stable.out
        sql/test/leaks/Tests/select1.stable.out.int128
        sql/test/leaks/Tests/select2.stable.out
        sql/test/leaks/Tests/select2.stable.out.int128
        sql/test/leaks/Tests/temp1.stable.out
        sql/test/leaks/Tests/temp1.stable.out.int128
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/leaks/Tests/temp2.stable.out.int128
        sql/test/leaks/Tests/temp3.stable.out
        sql/test/leaks/Tests/temp3.stable.out.int128
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/pg_regress/Tests/All
        sql/test/pg_regress/Tests/box.stable.err
        sql/test/pg_regress/Tests/oid.stable.err.int128
        sql/test/pg_regress/Tests/path.stable.err
        sql/test/pg_regress/Tests/point.stable.err
        sql/test/pg_regress/Tests/polygon.stable.err
        sql/test/remote/Tests/partition_elim.stable.out
        testing/Mtest.py.in
        tools/embedded/build-on-windows.bat
        tools/embedded/build-rpkg.sh
        tools/embedded/inlined_scripts.c
        tools/embedded/inlined_scripts.sh
        tools/embedded/rpackage/DESCRIPTION
        tools/embedded/rpackage/configure.win
        tools/embedded/windows/sedscript.tpl
        tools/merovingian/daemon/monetdbd.1.in
        tools/mserver/mserver5.c
Branch: sfcgal
Log Message:

Merge with default


diffs (truncated from 37926 to 300 lines):

diff --git a/MacOSX/post-install.sh b/MacOSX/post-install.sh
--- a/MacOSX/post-install.sh
+++ b/MacOSX/post-install.sh
@@ -2,6 +2,14 @@
 
 monetdb_path=/usr/local/monetdb/bin
 
-if [[ ":$PATH:" != *":$monetdb_path:"* ]]; then
-    printf '\n# Set MonetDB path\nexport PATH=$PATH:'$monetdb_path'\n' >> 
~/.profile
-fi
+case $PATH in
+*:$monetdb_path|*:$monetdb_path:*|$monetdb_path:*)
+    ;;
+*)
+    cat >> ~/.profile <<EOF
+
+# Set MonetDB path
+export PATH=\$PATH:$monetdb_path
+EOF
+    ;;
+esac
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -997,7 +997,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 * Mon Apr  4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405
 - gdk: Fixed a bug that caused various instances where old data returned or
   where crashes occurred.  The problem was that internally data wasn't
-  always marked dirty when it was being changed, causiing later processing
+  always marked dirty when it was being changed, causing later processing
   to not deal with the changed data correctly.
 
 * Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324
diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -1,29 +1,32 @@
 stdout of test 'MAL-signatures` in directory 'clients` itself:
 
 
-# 21:33:47 >  
-# 21:33:47 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35607" "--set" 
"mapi_usock=/var/tmp/mtest-19610/.s.monetdb.35607" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_clients" "--set" 
"mal_listing=2"
-# 21:33:47 >  
-
-# MonetDB 5 server v11.17.22 (hg id: 570fbe10eb64+)
+# 21:44:50 >  
+# 21:44:50 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=33053" "--set" 
"mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" 
"mal_listing=2" "--set" "embedded_r=yes"
+# 21:44:50 >  
+
+# MonetDB 5 server v11.20.0
 # This is an unreleased version
 # Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
 # Found 7.734 GiB available main-memory.
 # Copyright (c) 1993-July 2008 CWI.
 # Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
 # Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://gaai.mullender.nl:35607/
-# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-19610/.s.monetdb.35607
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
 
 Ready.
 
-# 21:33:48 >  
-# 21:33:48 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-19610" "--port=35607"
-# 21:33:48 >  
+# 15:16:50 >  
+# 15:16:50 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-9622" "--port=32080"
+# 15:16:50 >  
+
+command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1]) 
(X_4:bat[:dbl],X_5:bat[:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on hge, also returns count
+
+command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on hge
 
 command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]) 
(X_4:bat[:dbl],X_5:bat[:wrd]) 
 address AGGRavg23_dbl;
@@ -85,32 +88,20 @@ pattern aggr.avg(b:bat[:any_2]):dbl
 address CMDcalcavg;
 comment Gives the avg of all tail values
 
-function 
aggr.corr(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2]):bat[:dbl];
-function 
aggr.covar(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2]):bat[:dbl];
+function aggr.corr(e1:bat[:hge],e2:bat[:hge]):hge;
+function aggr.covar(e1:bat[:hge],e2:bat[:hge]):hge;
 function aggr.corr(e1:bat[:dbl],e2:bat[:dbl]):dbl;
 function aggr.covar(e1:bat[:dbl],e2:bat[:dbl]):dbl;
-function 
aggr.corr(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2]):bat[:flt];
-function 
aggr.covar(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2]):bat[:flt];
 function aggr.corr(e1:bat[:flt],e2:bat[:flt]):flt;
 function aggr.covar(e1:bat[:flt],e2:bat[:flt]):flt;
-function 
aggr.corr(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2]):bat[:lng];
-function 
aggr.covar(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2]):bat[:lng];
 function aggr.corr(e1:bat[:lng],e2:bat[:lng]):lng;
 function aggr.covar(e1:bat[:lng],e2:bat[:lng]):lng;
-function 
aggr.corr(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2]):bat[:wrd];
-function 
aggr.covar(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2]):bat[:wrd];
 function aggr.corr(e1:bat[:wrd],e2:bat[:wrd]):wrd;
 function aggr.covar(e1:bat[:wrd],e2:bat[:wrd]):wrd;
-function 
aggr.corr(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2]):bat[:int];
-function 
aggr.covar(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2]):bat[:int];
 function aggr.corr(e1:bat[:int],e2:bat[:int]):int;
 function aggr.covar(e1:bat[:int],e2:bat[:int]):int;
-function 
aggr.corr(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2]):bat[:sht];
-function 
aggr.covar(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2]):bat[:sht];
 function aggr.corr(e1:bat[:sht],e2:bat[:sht]):sht;
 function aggr.covar(e1:bat[:sht],e2:bat[:sht]):sht;
-function 
aggr.corr(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2]):bat[:bte];
-function 
aggr.covar(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2]):bat[:bte];
 function aggr.corr(e1:bat[:bte],e2:bat[:bte]):bte;
 function aggr.covar(e1:bat[:bte],e2:bat[:bte]):bte;
 command aggr.count_no_nil(b:bat[:any_1],g:bat[:oid],e:bat[:any_2]):bat[:wrd] 
@@ -532,6 +523,142 @@ pattern aggr.prod(b:bat[:bte]):bte
 address CMDBATprod;
 comment Calculate aggregate product of B.
 
+pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:hge],s:bat[:oid]):dbl 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):dbl 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:hge]):dbl 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:hge],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:hge]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:lng],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:lng],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:lng],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:lng]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:wrd],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:wrd],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:wrd],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:wrd]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:int],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:int],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:int],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:int]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:sht],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:sht],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:sht],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:sht]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:bte],s:bat[:oid],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:bte],s:bat[:oid]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B with candidate list.
+
+pattern aggr.prod(b:bat[:bte],nil_if_empty:bit):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+pattern aggr.prod(b:bat[:bte]):hge 
+address CMDBATprod;
+comment Calculate aggregate product of B.
+
+command aggr.prod(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on hge
+
+command aggr.prod(b:bat[:lng],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on lng
+
+command aggr.prod(b:bat[:wrd],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on wrd
+
+command aggr.prod(b:bat[:int],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on int
+
+command aggr.prod(b:bat[:sht],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on sht
+
+command aggr.prod(b:bat[:bte],g:bat[:oid],e:bat[:any_1]):bat[:hge] 
+address AGGRprod3_hge;
+comment Grouped tail product on bte
+
 command aggr.prod(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]):bat[:dbl] 
 address AGGRprod3_dbl;
 comment Grouped tail product on dbl
@@ -609,6 +736,22 @@ command aggr.quantile(b:bat[:any_1],g:ba
 address AGGRquantile3;
 comment Grouped quantile aggregate
 
+function 
aggr.subcorr(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge];
+function 
aggr.subcovar(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge];
+function 
aggr.subcorr(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl];
+function 
aggr.subcovar(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl];
+function 
aggr.subcorr(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2],f:bit):bat[:flt];
+function 
aggr.subcovar(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2],f:bit):bat[:flt];
+function 
aggr.subcorr(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2],f:bit):bat[:lng];
+function 
aggr.subcovar(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2],f:bit):bat[:lng];
+function 
aggr.subcorr(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2],f:bit):bat[:wrd];
+function 
aggr.subcovar(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2],f:bit):bat[:wrd];
+function 
aggr.subcorr(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2],f:bit):bat[:int];
+function 
aggr.subcovar(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2],f:bit):bat[:int];
+function 
aggr.subcorr(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2],f:bit):bat[:sht];
+function 
aggr.subcovar(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2],f:bit):bat[:sht];
+function 
aggr.subcorr(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2],f:bit):bat[:bte];
+function 
aggr.subcovar(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2],f:bit):bat[:bte];
 pattern aggr.sum(b:bat[:dbl],s:bat[:oid],nil_if_empty:bit):dbl 
 address CMDBATsum;
 comment Calculate aggregate sum of B with candidate list.
@@ -977,6 +1120,294 @@ pattern aggr.sum(b:bat[:bte]):bte
 address CMDBATsum;
 comment Calculate aggregate sum of B.
 
+pattern aggr.sum(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl 
+address CMDBATsum;
+comment Calculate aggregate sum of B with candidate list.
+
+pattern aggr.sum(b:bat[:hge],s:bat[:oid]):dbl 
+address CMDBATsum;
+comment Calculate aggregate sum of B with candidate list.
+
+pattern aggr.sum(b:bat[:hge],nil_if_empty:bit):dbl 
+address CMDBATsum;
+comment Calculate aggregate sum of B.
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to