Changeset: d22c2f41c74c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d22c2f41c74c
Modified Files:
monetdb5/modules/mal/joinpath.c
sql/backends/monet5/rel_bin.c
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/server/rel_select.c
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
approved tests after introduction of sessions.
diffs (truncated from 970 to 300 lines):
diff --git a/monetdb5/modules/mal/joinpath.c b/monetdb5/modules/mal/joinpath.c
--- a/monetdb5/modules/mal/joinpath.c
+++ b/monetdb5/modules/mal/joinpath.c
@@ -210,7 +210,8 @@ ALGjoinPathBody(Client cntxt, int top, B
b = BATsemijoin(joins[j], joins[j + 1]);
break;
case 3:
- b = BATleftfetchjoin(joins[j], joins[j + 1],
BATcount(joins[j]));
+ b = BATproject(joins[j], joins[j + 1]);
+ break;
}
if (b==NULL){
if ( postpone[j] && postpone[j+1]){
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
@@ -2239,7 +2239,7 @@ rel2bin_project( mvc *sql, sql_rel *rel,
/* In case of a topn
if both order by and distinct: then get first order by col
do topn on it. Project all again! Then rest
- */
+ */
if (topn && rel->r) {
list *oexps = rel->r, *npl = sa_list(sql->sa);
/* distinct, topn returns atleast N (unique) */
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -98,6 +98,7 @@ select qd.*, ql."start",ql."stop", ql.ar
from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user; null null null rowid
SYSTEM
mTests_sql_jdbc_tests sys queue SYSTEM VIEW create view sys.queue
as select * from sys.queue(); null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys sessions SYSTEM VIEW create view
sys.sessions as select * from sys.sessions(); null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys storage SYSTEM VIEW create view sys.storage
as select * from sys.storage(); null null null rowid SYSTEM
mTests_sql_jdbc_tests sys storagemodel SYSTEM VIEW create view
sys.storagemodel as select * from sys.storagemodel(); null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys tables SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS
"temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2;
null null null rowid SYSTEM
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4449,6 +4449,7 @@ rel_rankop(mvc *sql, sql_rel **rel, symb
sname = qname_schema(window_function->data.lval);
} else { /* window aggr function */
dnode *n = window_function->data.lval->h;
+ assert(0);
aname = qname_fname(n->data.lval);
sname = qname_schema(n->data.lval);
}
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1754,6 +1754,7 @@ update_table(sql_trans *tr, sql_table *f
cc->base.allocated = cc->base.rtime = cc->base.wtime =
0;
continue;
}
+
assert(oc->base.wtime < cc->base.wtime);
if (store_nr_active > 1) { /* move delta */
sql_delta *b = cc->data, *p = NULL;
@@ -1774,6 +1775,13 @@ update_table(sql_trans *tr, sql_table *f
tr_update_delta(tr, oc->data, cc->data, cc->unique ==
1);
}
+ oc->null = cc->null;
+ oc->unique = cc->unique;
+ if (cc->storage_type && (!cc->storage_type ||
strcmp(cc->storage_type, oc->storage_type) != 0))
+ oc->storage_type = sa_strdup(tr->sa, cc->storage_type);
+ if (cc->def && (!cc->def || strcmp(cc->def, oc->def) != 0))
+ oc->def = sa_strdup(tr->sa, cc->def);
+
if (oc->base.rtime < cc->base.rtime)
oc->base.rtime = cc->base.rtime;
if (oc->base.wtime < cc->base.wtime)
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -82,9 +82,9 @@ stderr of test 'sql_command_kills_db.SF-
# 16:15:09 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39774 -G
# 16:15:09 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-32368/.s.monetdb.30670
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (40>1)
+ERROR = !cardinality violation (41>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
@@ -87,6 +87,7 @@ Ready.
[ "querylog_calls", 2000, "create view sys.querylog_calls as select *
from sys.querylog_calls();", 1, true, 0, false, 0 ]
[ "querylog_history", 2000, "create view sys.querylog_history as\nselect
qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0,
false, 0 ]
[ "tracelog", 2000, "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, false, 0 ]
+[ "sessions", 2000, "create view sys.sessions as select * from
sys.sessions();", 1, true, 0, false, 0 ]
[ "optimizers", 2000, "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, false, 0 ]
[ "environment", 2000, "create view sys.environment as select * from
sys.environment();", 1, true, 0, false, 0 ]
[ "queue", 2000, "create view sys.queue as select * from sys.queue();",
1, true, 0, false, 0 ]
diff --git
a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
--- a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
+++ b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
@@ -29,19 +29,19 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 39 ]
+[ 40 ]
#select count(distinct name) from tables;
% .L1 # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 33 ]
+[ 34 ]
#select count(name) , count(distinct name) from tables;
% .L1, .L2 # table_name
% L1, L2 # name
% wrd, wrd # type
% 2, 2 # length
-[ 39, 33 ]
+[ 40, 34 ]
# 10:05:42 >
# 10:05:42 > Done.
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
--- a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -132,6 +132,7 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
+[ 123 ]
# 17:14:07 >
# 17:14:07 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
---
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
@@ -28,13 +28,13 @@ Ready.
% L1, L2 # name
% tinyint, wrd # type
% 1, 2 # length
-[ 1, 39 ]
+[ 1, 40 ]
#SELECT (SELECT count(*) FROM tables), 1;
% .L1, .L1 # table_name
% L1, single_value # name
% wrd, tinyint # type
% 2, 1 # length
-[ 39, 1 ]
+[ 40, 1 ]
# 21:48:51 >
# 21:48:51 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -58,6 +58,7 @@ Ready.
[ "querylog_calls", 2000, "create view sys.querylog_calls as select *
from sys.querylog_calls();", 1, true, 0, false, 0 ]
[ "querylog_history", 2000, "create view sys.querylog_history as\nselect
qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0,
false, 0 ]
[ "tracelog", 2000, "create view sys.tracelog as select * from
sys.tracelog();", 1, true, 0, false, 0 ]
+[ "sessions", 2000, "create view sys.sessions as select * from
sys.sessions();", 1, true, 0, false, 0 ]
[ "optimizers", 2000, "create view sys.optimizers as select * from
sys.optimizers();", 1, true, 0, false, 0 ]
[ "environment", 2000, "create view sys.environment as select * from
sys.environment();", 1, true, 0, false, 0 ]
[ "queue", 2000, "create view sys.queue as select * from sys.queue();",
1, true, 0, false, 0 ]
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,12 +80,12 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-32368/.s.monetdb.30670
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !cardinality violation (21>1)
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-32368/.s.monetdb.30670
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (412>1)
+ERROR = !cardinality violation (418>1)
# 21:00:43 >
diff --git a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
--- a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
+++ b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
@@ -68,6 +68,7 @@ Ready.
[ 37 ]
[ 38 ]
[ 39 ]
+[ 40 ]
# 17:29:50 >
# 17:29:50 > "Done."
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
+++
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
@@ -35,7 +35,7 @@ stdout of test 'set_sql_debug_64__breaki
% name, fullname, default_schema # name
% varchar, varchar, int # type
% 9, 10, 4 # length
-[ "skyserver", "sky server", 7819 ]
+[ "skyserver", "sky server", 7834 ]
#alter user "skyserver" set schema "sys";
#drop schema sky;
#drop user skyserver;
diff --git a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
--- a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
+++ b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
@@ -28,13 +28,13 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 39 ]
+[ 40 ]
#WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
% .t # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 39 ]
+[ 40 ]
# 22:41:45 >
# 22:41:45 > Done.
diff --git a/sql/test/Dependencies/Tests/dependency_loop.stable.out
b/sql/test/Dependencies/Tests/dependency_loop.stable.out
--- a/sql/test/Dependencies/Tests/dependency_loop.stable.out
+++ b/sql/test/Dependencies/Tests/dependency_loop.stable.out
@@ -119,7 +119,7 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 89 ]
+[ 90 ]
# 10:37:19 >
# 10:37:19 > Done.
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -393,6 +393,9 @@ Ready.
[ "sys", "settimeout", 1, "bigint", "" ]
[ "sys", "shrink", 0, "clob", "-- The contents of this file
are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\");
you may not use this file except in\n-- compliance with the License. You may
obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Copyright August 2008-2013 MonetDB B.V.\n-- All
Rights Reserved.\n\n-- Vacuum a relational table should be done with care.\n--
For, the oid's are used in join-indices.\n\n-- Vacuum of tables may improve IO
performance and disk footprint.\n-- The foreign key constraints should be
dropped before\n-- and re-established after the cluste
r operation.\n\ncreate procedure shrink(sys string, tab string)\n\texternal
name sql.shrink;" ]
[ "sys", "shrink", 1, "clob", "" ]
+[ "sys", "shutdown", 0, "tinyint", "create procedure
sys.shutdown(delay tinyint) \nexternal name sql.shutdown;" ]
+[ "sys", "shutdown", 0, "tinyint", "create procedure
sys.shutdown(delay tinyint, force bool) \nexternal name sql.shutdown;" ]
+[ "sys", "shutdown", 1, "boolean", "" ]
[ "sys", "srid", 0, "int", "create function srid(g geometry)
returns integer external name geom.\"SRID\";" ]
[ "sys", "srid", 1, "geometry", "" ]
[ "sys", "stddev_pop", 0, "double", "create aggregate
stddev_pop(val tinyint) returns double\n\texternal name \"aggr\".\"stdevp\";" ]
diff --git a/sql/test/bugs/Tests/crash_order_by.stable.out
b/sql/test/bugs/Tests/crash_order_by.stable.out
--- a/sql/test/bugs/Tests/crash_order_by.stable.out
+++ b/sql/test/bugs/Tests/crash_order_by.stable.out
@@ -30,7 +30,7 @@ Ready.
% int, char # type
% 2, 1 # length
[ 32, "1" ]
-[ 47, "1" ]
+[ 48, "1" ]
[ 15, "1" ]
[ 6, "1" ]
[ 33, "1" ]
diff --git a/sql/test/bugs/Tests/simple_view.stable.out
b/sql/test/bugs/Tests/simple_view.stable.out
--- a/sql/test/bugs/Tests/simple_view.stable.out
+++ b/sql/test/bugs/Tests/simple_view.stable.out
@@ -58,6 +58,7 @@ Ready.
[ "querylog_calls", "str", 1 ]
[ "querylog_history", "str", 1 ]
[ "tracelog", "str", 1 ]
+[ "sessions", "str", 1 ]
[ "optimizers", "str", 1 ]
[ "environment", "str", 1 ]
[ "queue", "str", 1 ]
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -65,7 +65,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 396 ]
+[ "transient", 362 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -32,11 +32,11 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 0 ]
[ "oid", "bit", 0 ]
-[ "oid", "bit", 71 ]
-[ "oid", "bit", 71 ]
-[ "oid", "bit", 412 ]
-[ "oid", "bit", 1252 ]
-[ "oid", "bit", 1252 ]
+[ "oid", "bit", 72 ]
+[ "oid", "bit", 72 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
