date:20141019

MonetDB: default - approved output

2014-10-19 Thread Niels Nes

Changeset: 65e702dfd5fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65e702dfd5fe
Modified Files:
sql/test/mergetables/Tests/mergeload.stable.out
Branch: default
Log Message:

approved output


diffs (15 lines):

diff --git a/sql/test/mergetables/Tests/mergeload.stable.out 
b/sql/test/mergetables/Tests/mergeload.stable.out
--- a/sql/test/mergetables/Tests/mergeload.stable.out
+++ b/sql/test/mergetables/Tests/mergeload.stable.out
@@ -20,11 +20,6 @@ stdout of test 'mergeload` in directory 
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema sys;
-create function epoch(t int) returns timestamp external name timestamp.epoch;
-create function epoch(t timestamp) returns int external name timestamp.epoch;
-create function epoch(t bigint) returns timestamp external name calc.timestamp;
 
 # 16:18:32   
 # 16:18:32   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-10817 --port=39884
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - added simple type checks on merge table and i...

2014-10-19 Thread Niels Nes

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

added simple type checks on merge table and its parts


diffs (45 lines):

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
@@ -1054,6 +1054,27 @@ get_schema_name( mvc *sql, char *sname, 
return sname;
 }
 
+static int
+rel_check_tables(mvc *sql, sql_table *nt, sql_table *nnt)
+{
+   node *n, *m;
+
+   if (cs_size(nt-columns) != cs_size(nnt-columns)) {
+   (void) sql_error(sql, 02, 3F000!ALTER MERGE TABLE: to be added 
table doesn't match MERGE TABLE definition);
+   return -1;
+   }
+   for (n = nt-columns.set-h, m = nnt-columns.set-h; n  m; n = 
n-next, m = m-next) {
+   sql_column *nc = n-data;
+   sql_column *mc = m-data;
+
+   if (subtype_cmp(nc-type, mc-type) != 0) {
+   (void) sql_error(sql, 02, 3F000!ALTER MERGE TABLE: to 
be added table column type doesn't match MERGE TABLE definition);
+   return -2;
+   }
+   }
+   return 0;
+}
+
 static sql_rel *
 rel_alter_table(mvc *sql, dlist *qname, symbol *te)
 {
@@ -1120,8 +1141,12 @@ rel_alter_table(mvc *sql, dlist *qname, 
char *ntname = te-data.lval-h-data.sval;
sql_table *nnt = mvc_bind_table(sql, s, ntname);
 
-   if (nnt)
+   /* check tables */
+   if (nnt) {
+   if (rel_check_tables(sql, nt, nnt)  0)
+   return NULL;
cs_add(nt-tables, nnt, TR_NEW); 
+   }
}
/* table drop table */
if (te-token == SQL_DROP_TABLE) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2014 - Fix the SQL queue error 3604

2014-10-19 Thread Martin Kersten

Changeset: 8455d3abe150 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8455d3abe150
Added Files:
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
Modified Files:
monetdb5/mal/mal_interpreter.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:

Fix the SQL queue error 3604


diffs (156 lines):

diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -760,6 +760,7 @@ str runMALsequence(Client cntxt, MalBlkP
/* monitoring information should reflect the input 
arguments,
   which may be removed by garbage collection  */
runtimeProfileExit(cntxt, mb, stk, pci, 
runtimeProfile);
+   runtimeProfileFinish(cntxt, mb);
/* check for strong debugging after each MAL statement 
*/
if ( pci-token != FACcall  ret== MAL_SUCCEED) {
if (GDKdebug  (CHECKMASK|PROPMASK)  
exceptionVar  0) {
diff --git a/sql/test/BugTracker-2014/Tests/All 
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -46,3 +46,4 @@ nil_2dec_lng.Bug-3592
 manifold.Bug-3556
 duplicate_primary_keys.Bug-3474
 copy_decimal_into.Bug-3596
+queueError.Bug-3604
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql 
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
@@ -0,0 +1,5 @@
+select qtag,user,status,query from sys.queue();
+drop table xyz;
+select qtag,user,status,query from sys.queue();
+drop table yz;
+select qtag,user,status,query from sys.queue();
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err 
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
@@ -0,0 +1,42 @@
+stderr of test 'queueError.Bug-3604` in directory 'sql/test/BugTracker-2014` 
itself:
+
+
+# 11:43:51   
+# 11:43:51   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=35114 --set 
mapi_usock=/var/tmp/mtest-3599/.s.monetdb.35114 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0 --set embedded_r=yes
+# 11:43:51   
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/Oct2014//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  mapi_port = 35114
+# cmdline opt  mapi_usock = /var/tmp/mtest-3599/.s.monetdb.35114
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+
+MAPI  = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+QUERY = drop table xyz;
+ERROR = !DROP TABLE: no such table 'xyz'
+MAPI  = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+QUERY = drop table yz;
+ERROR = !DROP TABLE: no such table 'yz'
+
+
+
+# 11:43:52   
+# 11:43:52   Done.
+# 11:43:52   
+
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out 
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
@@ -0,0 +1,75 @@
+stdout of test 'queueError.Bug-3604` in directory 'sql/test/BugTracker-2014` 
itself:
+
+
+# 11:43:51   
+# 11:43:51   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=35114 --set 
mapi_usock=/var/tmp/mtest-3599/.s.monetdb.35114 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0 --set embedded_r=yes
+# 11:43:51   
+
+# MonetDB 5 server v11.19.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further

MonetDB: default - approved output

MonetDB: default - added simple type checks on merge table and i...

MonetDB: Oct2014 - Fix the SQL queue error 3604

3 matches

Site Navigation

Mail list logo

Footer information