Changeset: c11095d21be5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c11095d21be5
Added Files:
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
Modified Files:
gdk/gdk_aggr.c
monetdb5/modules/kernel/algebra.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
Distinguish type mismatch from empty bat in stddev/variance.
Also add test.
This fixes bug 3628.
diffs (280 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2440,7 +2440,7 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
} while (0)
static dbl
-calcvariance(dbl *avgp, const void *values, BUN cnt, int tp, int issample)
+calcvariance(dbl *avgp, const void *values, BUN cnt, int tp, int issample,
const char *func)
{
BUN n = 0, i;
dbl mean = 0;
@@ -2468,6 +2468,11 @@ calcvariance(dbl *avgp, const void *valu
#endif
AGGR_STDEV_SINGLE(lng);
break;
+#ifdef HAVE_HGE
+ case TYPE_hge:
+ AGGR_STDEV_SINGLE(hge);
+ break;
+#endif
case TYPE_flt:
AGGR_STDEV_SINGLE(flt);
break;
@@ -2475,6 +2480,8 @@ calcvariance(dbl *avgp, const void *valu
AGGR_STDEV_SINGLE(dbl);
break;
default:
+ GDKerror("%s: type (%s) not supported.\n",
+ func, ATOMname(tp));
return dbl_nil;
}
if (n <= (BUN) issample) {
@@ -2491,7 +2498,8 @@ dbl
BATcalcstdev_population(dbl *avgp, BAT *b)
{
dbl v = calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 0);
+ BATcount(b), b->ttype, 0,
+ "BATcalcstdev_population");
return v == dbl_nil ? dbl_nil : sqrt(v);
}
@@ -2499,7 +2507,8 @@ dbl
BATcalcstdev_sample(dbl *avgp, BAT *b)
{
dbl v = calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 1);
+ BATcount(b), b->ttype, 1,
+ "BATcalcstdev_sample");
return v == dbl_nil ? dbl_nil : sqrt(v);
}
@@ -2507,14 +2516,16 @@ dbl
BATcalcvariance_population(dbl *avgp, BAT *b)
{
return calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 0);
+ BATcount(b), b->ttype, 0,
+ "BATcalcvariance_population");
}
dbl
BATcalcvariance_sample(dbl *avgp, BAT *b)
{
return calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 1);
+ BATcount(b), b->ttype, 1,
+ "BATcalcvariance_sample");
}
#define AGGR_STDEV(TYPE) \
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
@@ -2195,7 +2195,7 @@ ALGstdev(dbl *res, const bat *bid)
throw(MAL, "aggr.stdev", RUNTIME_OBJECT_MISSING);
stdev = BATcalcstdev_sample(NULL, b);
BBPreleaseref(b->batCacheid);
- if (stdev == dbl_nil)
+ if (stdev == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.stdev", SEMANTIC_TYPE_MISMATCH);
*res = stdev;
return MAL_SUCCEED;
@@ -2211,7 +2211,7 @@ ALGstdevp(dbl *res, const bat *bid)
throw(MAL, "aggr.stdevp", RUNTIME_OBJECT_MISSING);
stdev = BATcalcstdev_population(NULL, b);
BBPreleaseref(b->batCacheid);
- if (stdev == dbl_nil)
+ if (stdev == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.stdevp", SEMANTIC_TYPE_MISMATCH);
*res = stdev;
return MAL_SUCCEED;
@@ -2230,7 +2230,7 @@ ALGvariance(dbl *res, const bat *bid)
throw(MAL, "aggr.variance", RUNTIME_OBJECT_MISSING);
variance = BATcalcvariance_sample(NULL, b);
BBPreleaseref(b->batCacheid);
- if (variance == dbl_nil)
+ if (variance == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.variance", SEMANTIC_TYPE_MISMATCH);
*res = variance;
return MAL_SUCCEED;
@@ -2246,7 +2246,7 @@ ALGvariancep(dbl *res, const bat *bid)
throw(MAL, "aggr.variancep", RUNTIME_OBJECT_MISSING);
variance = BATcalcvariance_population(NULL, b);
BBPreleaseref(b->batCacheid);
- if (variance == dbl_nil)
+ if (variance == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.variancep", SEMANTIC_TYPE_MISMATCH);
*res = variance;
return MAL_SUCCEED;
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -53,3 +53,4 @@ hexadecimal_literals.Bug-3621
orderby_column_exp.Bug-3620
case-sqrt.Bug-3627
column-with-comma.Bug-3616
+stddev-empty.Bug-3628
diff --git a/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql
b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql
@@ -0,0 +1,17 @@
+START TRANSACTION;
+
+CREATE TABLE "tm_bug" (
+ "uid" integer NOT NULL,
+ "weight" double NOT NULL default 1.0,
+ "filter" integer NOT NULL default -1
+);
+
+INSERT INTO "tm_bug" VALUES (1,1.0,1);
+INSERT INTO "tm_bug" VALUES (2,1.0,1);
+INSERT INTO "tm_bug" VALUES (3,1.0,2);
+
+select count(uid) as cnt1,stddev_pop(weight) as f1 from tm_bug where filter =
1;
+select count(uid) as cnt2,stddev_pop(weight) as f2 from tm_bug where filter =
2;
+select count(uid) as cnt3,stddev_pop(weight) as f3 from tm_bug where filter =
3;
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err
b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'stddev-empty.Bug-3628` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 09:57:05 >
+# 09:57:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31458" "--set"
"mapi_usock=/var/tmp/mtest-5601/.s.monetdb.31458" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:57:05 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/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 = 31458
+# cmdline opt mapi_usock = /var/tmp/mtest-5601/.s.monetdb.31458
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 09:57:06 >
+# 09:57:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5601" "--port=31458"
+# 09:57:06 >
+
+
+# 09:57:06 >
+# 09:57:06 > "Done."
+# 09:57:06 >
+
diff --git a/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
@@ -0,0 +1,92 @@
+stdout of test 'stddev-empty.Bug-3628` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 09:57:05 >
+# 09:57:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31458" "--set"
"mapi_usock=/var/tmp/mtest-5601/.s.monetdb.31458" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:57:05 >
+
+# MonetDB 5 server v11.19.8 (hg id: 007692e0b975+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs 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://madrid.ins.cwi.nl:31458/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5601/.s.monetdb.31458
+# 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: 40_geom.sql
+# loading sql script: 40_json.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
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 09:57:06 >
+# 09:57:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5601" "--port=31458"
+# 09:57:06 >
+
+#START TRANSACTION;
+#CREATE TABLE "tm_bug" (
+# "uid" integer NOT NULL,
+# "weight" double NOT NULL default 1.0,
+# "filter" integer NOT NULL default -1
+#);
+#INSERT INTO "tm_bug" VALUES (1,1.0,1);
+[ 1 ]
+#INSERT INTO "tm_bug" VALUES (2,1.0,1);
+[ 1 ]
+#INSERT INTO "tm_bug" VALUES (3,1.0,2);
+[ 1 ]
+#select count(uid) as cnt1,stddev_pop(weight) as f1 from tm_bug where filter =
1;
+% sys.L1, sys.L2 # table_name
+% cnt1, f1 # name
+% wrd, double # type
+% 1, 24 # length
+[ 2, 0 ]
+#select count(uid) as cnt2,stddev_pop(weight) as f2 from tm_bug where filter =
2;
+% sys.L1, sys.L2 # table_name
+% cnt2, f2 # name
+% wrd, double # type
+% 1, 24 # length
+[ 1, 0 ]
+#select count(uid) as cnt3,stddev_pop(weight) as f3 from tm_bug where filter =
3;
+% sys.L1, sys.L2 # table_name
+% cnt3, f3 # name
+% wrd, double # type
+% 1, 24 # length
+[ 0, NULL ]
+#ROLLBACK;
+
+# 09:57:06 >
+# 09:57:06 > "Done."
+# 09:57:06 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
