Changeset: a994c3339955 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a994c3339955
Added Files:
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select1.test
sql/test/SQLite_regress/sqllogictest/Tests/select1.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select2.test
sql/test/SQLite_regress/sqllogictest/Tests/select2.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select3.test
sql/test/SQLite_regress/sqllogictest/Tests/select3.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select4.test
sql/test/SQLite_regress/sqllogictest/Tests/select4.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/select5.test
sql/test/SQLite_regress/sqllogictest/Tests/select5.timeout
testing/mktest.py
testing/sqllogictest.py
Removed Files:
sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test2.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test3.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test4.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test5.timeout
sql/test/SQLite_regress/sqllogictest/select1.test
sql/test/SQLite_regress/sqllogictest/select2.test
sql/test/SQLite_regress/sqllogictest/select3.test
sql/test/SQLite_regress/sqllogictest/select4.test
sql/test/SQLite_regress/sqllogictest/select5.test
sql/test/SQLite_regress/sqllogictest/sqllogictest.py
Modified Files:
sql/rel.txt
sql/server/sql_mvc.c
sql/test/SQLite_regress/sqllogictest/Tests/All
testing/Makefile.ag
testing/Mtest.py.in
testing/README
Branch: linear-hashing
Log Message:
Merged with Nov2019
diffs (truncated from 1516 to 300 lines):
diff --git a/sql/rel.txt b/sql/rel.txt
--- a/sql/rel.txt
+++ b/sql/rel.txt
@@ -16,7 +16,6 @@ TABLE (card MULTI)
-> exps is list of column expressions (also used for aliases)
-> l optional input relation
-> r table function expression
-
/* Wrapping relational operator, is a big complex top level only
operator, which only does DDL kind of statements
@@ -82,6 +81,9 @@ INSERT|DELETE|UPDATE|TRUNCATE (card MUL
only (UPDATE)
-> exps
Named columns to update
+only (TRUNCATE)
+ -> exps
+ The first expression is a e_atom integer indicating to
restart sequences, and the second is another e_atom integer telling to cascade
the truncate if the table has fk dependents
INSERT/UPDATE have a special case
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -545,16 +545,16 @@ build up the hash (not copied in the tra
}
/* validation phase */
- int valide = sql_trans_validate(tr);
- if (valide) {
+ bool valid = sql_trans_validate(tr);
+ if (valid) {
store_unlock();
if (sql_save_snapshots(tr) != SQL_OK) {
GDKfatal("%s transaction commit failed (perhaps your
disk is full?) exiting (kernel error: %s)", operation, GDKerrbuf);
}
store_lock();
}
- valide = sql_trans_validate(tr);
- if (valide) {
+ valid = sql_trans_validate(tr);
+ if (valid) {
if ((ok = sql_trans_commit(tr)) != SQL_OK) {
GDKfatal("%s transaction commit failed (perhaps your
disk is full?) exiting (kernel error: %s)", operation, GDKerrbuf);
}
@@ -786,20 +786,21 @@ mvc_create(int clientid, backend_stack s
int
mvc_reset(mvc *m, bstream *rs, stream *ws, int debug)
{
- int i, res = 1;
+ int i, res = 1, reset;
sql_trans *tr;
if (mvc_debug)
fprintf(stderr, "#mvc_reset\n");
tr = m->session->tr;
+ store_lock();
if (tr && tr->parent) {
assert(m->session->tr->active == 0);
- store_lock();
while (tr->parent->parent != NULL)
tr = sql_trans_destroy(tr, true);
- store_unlock();
}
- if (tr && !sql_session_reset(m->session, 1 /*autocommit on*/))
+ reset = sql_session_reset(m->session, 1 /*autocommit on*/);
+ store_unlock();
+ if (tr && !reset)
res = 0;
if (m->sa)
@@ -860,16 +861,16 @@ mvc_destroy(mvc *m)
if (mvc_debug)
fprintf(stderr, "#mvc_destroy\n");
tr = m->session->tr;
+ store_lock();
if (tr) {
- store_lock();
if (m->session->tr->active)
sql_trans_end(m->session);
while (tr->parent)
tr = sql_trans_destroy(tr, true);
m->session->tr = NULL;
- store_unlock();
}
sql_session_destroy(m->session);
+ store_unlock();
stack_pop_until(m, 0);
_DELETE(m->vars);
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/All
b/sql/test/SQLite_regress/sqllogictest/Tests/All
--- a/sql/test/SQLite_regress/sqllogictest/Tests/All
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/All
@@ -1,5 +1,5 @@
-HAVE_PY3MONETDB?test1
-HAVE_PY3MONETDB?test2
-HAVE_PY3MONETDB?test3
-HAVE_PY3MONETDB?test4
-HAVE_PY3MONETDB?test5
+select1
+select2
+select3
+select4
+select5
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err
rename from sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
rename to sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err
--- a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err
@@ -1,11 +1,11 @@
-stderr of test 'test1` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
+stderr of test 'select1` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
-# 15:45:40 >
-# 15:45:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35669" "--set"
"mapi_usock=/var/tmp/mtest-31665/.s.monetdb.35669" "--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
-# 15:45:40 >
+# 13:54:51 >
+# 13:54:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39316" "--set"
"mapi_usock=/var/tmp/mtest-360223/.s.monetdb.39316" "--forcemito"
"--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
+# 13:54:51 >
-# builtin opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath = /home/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
# builtin opt mapi_port = 50000
# builtin opt mapi_open = false
# builtin opt mapi_ipv6 = false
@@ -14,22 +14,12 @@ stderr of test 'test1` in directory 'sql
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35669
-# cmdline opt mapi_usock = /var/tmp/mtest-31665/.s.monetdb.35669
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest
+# cmdline opt mapi_port = 39316
+# cmdline opt mapi_usock = /var/tmp/mtest-360223/.s.monetdb.39316
+# cmdline opt gdk_dbpath =
/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest
# cmdline opt embedded_c = true
-# 15:45:41 >
-# 15:45:41 > "./test1.SQL.sh" "test1"
-# 15:45:41 >
-
+# 13:54:59 >
+# 13:54:59 > "Done."
+# 13:54:59 >
-# 15:45:41 >
-# 15:45:41 > python3
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
--host=localhost --port=35669
--database=mTests_sql_test_SQLite_regress_sqllogictest
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/select2.test
-# 15:45:41 >
-
-
-# 15:45:50 >
-# 15:45:50 > "Done."
-# 15:45:50 >
-
diff --git
a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err-noapprove
rename from
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove
rename to
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err-noapprove
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out
rename from sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
rename to sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out
--- a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out
@@ -1,25 +1,24 @@
-stdout of test 'test1` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
+stdout of test 'select1` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
-# 15:45:40 >
-# 15:45:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35669" "--set"
"mapi_usock=/var/tmp/mtest-31665/.s.monetdb.35669" "--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
-# 15:45:40 >
+# 13:54:51 >
+# 13:54:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39316" "--set"
"mapi_usock=/var/tmp/mtest-360223/.s.monetdb.39316" "--forcemito"
"--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
+# 13:54:51 >
-# MonetDB 5 server v11.35.0 (hg id: 535fc010773c+)
+# MonetDB 5 server v11.35.14 (hg id: 285fbcf1d34e+)
# This is an unreleased version
-# Serving database 'mTests_sql_test_SQLite_regress_sqllogictest', using 8
threads
+# Serving database 'mTests_sql_test_SQLite_regress_sqllogictest', using 4
threads
# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 62.692 GiB available main-memory.
+# Found 15.482 GiB available main-memory of which we use 12.618 GiB
# Copyright (c) 1993 - July 2008 CWI.
# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:35669/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31665/.s.monetdb.35669
+# Listening for connection requests on mapi:monetdb://meeuw.mullender.nl:39316/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-360223/.s.monetdb.39316
# 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
@@ -44,6 +43,7 @@ stdout of test 'test1` in directory 'sql
# loading sql script: 46_profiler.sql
# loading sql script: 51_sys_schema_extension.sql
# loading sql script: 60_wlcr.sql
+# loading sql script: 61_wlcr.sql
# loading sql script: 72_fits.sql
# loading sql script: 74_netcdf.sql
# loading sql script: 75_lidar.sql
@@ -58,17 +58,7 @@ stdout of test 'test1` in directory 'sql
# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
-# 15:45:41 >
-# 15:45:41 > "./test1.SQL.sh" "test1"
-# 15:45:41 >
-
+# 13:54:59 >
+# 13:54:59 > "Done."
+# 13:54:59 >
-# 15:45:41 >
-# 15:45:41 > python3
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
--host=localhost --port=35669
--database=mTests_sql_test_SQLite_regress_sqllogictest
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/select2.test
-# 15:45:41 >
-
-
-# 15:45:50 >
-# 15:45:50 > "Done."
-# 15:45:50 >
-
diff --git
a/sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out-noapprove
rename from
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove
rename to
sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out-noapprove
diff --git a/sql/test/SQLite_regress/sqllogictest/select1.test
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test
rename from sql/test/SQLite_regress/sqllogictest/select1.test
rename to sql/test/SQLite_regress/sqllogictest/Tests/select1.test
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.timeout
rename from sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout
rename to sql/test/SQLite_regress/sqllogictest/Tests/select1.timeout
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
b/sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err
rename from sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
rename to sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err
--- a/sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err
@@ -1,11 +1,11 @@
-stderr of test 'test2` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
+stderr of test 'select2` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
-# 15:50:39 >
-# 15:50:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37833" "--set"
"mapi_usock=/var/tmp/mtest-1447/.s.monetdb.37833" "--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
-# 15:50:39 >
+# 13:54:59 >
+# 13:54:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39316" "--set"
"mapi_usock=/var/tmp/mtest-360223/.s.monetdb.39316" "--forcemito"
"--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest"
"--set" "embedded_c=true"
+# 13:54:59 >
-# builtin opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath = /home/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
# builtin opt mapi_port = 50000
# builtin opt mapi_open = false
# builtin opt mapi_ipv6 = false
@@ -14,22 +14,12 @@ stderr of test 'test2` in directory 'sql
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 37833
-# cmdline opt mapi_usock = /var/tmp/mtest-1447/.s.monetdb.37833
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest
+# cmdline opt mapi_port = 39316
+# cmdline opt mapi_usock = /var/tmp/mtest-360223/.s.monetdb.39316
+# cmdline opt gdk_dbpath =
/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_SQLite_regress_sqllogictest
# cmdline opt embedded_c = true
-# 15:50:39 >
-# 15:50:39 > "./test2.SQL.sh" "test2"
-# 15:50:39 >
-
+# 13:55:07 >
+# 13:55:07 > "Done."
+# 13:55:07 >
-# 15:50:39 >
-# 15:50:39 > python3
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/sqllogictest.py
--host=localhost --port=37833
--database=mTests_sql_test_SQLite_regress_sqllogictest
/net/methuselah/export/scratch1/sjoerd/src/MonetDB/candidate/sql/test/SQLite_regress/sqllogictest/select2.test
-# 15:50:39 >
-
-
-# 15:50:48 >
-# 15:50:48 > "Done."
-# 15:50:48 >
-
diff --git
a/sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove
b/sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err-noapprove
rename from
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove
rename to
sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err-noapprove
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
b/sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out
rename from sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
rename to sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out
--- a/sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out
@@ -1,34 +1,24 @@
-stdout of test 'test2` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
+stdout of test 'select2` in directory 'sql/test/SQLite_regress/sqllogictest`
itself:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
