Changeset: ec1329475b17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec1329475b17
Added Files:
sql/backends/monet5/generator/Tests/rangejoin.sql
sql/backends/monet5/generator/Tests/rangejoin.stable.err
sql/backends/monet5/generator/Tests/rangejoin.stable.out
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
sql/backends/monet5/generator/Tests/All
sql/backends/monet5/generator/generator.c
sql/backends/monet5/generator/generator.h
sql/backends/monet5/generator/generator.mal
sql/common/sql_types.c
sql/common/sql_types.h
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/sql_mvc.h
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: bamloader
Log Message:
Merge with default
diffs (truncated from 995 to 300 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -149,8 +149,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
@@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128
b/clients/Tests/MAL-signatures_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_geom.stable.out.int128
@@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -137,8 +137,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128
b/clients/Tests/MAL-signatures_none.stable.out.int128
--- a/clients/Tests/MAL-signatures_none.stable.out.int128
+++ b/clients/Tests/MAL-signatures_none.stable.out.int128
@@ -152,8 +152,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -725,7 +725,6 @@ str ALARMtimers(bat *res);
str ALARMusec(lng *ret);
str ALGantijoin(bat *result, const bat *lid, const bat *rid);
str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid);
-str ALGavg(dbl *res, const bat *bid);
str ALGbandjoin(bat *result, const bat *lid, const bat *rid, const void
*minus, const void *plus, const bit *li, const bit *hi);
str ALGbandjoin2(bat *l, bat *r, const bat *lid, const bat *rid, const void
*minus, const void *plus, const bit *li, const bit *hi);
str ALGbandjoin_default(bat *result, const bat *lid, const bat *rid, const
void *minus, const void *plus);
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2165,28 +2165,6 @@ str ALGreuse(bat *ret, const bat *bid)
}
/*
- * The avg aggregate only works for int and float fields.
- */
-str
-ALGavg(dbl *res, const bat *bid)
-{
- BAT *b;
- int ret;
- BUN cnt;
-
- if ((b = BATdescriptor(*bid)) == NULL)
- throw(MAL, "aggr.avg", RUNTIME_OBJECT_MISSING);
- ret = BATcalcavg(b, NULL, res, &cnt);
- BBPreleaseref(b->batCacheid);
- if (ret == GDK_FAIL)
- throw(MAL, "aggr.avg", SEMANTIC_TYPE_MISMATCH);
- /* backward compatibility: return nil if there are nils in the input */
- if (cnt < BATcount(b))
- *res = dbl_nil;
- return MAL_SUCCEED;
-}
-
-/*
* BAT standard deviation
*/
str
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -34,8 +34,6 @@
#define algebra_export extern
#endif
-algebra_export str ALGavg(dbl *res, const bat *bid);
-
algebra_export str ALGstdev(dbl *res, const bat *bid);
algebra_export str ALGstdevp(dbl *res, const bat *bid);
algebra_export str ALGvariance(dbl *res, const bat *bid);
diff --git a/monetdb5/modules/kernel/algebra.mal
b/monetdb5/modules/kernel/algebra.mal
--- a/monetdb5/modules/kernel/algebra.mal
+++ b/monetdb5/modules/kernel/algebra.mal
@@ -653,8 +653,8 @@ command max(b:bat[:any_1,:any_2]):any_2
address ALGmaxany
comment "Return the highest tail value or nil.";
-command avg (b:bat[:oid,:any_2] ) :dbl
-address ALGavg
+pattern avg (b:bat[:oid,:any_2] ) :dbl
+address CMDcalcavg
comment "Gives the avg of all tail values";
# Standard deviation
diff --git a/sql/backends/monet5/generator/Tests/All
b/sql/backends/monet5/generator/Tests/All
--- a/sql/backends/monet5/generator/Tests/All
+++ b/sql/backends/monet5/generator/Tests/All
@@ -4,6 +4,8 @@ generator02
generator03
generator04
+rangejoin
+
joins00
joins01
joins02
diff --git a/sql/backends/monet5/generator/Tests/rangejoin.sql
b/sql/backends/monet5/generator/Tests/rangejoin.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/generator/Tests/rangejoin.sql
@@ -0,0 +1,7 @@
+CREATE TABLE ranges(low integer, hgh integer);
+INSERT INTO ranges VALUES (1,3),(2,4),(5,6),(7,7);
+
+SELECT *
+FROM generate_series(0,10,1) AS s JOIN ranges ON ( s.value >= ranges.low AND
s.value < ranges.hgh);
+
+DROP TABLE ranges;
diff --git a/sql/backends/monet5/generator/Tests/rangejoin.stable.err
b/sql/backends/monet5/generator/Tests/rangejoin.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/generator/Tests/rangejoin.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'rangejoin` in directory 'sql/backends/monet5/generator` itself:
+
+
+# 10:17:18 >
+# 10:17:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39578" "--set"
"mapi_usock=/var/tmp/mtest-3483/.s.monetdb.39578" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/bam//Linux/var/MonetDB/mTests_sql_backends_monet5_generator"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:17:18 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/bam//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39578
+# cmdline opt mapi_usock = /var/tmp/mtest-3483/.s.monetdb.39578
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/bam//Linux/var/MonetDB/mTests_sql_backends_monet5_generator
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:17:18 >
+# 10:17:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3483" "--port=39578"
+# 10:17:18 >
+
+
+# 10:17:18 >
+# 10:17:18 > "Done."
+# 10:17:18 >
+
diff --git a/sql/backends/monet5/generator/Tests/rangejoin.stable.out
b/sql/backends/monet5/generator/Tests/rangejoin.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/generator/Tests/rangejoin.stable.out
@@ -0,0 +1,79 @@
+stdout of test 'rangejoin` in directory 'sql/backends/monet5/generator` itself:
+
+
+# 10:17:18 >
+# 10:17:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39578" "--set"
"mapi_usock=/var/tmp/mtest-3483/.s.monetdb.39578" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/bam//Linux/var/MonetDB/mTests_sql_backends_monet5_generator"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:17:18 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5_generator', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:39578/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3483/.s.monetdb.39578
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
