Changeset: 5f939213d542 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f939213d542
Added Files:
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.sql
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
Modified Files:
clients/mapiclient/mclient.c
common/stream/stream.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/test/BugTracker-2019/Tests/All
Branch: context
Log Message:
merged with default
diffs (274 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3084,7 +3084,8 @@ getfile(void *data, const char *filename
struct privdata *priv = data;
ssize_t s;
- *size = 0; /* most returns require this */
+ if (size)
+ *size = 0; /* most returns require this */
if (priv->buf == NULL) {
priv->buf = malloc(READSIZE);
if (priv->buf == NULL)
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1588,18 +1588,15 @@ open_xzstream(const char *restrict filen
strncmp(buf, UTF8BOM, UTF8BOMLENGTH) == 0) {
s->isutf8 = true;
} else {
- FILE *fp = xz->fp;
- lzma_ret ret;
lzma_end(&xz->strm);
- ret = lzma_stream_decoder(&xz->strm, UINT64_MAX,
LZMA_CONCATENATED);
- if (ret != LZMA_OK) {
+ if (lzma_stream_decoder(&xz->strm, UINT64_MAX,
LZMA_CONCATENATED) != LZMA_OK
+ || fseek (xz->fp, 0L, SEEK_SET) < 0) {
+ fclose(xz->fp);
+ free(xz);
destroy(s);
- free(xz);
- fclose(fp);
return NULL;
}
- rewind(fp);
- xz->fp = fp;
+ xz->todo = 0;
}
}
return s;
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -577,7 +577,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
}
if (!l)
return NULL;
- s = stmt_convert(be, l, from, to);
+ s = stmt_convert(be, l, from, to, sel);
} break;
case e_func: {
node *en;
@@ -1173,7 +1173,7 @@ check_types(backend *be, sql_subtype *ct
(c == 3 && tpe != type_cast)) {
s = NULL;
} else {
- s = stmt_convert(be, s, st, ct);
+ s = stmt_convert(be, s, st, ct, NULL);
}
}
if (!s) {
@@ -2905,7 +2905,7 @@ rel2bin_select(backend *be, sql_rel *rel
if (e->type != e_cmp) {
sql_subtype *bt = sql_bind_localtype("bit");
- s = stmt_convert(be, s, exp_subtype(e), bt);
+ s = stmt_convert(be, s, exp_subtype(e), bt,
NULL);
}
sel = stmt_uselect(be, predicate, s, cmp_equal, sel, 0);
} else if (e->type != e_cmp) {
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -2740,7 +2740,7 @@ stmt_exception(backend *be, stmt *cond,
}
stmt *
-stmt_convert(backend *be, stmt *v, sql_subtype *f, sql_subtype *t)
+stmt_convert(backend *be, stmt *v, sql_subtype *f, sql_subtype *t, stmt *sel)
{
MalBlkPtr mb = be->mb;
InstrPtr q = NULL;
@@ -2799,6 +2799,8 @@ stmt_convert(backend *be, stmt *v, sql_s
/* scale of the current decimal */
q = pushInt(mb, q, f->scale);
q = pushArgument(mb, q, v->nr);
+ if (sel && v->nrcols && f->type->eclass != EC_DEC &&
!EC_TEMP_FRAC(t->type->eclass) && !EC_INTERVAL(t->type->eclass))
+ q = pushArgument(mb, q, sel->nr);
if (t->type->eclass == EC_DEC || EC_TEMP_FRAC(t->type->eclass) ||
EC_INTERVAL(t->type->eclass)) {
/* digits, scale of the result decimal */
@@ -2840,6 +2842,7 @@ stmt_convert(backend *be, stmt *v, sql_s
return NULL;
}
s->op1 = v;
+ s->op2 = sel;
s->nrcols = 0; /* function without arguments returns single
value */
s->key = v->key;
s->nrcols = v->nrcols;
diff --git a/sql/backends/monet5/sql_statement.h
b/sql/backends/monet5/sql_statement.h
--- a/sql/backends/monet5/sql_statement.h
+++ b/sql/backends/monet5/sql_statement.h
@@ -215,7 +215,7 @@ extern stmt *stmt_sample(backend *be, st
extern stmt *stmt_order(backend *be, stmt *s, int direction, int nullslast);
extern stmt *stmt_reorder(backend *be, stmt *s, int direction, int nullslast,
stmt *orderby_ids, stmt *orderby_grp);
-extern stmt *stmt_convert(backend *sa, stmt *v, sql_subtype *from, sql_subtype
*to);
+extern stmt *stmt_convert(backend *sa, stmt *v, sql_subtype *from, sql_subtype
*to, stmt *sel);
extern stmt *stmt_unop(backend *be, stmt *op1, sql_subfunc *op);
extern stmt *stmt_binop(backend *be, stmt *op1, stmt *op2, sql_subfunc *op);
extern stmt *stmt_Nop(backend *be, stmt *ops, sql_subfunc *op);
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -12,3 +12,5 @@ subselect.Bug-6700
alter_table_set_schema.Bug-6701
crash-in-rel_dependencies.Bug-6703
prepared-merge-statement.Bug-6706
+view-where-cast-error.Bug-6712
+
diff --git a/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.sql
b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.sql
@@ -0,0 +1,12 @@
+start transaction;
+CREATE TABLE x ("id" INTEGER, "attribute" CHARACTER LARGE OBJECT, "value"
CHARACTER LARGE OBJECT);
+INSERT INTO x VALUES (1, 'version', '3.15.0');
+INSERT INTO x VALUES (1, 'executiontime', '100848');
+INSERT INTO x VALUES (2, 'version', '3.15.0');
+INSERT INTO x VALUES (2, 'executiontime', '54340');
+INSERT INTO x VALUES (3, 'version', '3.15.0');
+INSERT INTO x VALUES (3, 'executiontime', '96715');
+create view executiontimes as select * from x where attribute =
'executiontime';
+
+select id from executiontimes where cast(value as bigint) > 80000;
+rollback;
diff --git
a/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
@@ -0,0 +1,33 @@
+stderr of test 'view-where-cast-error.Bug-6712` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 19:39:23 >
+# 19:39:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32246" "--set"
"mapi_usock=/var/tmp/mtest-12898/.s.monetdb.32246" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 19:39:23 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# 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 = 32246
+# cmdline opt mapi_usock = /var/tmp/mtest-12898/.s.monetdb.32246
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 19:39:23 >
+# 19:39:23 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12898" "--port=32246"
+# 19:39:23 >
+
+
+# 19:39:23 >
+# 19:39:23 > "Done."
+# 19:39:23 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'view-where-cast-error.Bug-6712` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 19:39:23 >
+# 19:39:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32246" "--set"
"mapi_usock=/var/tmp/mtest-12898/.s.monetdb.32246" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 19:39:23 >
+
+# MonetDB 5 server v11.33.4 (hg id: 5ad88b364ee5+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.385 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://xps13:32246/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12898/.s.monetdb.32246
+# 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
+
+Ready.
+
+# 19:39:23 >
+# 19:39:23 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12898" "--port=32246"
+# 19:39:23 >
+
+#start transaction;
+#CREATE TABLE x ("id" INTEGER, "attribute" CHARACTER LARGE OBJECT, "value"
CHARACTER LARGE OBJECT);
+#INSERT INTO x VALUES (1, 'version', '3.15.0');
+[ 1 ]
+#INSERT INTO x VALUES (1, 'executiontime', '100848');
+[ 1 ]
+#INSERT INTO x VALUES (2, 'version', '3.15.0');
+[ 1 ]
+#INSERT INTO x VALUES (2, 'executiontime', '54340');
+[ 1 ]
+#INSERT INTO x VALUES (3, 'version', '3.15.0');
+[ 1 ]
+#INSERT INTO x VALUES (3, 'executiontime', '96715');
+[ 1 ]
+#create view executiontimes as select * from x where attribute =
'executiontime';
+#select id from executiontimes where cast(value as bigint) > 80000;
+% sys.executiontimes # table_name
+% id # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 3 ]
+#rollback;
+
+# 19:39:23 >
+# 19:39:23 > "Done."
+# 19:39:23 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
