Changeset: ac4189d8de26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac4189d8de26
Added Files:
sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql
sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err
sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.out
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_calc.c
sql/common/sql_string.c
sql/server/rel_sequence.c
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (truncated from 424 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2827,9 +2827,10 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
return NULL;
}
- if (BATcount(b) == 0 || ngrp == 0) {
+ if (BATcount(b) == 0 || ngrp == 0 || is_dbl_nil(quantile)) {
/* trivial: no values, thus also no quantiles,
- * so return bat aligned with e with nil in the tail */
+ * so return bat aligned with e with nil in the tail
+ * The same happens for a NULL quantile */
return BATconstant(ngrp == 0 ? 0 : min, tp, nil, ngrp,
TRANSIENT);
}
diff --git a/sql/common/sql_string.c b/sql/common/sql_string.c
--- a/sql/common/sql_string.c
+++ b/sql/common/sql_string.c
@@ -97,7 +97,7 @@ strip_extra_zeros(char *s)
char *
sql2str(char *s)
{
- int escaped = 0;
+ bool escaped = false;
char *cur, *p = s;
if (strcmp(str_nil, s) == 0)
@@ -107,7 +107,7 @@ sql2str(char *s)
if (!escaped)
return s;
- escaped = 0;
+ escaped = false;
for (cur = s; *cur; cur++) {
if (escaped) {
if (*cur == 'n') {
@@ -128,14 +128,20 @@ sql2str(char *s)
} else if (*cur == '\\') {
*p++ = '\\';
} else if ((cur[0] >= '0' && cur[0] <= '7') && (cur[1]
>= '0' && cur[1] <= '7') && (cur[2] >= '0' && cur[2] <= '7')) {
- *p++ = (cur[2] & 7) | ((cur[1] & 7) << 3) |
((cur[0] & 7) << 6);
+ int v = (cur[2] & 7) | ((cur[1] & 7) << 3) |
((cur[0] & 7) << 6);
cur += 2;
+ if (v < 0x80)
+ *p++ = v;
+ else {
+ *p++ = 0xC0 | (v >> 6);
+ *p++ = 0x80 | (v & 0x3F);
+ }
} else {
*p++ = *cur;
}
- escaped = FALSE;
+ escaped = false;
} else if (*cur == '\\') {
- escaped = TRUE;
+ escaped = true;
} else {
*p++ = *cur;
}
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -246,13 +246,16 @@ rel_alter_seq(
sql_subtype *lng_t = sql_bind_localtype("lng");
val = rel_value_exp2(sql, &r, start_list->h->next->data.sym,
sql_sel, ek, &is_last);
- (void)is_last;
if (!val || !(val = rel_check_type(sql, lng_t, val,
type_equal)))
return NULL;
} else if (start_type == 2) {
assert (start_list->h->next->type == type_lng);
val = exp_atom_lng(sql->sa, start_list->h->next->data.l_val);
}
+ if (val && val->card > CARD_ATOM) {
+ sql_subaggr *zero_or_one = sql_bind_aggr(sql->sa,
sql->session->schema, "zero_or_one", exp_subtype(val));
+ val = exp_aggr1(sql->sa, val, zero_or_one, 0, 0, CARD_ATOM, 0);
+ }
return rel_seq(sql->sa, DDL_ALTER_SEQ, s->base.name, seq, r, val);
}
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -89,3 +89,5 @@ prepared-statement-with-udf.Bug-6650
in-subquery-having-Bug-6651
create_table_empty_column_name.Bug-6653
select_where_true.Bug-6654
+alter-sequence-subquery.Bug-6657
+quantile-crash.Bug-6658
diff --git
a/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql
b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql
@@ -0,0 +1,7 @@
+create sequence "testme" as integer start with 2;
+select get_value_for('sys', 'testme');
+alter sequence "testme" restart with (select count(*));
+select get_value_for('sys', 'testme');
+alter sequence "testme" restart with (select 1 union select 2); --error,
should not be possible
+select get_value_for('sys', 'testme');
+drop sequence "testme";
diff --git
a/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err
b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err
@@ -0,0 +1,41 @@
+stderr of test 'alter-sequence-subquery.Bug-6657` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 14:42:29 >
+# 14:42:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36995" "--set"
"mapi_usock=/var/tmp/mtest-31265/.s.monetdb.36995" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_r=yes" "--set" "embedded_py=true" "--set" "embedded_c=true"
+# 14:42:29 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/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 = 36995
+# cmdline opt mapi_usock = /var/tmp/mtest-31265/.s.monetdb.36995
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 14:42:29 >
+# 14:42:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31265" "--port=36995"
+# 14:42:29 >
+
+MAPI = (monetdb) /var/tmp/mtest-31265/.s.monetdb.36995
+QUERY = alter sequence "testme" restart with (select 1 union select 2);
--error, should not be possible
+ERROR = !Cardinality violation, scalar value expected
+CODE = 21000
+
+# 14:42:30 >
+# 14:42:30 > "Done."
+# 14:42:30 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out
b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'alter-sequence-subquery.Bug-6657` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 14:42:29 >
+# 14:42:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36995" "--set"
"mapi_usock=/var/tmp/mtest-31265/.s.monetdb.36995" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_r=yes" "--set" "embedded_py=true" "--set" "embedded_c=true"
+# 14:42:29 >
+
+# MonetDB 5 server v11.31.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.492 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:36995/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31265/.s.monetdb.36995
+# MonetDB/GIS module loaded
+# 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: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.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_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+# MonetDB/Python2 module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 14:42:29 >
+# 14:42:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31265" "--port=36995"
+# 14:42:29 >
+
+#create sequence "testme" as integer start with 2;
+#select get_value_for('sys', 'testme');
+% .L2 # table_name
+% L2 # name
+% bigint # type
+% 1 # length
+[ 2 ]
+#alter sequence "testme" restart with (select count(*));
+#select get_value_for('sys', 'testme');
+% .L2 # table_name
+% L2 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#select get_value_for('sys', 'testme');
+% .L2 # table_name
+% L2 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#drop sequence "testme";
+
+# 14:42:30 >
+# 14:42:30 > "Done."
+# 14:42:30 >
+
diff --git a/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql
b/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql
@@ -0,0 +1,12 @@
+start transaction;
+create table "test" (good integer, bad integer);
+insert into "test" (good, bad) values (1, null);
+select * from "test";
+select sys.quantile(good, 0.9) from "test";
+select sys.quantile(bad, 0.9) from "test" where bad is not null;
+select sys.quantile(bad, 0.9) from "test";
+select stddev_samp(bad), stddev_pop(bad), var_samp(bad), median(bad),
quantile(1, bad), quantile(bad, 1),
+ quantile(bad, bad), corr(1, bad), corr(bad, 1), corr(bad, bad) from
"test" where bad is not null;
+select stddev_samp(bad), stddev_pop(bad), var_samp(bad), median(bad),
quantile(1, bad), quantile(bad, 1),
+ quantile(bad, bad), corr(1, bad), corr(bad, 1), corr(bad, bad) from
"test";
+rollback;
diff --git a/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err
b/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'quantile-crash.Bug-6658` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 10:32:48 >
+# 10:32:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38192" "--set"
"mapi_usock=/var/tmp/mtest-25694/.s.monetdb.38192" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 10:32:48 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/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 = 38192
+# cmdline opt mapi_usock = /var/tmp/mtest-25694/.s.monetdb.38192
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 10:32:48 >
+# 10:32:48 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25694" "--port=38192"
+# 10:32:48 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
