date:20170219

MonetDB: wlcr - Merge with default

2017-02-19 Thread Martin Kersten

Changeset: f13bf8060b2a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f13bf8060b2a
Added Files:
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.out
Modified Files:
sql/test/BugTracker-2017/Tests/All
Branch: wlcr
Log Message:

Merge with default


diffs (235 lines):

diff --git a/sql/test/BugTracker-2017/Tests/All 
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -27,3 +27,5 @@ sqlsmith04
 nested_with.Bug-6187
 prepare.Bug-6133
 null-quantile.Bug-6218
+sqlsmith.Bug-6216
+sqlsmith.Bug-6217
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
@@ -0,0 +1,19 @@
+select
+  ref_11.type_digits as c0
+from
+  (select
+ref_8.login_id as c0,
+ref_8.login_id as c1,
+ref_8.login_id as c2,
+ref_8.role_id as c3,
+ref_8.role_id as c4,
+45 as c5
+  from
+sys.user_role as ref_8
+  where ref_8.role_id is NULL) as subq_0
+  inner join sys.idxs as ref_9
+  on (subq_0.c5 = ref_9.id )
+inner join sys.columns as ref_11
+on (subq_0.c5 = ref_11.id )
+where ref_9.table_id is NULL
+limit 146;
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlsmith.Bug-6216` in directory 'sql/test/BugTracker-2017` 
itself:
+
+
+# 14:03:34 >  
+# 14:03:34 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30571" "--set" 
"mapi_usock=/var/tmp/mtest-13980/.s.monetdb.30571" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:03:34 >  
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/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 = 5
+# 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 = 30571
+# cmdline opt  mapi_usock = /var/tmp/mtest-13980/.s.monetdb.30571
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt  gdk_debug = 536870922
+
+# 14:03:35 >  
+# 14:03:35 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13980" "--port=30571"
+# 14:03:35 >  
+
+
+# 14:03:35 >  
+# 14:03:35 >  "Done."
+# 14:03:35 >  
+
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'sqlsmith.Bug-6216` in directory 'sql/test/BugTracker-2017` 
itself:
+
+
+# 14:03:34 >  
+# 14:03:34 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30571" "--set" 
"mapi_usock=/var/tmp/mtest-13980/.s.monetdb.30571" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:03:34 >  
+
+# MonetDB 5 server v11.26.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:30571/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-13980/.s.monetdb.30571
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:03:35 >  
+# 14:03:35 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13980" "--port=30571"
+# 14:03:35 >  
+
+#select
+#  ref_11.type_digits as c0
+#from
+#  (select
+#ref_8.login_id as c0,
+#ref_8.login_id as c1,
+#

MonetDB: wlcr - Approve output

2017-02-19 Thread Martin Kersten

Changeset: 1841a393c1c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1841a393c1c8
Removed Files:
sql/test/wlcr/Tests/wlc60.py
sql/test/wlcr/Tests/wlc60.stable.err
sql/test/wlcr/Tests/wlc60.stable.out
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc70.stable.err
sql/test/wlcr/Tests/wlc70.stable.out
sql/test/wlcr/Tests/wlr60.py
sql/test/wlcr/Tests/wlr60.stable.err
sql/test/wlcr/Tests/wlr60.stable.out
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr70.stable.err
sql/test/wlcr/Tests/wlr70.stable.out
Modified Files:
sql/backends/monet5/wlr.c
sql/test/wlcr/Tests/All
sql/test/wlcr/Tests/wlc80.stable.out
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr30.stable.out
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr80.py
sql/test/wlcr/Tests/wlr80.stable.out
Branch: wlcr
Log Message:

Approve output


diffs (truncated from 666 to 300 lines):

diff --git a/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -254,7 +254,7 @@ WLRprocess(void *arg)
sql->session->ac_on_commit = 1;
sql->session->level = 0;
(void) mvc_trans(sql);
-   printFunction(GDKerr, mb, 0, 
LIST_MAL_DEBUG );
+   //printFunction(GDKerr, mb, 0, 
LIST_MAL_DEBUG );
msg= runMAL(c,mb,0,0);
wlr_tag++;
WLRsetConfig( );
@@ -400,8 +400,7 @@ WLRreplicate(Client cntxt, MalBlkPtr mb,
WLRsetConfig();
WLRgetMaster();
// The client has to wait initially for all logs known to be processed.
-   if( wlr_limit > 0)
-   WLRprocess(cntxt);
+   WLRprocess(cntxt);
if( wlr_limit < 0){
msg = WLRinit();
if( msg )
diff --git a/sql/test/wlcr/Tests/All b/sql/test/wlcr/Tests/All
--- a/sql/test/wlcr/Tests/All
+++ b/sql/test/wlcr/Tests/All
@@ -21,21 +21,13 @@ wlc30
 wlr30
 #
 ##delete some tupples
-#wlc40
+wlc40
 wlr40
 #
 ##clear the complete table
-#wlc50
-#wlr50
-#
-##shuffle the master state
-#wlc60
-#wlr60
-#
-##temporarily suspend log propagation
-#wlc70
-#wlr70
+wlc50
+wlr50
 #
 ##stop the master
-#wlc80
-#wlr80
+wlc80
+wlr80
diff --git a/sql/test/wlcr/Tests/wlc60.py b/sql/test/wlcr/Tests/wlc60.py
deleted file mode 100644
--- a/sql/test/wlcr/Tests/wlc60.py
+++ /dev/null
@@ -1,39 +0,0 @@
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-import os, sys
-
-dbfarm = os.getenv('GDK_DBFARM')
-tstdb = os.getenv('TSTDB')
-
-if not tstdb or not dbfarm:
-print 'No TSTDB or GDK_DBFARM in environment'
-sys.exit(1)
-
-dbname = tstdb
-
-s = process.server(dbname = dbname, stdin = process.PIPE, stdout = 
process.PIPE, stderr = process.PIPE)
-
-c = process.client('sql', dbname = dbname, stdin = process.PIPE, stdout = 
process.PIPE, stderr = process.PIPE)
-
-cout, cerr = c.communicate('''\
-call master();
-
-call pausemaster();
-call pausemaster();
-
-select * from tmp;
-insert into tmp values(30,'2 lost update requests');
-
-call resumemaster();
-insert into tmp values(35,'resumed logging');
-select * from tmp;
-''')
-
-sout, serr = s.communicate()
-
-sys.stdout.write(sout)
-sys.stdout.write(cout)
-sys.stderr.write(serr)
-sys.stderr.write(cerr)
diff --git a/sql/test/wlcr/Tests/wlc60.stable.err 
b/sql/test/wlcr/Tests/wlc60.stable.err
deleted file mode 100644
--- a/sql/test/wlcr/Tests/wlc60.stable.err
+++ /dev/null
@@ -1,38 +0,0 @@
-stderr of test 'wlc60` in directory 'sql/test/wlcr` itself:
-
-
-# 10:50:35 >  
-# 10:50:35 >  "/usr/bin/python2" "wlc60.py" "wlc60"
-# 10:50:35 >  
-
-# builtin opt  gdk_dbpath = 
/export/scratch1/mk/wlcr//Linux/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 = 5
-# 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  monet_prompt = 
-# cmdline opt  mapi_port = 34501
-# cmdline opt  mapi_usock = /var/tmp/mtest-23485/.s.monetdb.34501
-# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/wlcr//Linux/var/MonetDB/mTests_sql_test_wlcr-clone
-# cmdline opt  gdk_debug = 536870922
-MAPI  = (monetdb) /var/tmp/mtest-13682/.s.monetdb.39678
-QUERY = call master();
-ERROR = !WARNING: already in master mode, call ignored
-MAPI  = (monetdb) /var/tmp/mtest-15762/.s.monetdb.32018
-QUERY = call pausemaster();
-ERROR = !WARNING: master role not

