Changeset: 001aedfec00f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=001aedfec00f
Added Files:
sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql
sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.err
sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out
sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
Modified Files:
gdk/gdk_join.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (259 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -664,7 +664,7 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
if (i > 0) {
r2->tnil = true;
r2->tnonil = false;
- r2->tkey = i > 1;
+ r2->tkey = i == 1;
}
} else {
i = binsearch_oid(NULL, 0, lvals, 0, cnt - 1,
lo, 1, 0);
@@ -674,13 +674,11 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
if (r2)
APPEND(r2, lvals[i] - l->hseqbase +
l->tseqbase - r->tseqbase + r->hseqbase);
}
- if (nil_on_miss) {
- if (i < cnt) {
- r2->tkey = r2->tnil || (cnt - i > 1);
- r2->tnil = true;
- r2->tnonil = false;
- r2->tsorted = false;
- }
+ if (nil_on_miss && i < cnt) {
+ r2->tkey = !r2->tnil && cnt - i == 1;
+ r2->tnil = true;
+ r2->tnonil = false;
+ r2->tsorted = false;
for (; i < cnt; i++) {
APPEND(r1, lvals[i]);
APPEND(r2, oid_nil);
@@ -3698,7 +3696,9 @@ leftjoin(BAT **r1p, BAT **r2p, BAT *l, B
return mergejoin_void(r1, r2, l, r, sl, sr,
nil_on_miss, only_misses, t0, false);
} else if ((BATordered(r) || BATordered_rev(r)) &&
- (BATtdense(r) ||
+ (BATordered(l) ||
+ BATordered_rev(l) ||
+ BATtdense(r) ||
lcount < 1024 ||
BATcount(r) * (Tsize(r) + (r->tvheap ? r->tvheap->size : 0)
+ 2 * sizeof(BUN)) > GDK_mem_maxsize / (GDKnr_threads ? GDKnr_threads : 1)))
return mergejoin(r1, r2, l, r, sl, sr, nil_matches,
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1175,6 +1175,7 @@ static sql_var*
static sql_rel *
create_trigger(mvc *sql, dlist *qname, int time, symbol *trigger_event, dlist
*tqname, dlist *opt_ref, dlist *triggered_action, int replace)
{
+ const char *triggerschema = qname_schema(qname);
const char *triggername = qname_table(qname);
const char *sname = qname_schema(tqname);
const char *tname = qname_table(tqname);
@@ -1218,6 +1219,8 @@ create_trigger(mvc *sql, dlist *qname, i
return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: unknown
table '%s'", base, tname);
if (create && isView(t))
return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: cannot
create trigger on view '%s'", base, tname);
+ if (triggerschema && strcmp(triggerschema, sname) != 0)
+ return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: trigger
and respective table must belong to the same schema", base);
if (create && (st = mvc_bind_trigger(sql, ss, triggername)) != NULL) {
if (replace) {
if(mvc_drop_trigger(sql, ss, st))
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -994,9 +994,12 @@ rel_create_table(mvc *sql, sql_schema *s
if (temp != SQL_DECLARED_TABLE) {
if (temp != SQL_PERSIST && tt == tt_table) {
- s = mvc_bind_schema(sql, "tmp");
- if (temp == SQL_LOCAL_TEMP && sname && strcmp(sname,
s->base.name) != 0)
- return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE TABLE: local temporary tables should be stored in the '%s' schema",
s->base.name);
+ if (temp == SQL_LOCAL_TEMP || temp == SQL_GLOBAL_TEMP) {
+ if (sname && strcmp(sname, "tmp") != 0)
+ return sql_error(sql, 02,
SQLSTATE(3F000) "CREATE TABLE: %s temporary tables should be stored in the
'tmp' schema",
+ (temp
== SQL_LOCAL_TEMP) ? "local" : "global");
+ s = mvc_bind_schema(sql, "tmp");
+ }
} else if (s == NULL) {
s = ss;
}
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
@@ -68,6 +68,7 @@ procedure-create-table.Bug-6604
sqlitelogictest-cast-null-not-in.Bug-6605
sqlitelogictest-groupby-coalesce-error-message.Bug-6608
sqlitelogictest-algebra-rangejoin-undefined.Bug-6610
+lateral-join-crash.Bug-6613
dependency_column_on_sequence.Bug-6618
local_replica_table_not_detected.Bug-6620
remote-table-where-not-equal.Bug-6621
@@ -81,8 +82,9 @@ ilike-foreign-characters.Bug-6633
multi-column-hash-wrongly-NIL.Bug-6638
comment-on-table-is-null.Bug-6639
crash-after-call-non-existing-loader
+timestamp-roundtrip.Bug-6640
timestamp-as-boolean.Bug-6642
-timestamp-roundtrip.Bug-6640
+global-temp-tables.Bug-6643
convert-key.Bug-6648
update-transaction-select.Bug-6649
prepared-statement-with-udf.Bug-6650
diff --git a/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql
b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.sql
@@ -0,0 +1,8 @@
+CREATE SCHEMA "dropme";
+CREATE LOCAL TEMP TABLE "dropme"."temp1" ("id" int, "name" VARCHAR(99));
--error
+CREATE GLOBAL TEMP TABLE "dropme"."temp2" ("id" int, "name" VARCHAR(99));
--error
+DROP SCHEMA "dropme";
+START TRANSACTION;
+CREATE LOCAL TEMP TABLE "temp1" ("id" int, "name" VARCHAR(99));
+CREATE GLOBAL TEMP TABLE "temp2" ("id" int, "name" VARCHAR(99));
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.err
b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'global-temp-tables.Bug-6643` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 16:48:57 >
+# 16:48:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34153" "--set"
"mapi_usock=/var/tmp/mtest-10907/.s.monetdb.34153" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 16:48:57 >
+
+# 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 = 34153
+# cmdline opt mapi_usock = /var/tmp/mtest-10907/.s.monetdb.34153
+# 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
+
+# 16:48:58 >
+# 16:48:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10907" "--port=34153"
+# 16:48:58 >
+
+MAPI = (monetdb) /var/tmp/mtest-10907/.s.monetdb.34153
+QUERY = CREATE LOCAL TEMP TABLE "dropme"."temp1" ("id" int, "name"
VARCHAR(99)); --error
+ERROR = !CREATE TABLE: local temporary tables should be stored in the 'tmp'
schema
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-10907/.s.monetdb.34153
+QUERY = CREATE GLOBAL TEMP TABLE "dropme"."temp2" ("id" int, "name"
VARCHAR(99)); --error
+ERROR = !CREATE TABLE: global temporary tables should be stored in the 'tmp'
schema
+CODE = 3F000
+
+# 16:48:58 >
+# 16:48:58 > "Done."
+# 16:48:58 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out
b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/global-temp-tables.Bug-6643.stable.out
@@ -0,0 +1,77 @@
+stdout of test 'global-temp-tables.Bug-6643` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 16:48:57 >
+# 16:48:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34153" "--set"
"mapi_usock=/var/tmp/mtest-10907/.s.monetdb.34153" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 16:48:57 >
+
+# 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.528 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:34153/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10907/.s.monetdb.34153
+# 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.
+
+# 16:48:58 >
+# 16:48:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10907" "--port=34153"
+# 16:48:58 >
+
+#CREATE SCHEMA "dropme";
+#DROP SCHEMA "dropme";
+#START TRANSACTION;
+#CREATE LOCAL TEMP TABLE "temp1" ("id" int, "name" VARCHAR(99));
+#CREATE GLOBAL TEMP TABLE "temp2" ("id" int, "name" VARCHAR(99));
+#ROLLBACK;
+
+# 16:48:58 >
+# 16:48:58 > "Done."
+# 16:48:58 >
+
diff --git a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
@@ -0,0 +1,8 @@
+start transaction;
+create table segments (meter int, distance int, speed int);
+insert into segments values (1,1,1),(9,9,9);
+select t.* from segments as s, lateral generate_series(s.meter,
s.meter+s.distance+1) as t;
+select t.meter, s.distance, s.speed from segments as s, lateral
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
+select * from segments as s, lateral generate_series(s.meter,
s.meter+s.distance+1);
+select t.*, s.distance, s.speed from segments as s, lateral
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
+rollback;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