MonetDB: Dec2016 - prevent crash in bug 6219 (ie be carefull wit...

2017-02-19 Thread Niels Nes

Changeset: de9359d0cdd4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de9359d0cdd4
Modified Files:
sql/server/rel_optimizer.c
Branch: Dec2016
Log Message:

prevent crash in bug 6219 (ie be carefull with missing expression lists)


diffs (12 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -4088,7 +4088,7 @@ rel_push_join_down(int *changes, mvc *sq
list *exps = NULL;
 
(void)*changes;
-   if (!rel_is_ref(rel) && (((is_join(rel->op) && rel->exps) || 
is_semi(rel->op)) && rel->l)) {
+   if (!rel_is_ref(rel) && ((is_join(rel->op) || is_semi(rel->op)) && 
rel->l && rel->exps)) {
sql_rel *gb = rel->r, *ogb = gb, *l = NULL, *rell = rel->l;
 
if (gb->op == op_project)
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - add tests for bugs 6216 and 6217

2017-02-19 Thread Niels Nes

Changeset: 53b86a794d0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53b86a794d0c
Added Files:
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.out
Modified Files:
sql/test/BugTracker-2017/Tests/All
Branch: default
Log Message:

add tests for bugs 6216 and 6217


diffs (235 lines):

diff --git a/sql/test/BugTracker-2017/Tests/All 
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -27,3 +27,5 @@ sqlsmith04
 nested_with.Bug-6187
 prepare.Bug-6133
 null-quantile.Bug-6218
+sqlsmith.Bug-6216
+sqlsmith.Bug-6217
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
@@ -0,0 +1,19 @@
+select
+  ref_11.type_digits as c0
+from
+  (select
+ref_8.login_id as c0,
+ref_8.login_id as c1,
+ref_8.login_id as c2,
+ref_8.role_id as c3,
+ref_8.role_id as c4,
+45 as c5
+  from
+sys.user_role as ref_8
+  where ref_8.role_id is NULL) as subq_0
+  inner join sys.idxs as ref_9
+  on (subq_0.c5 = ref_9.id )
+inner join sys.columns as ref_11
+on (subq_0.c5 = ref_11.id )
+where ref_9.table_id is NULL
+limit 146;
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlsmith.Bug-6216` in directory 'sql/test/BugTracker-2017` 
itself:
+
+
+# 14:03:34 >  
+# 14:03:34 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30571" "--set" 
"mapi_usock=/var/tmp/mtest-13980/.s.monetdb.30571" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:03:34 >  
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/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 = 5
+# 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 = 30571
+# cmdline opt  mapi_usock = /var/tmp/mtest-13980/.s.monetdb.30571
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt  gdk_debug = 536870922
+
+# 14:03:35 >  
+# 14:03:35 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13980" "--port=30571"
+# 14:03:35 >  
+
+
+# 14:03:35 >  
+# 14:03:35 >  "Done."
+# 14:03:35 >  
+
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out 
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'sqlsmith.Bug-6216` in directory 'sql/test/BugTracker-2017` 
itself:
+
+
+# 14:03:34 >  
+# 14:03:34 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30571" "--set" 
"mapi_usock=/var/tmp/mtest-13980/.s.monetdb.30571" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:03:34 >  
+
+# MonetDB 5 server v11.26.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:30571/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-13980/.s.monetdb.30571
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:03:35 >  
+# 14:03:35 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13980" "--port=30571"
+# 14:03:35 >  
+
+#select
+#  ref_11.type_digits as c0
+#from
+#  (select
+#ref_8.login_id as c0,
+#ref_8.login_id as

MonetDB: Dec2016 - create list when needed

2017-02-19 Thread Niels Nes

Changeset: 14fe6d965af3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14fe6d965af3
Modified Files:
sql/server/rel_rel.c
Branch: Dec2016
Log Message:

create list when needed


diffs (12 lines):

diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -472,6 +472,8 @@ rel_select_add_exp(sql_allocator *sa, sq
sql_exp *t = exp_atom_bool(sa, 1);
e = exp_compare(sa, e, t, cmp_equal);
}
+   if (!l->exps)
+   l->exps = new_exp_list(sa);
append(l->exps, e);
 }
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: wlcr - Merge with default

MonetDB: wlcr - Approve output

MonetDB: Dec2016 - prevent crash in bug 6219 (ie be carefull wit...

MonetDB: default - add tests for bugs 6216 and 6217

MonetDB: Dec2016 - create list when needed

5 matches

Site Navigation

Mail list logo

Footer information