date:20151218

MonetDB: default - Approvals.

2015-12-18 Thread Sjoerd Mullender

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

Approvals.


diffs (24 lines):

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
@@ -695,7 +695,7 @@ Ready.
 [ "sys",   "stddev_samp",  1,  "timestamp",""  ]
 [ "sys",   "stop", 0,  "int",  "create procedure sys.stop(tag 
int)\nexternal name sql.sysmon_stop;"]
 [ "sys",   "stop", 0,  "bigint",   "create procedure sys.stop(tag 
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys",   "storage",  0,  "clob", "-- This Source Code Form is 
subject to the terms of the Mozilla Public\n-- License, v. 2.0.  If a copy of 
the MPL was not distributed with this\n-- file, You can obtain one at 
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- 
Author M.Kersten\n-- This script gives the database administrator insight in 
the actual\n-- footprint of the persistent tables and the maximum playground 
used\n-- when indices are introduced upon them.\n-- By chancing the 
storagemodelinput table directly, the footprint for\n-- yet to be loaded 
databases can be assessed.\n\n-- The actual storage footprint of an existing 
database can be\n-- obtained by the table procuding function storage()\n-- It 
represents the actual state of affairs, i.e. storage on disk\n-- of columns and 
foreign key indices, and possible temporary hash indices.\n-- For strings we 
take a sample to determine their average length.\n\ncreate function 
sys.\"storage\"()\nreturns table (\n\t
 \"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" 
string,\n\t\"mode\" string,\n\tlocation string,\n\t\"count\" 
bigint,\n\ttypewidth int,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes 
bigint,\n\tphash boolean,\n\timprints bigint,\n\tsorted boolean\n)\nexternal 
name sql.\"storage\";"   ]
+[ "sys",   "storage",  0,  "clob", "-- This Source Code Form is 
subject to the terms of the Mozilla Public\n-- License, v. 2.0.  If a copy of 
the MPL was not distributed with this\n-- file, You can obtain one at 
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- 
Author M.Kersten\n-- This script gives the database administrator insight in 
the actual\n-- footprint of the persistent tables and the maximum playground 
used\n-- when indices are introduced upon them.\n-- By changing the 
storagemodelinput table directly, the footprint for\n-- yet to be loaded 
databases can be assessed.\n\n-- The actual storage footprint of an existing 
database can be\n-- obtained by the table producing function storage()\n-- It 
represents the actual state of affairs, i.e. storage on disk\n-- of columns and 
foreign key indices, and possible temporary hash indices.\n-- For strings we 
take a sample to determine their average length.\n\ncreate function 
sys.\"storage\"()\nreturns table (\n\t
 \"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" 
string,\n\t\"mode\" string,\n\tlocation string,\n\t\"count\" 
bigint,\n\ttypewidth int,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes 
bigint,\n\tphash boolean,\n\timprints bigint,\n\tsorted boolean\n)\nexternal 
name sql.\"storage\";"   ]
 [ "sys",   "storage",  1,  "clob", ""  ]
 [ "sys",   "storage",  2,  "clob", ""  ]
 [ "sys",   "storage",  3,  "clob", ""  ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -720,7 +720,7 @@ Ready.
 [ "sys",   "stddev_samp",  1,  "hugeint",  ""  ]
 [ "sys",   "stop", 0,  "int",  "create procedure sys.stop(tag 
int)\nexternal name sql.sysmon_stop;"]
 [ "sys",   "stop", 0,  "bigint",   "create procedure sys.stop(tag 
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys",   "storage",  0,  "clob", "-- This Source Code Form is 
subject to the terms of the Mozilla Public\n-- License, v. 2.0.  If a copy of 
the MPL was not distributed with this\n-- file, You can obtain one at 
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- 
Author M.Kersten\n-- This script gives the database administrator insight in 
the actual\n-- footprint of the persistent tables and the maximum playground 
used\n-- when indices are introduced upon them.\n-- By chancing the 
storagemodelinput table directly, the footprint for\n-- yet to be loaded 
databases can be assessed.\n\n-- The actual storage footprint of an existing 
database can be\n-- obtained by the table procuding function

MonetDB: default - tests subdirectory is gone.

2015-12-18 Thread Sjoerd Mullender

Changeset: 45c2d07e8d59 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45c2d07e8d59
Modified Files:
monetdb5/Makefile.ag
Branch: default
Log Message:

tests subdirectory is gone.


diffs (9 lines):

diff --git a/monetdb5/Makefile.ag b/monetdb5/Makefile.ag
--- a/monetdb5/Makefile.ag
+++ b/monetdb5/Makefile.ag
@@ -8,5 +8,3 @@
 # tools: builds libmonetdb5 from mal, modules, optimizer, scheduler
 # extras: builds optional/separate libraries that require libmonetdb5
 SUBDIRS = mal modules optimizer scheduler tools extras NATIVE_WIN32?NT
-
-EXTRA_DIST_DIR = tests
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Quote timezone string: it may have an embedde...

2015-12-18 Thread Sjoerd Mullender

Changeset: e1c886462e21 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1c886462e21
Modified Files:
clients/mapiclient/mclient.c
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/modules/atoms/mtime.c
Branch: default
Log Message:

Quote timezone string: it may have an embedded comma.


diffs (171 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1080,6 +1080,8 @@ TESTrenderer(MapiHdl hdl)
 /* start or end with white space? */
 my_isspace(*s) ||
 my_isspace(s[l - 1]) ||
+/* timezone can have embedded comma */
+strcmp(tp, "timezone") == 0 ||
 /* a bunch of geom types */
 strcmp(tp, "curve") == 0 ||
 strcmp(tp, "geometry") == 0 ||
diff --git a/monetdb5/mal/Tests/tst1200.stable.out 
b/monetdb5/mal/Tests/tst1200.stable.out
--- a/monetdb5/mal/Tests/tst1200.stable.out
+++ b/monetdb5/mal/Tests/tst1200.stable.out
@@ -84,21 +84,21 @@ Ready.
 [ "tzone_bat" ]
 
#-#
 # ht   
  # name
-# oid  tzone   
  # type
-#-#
-[ 0@0,   GMT   
  ]
-[ 1@0,   GMT+01:00 
  ]
-[ 2@0,   GMT+01:00 
  ]
-[ 3@0, GMT+01:00-DST[october 31@01:15, "first wednesday on or after march 
26@01:15"]
-[ 4@0, GMT-DST[17th monday from start of january@01:15,"31th sunday 
from start of august@01:15"]
-[ 5@0, GMT-01:37-DST[october 31@01:15, "first thursday on or after april 
31@01:15" ]
-[ 6@0, GMT-01:37-DST[may 26@01:15, "22th tuesday from start of 
september@01:15"]
-[ 7@0, GMT+23:00-DST[first thursday on or after april 31@01:15,"first 
wednesday on or after november 22@01:15" ]
-[ 8@0,   GMT-23:36 
  ]
-[ 9@0,   GMT   
  ]
-[ 10@0,  GMT-01:00 
  ]
-[ 11@0,  GMT+23:59 
  ]
-[ 12@0,  GMT+01:00 
  ]
+# void timezone  # type
+#--#
+[ 0@0, "GMT"   ]
+[ 1@0, "GMT+01:00" ]
+[ 2@0, "GMT+01:00" ]
+[ 3@0, "GMT+01:00-DST[october 31@01:15,first wednesday on or after march 
26@01:15]"]
+[ 4@0, "GMT-DST[17th monday from start of january@01:15,31th sunday from start 
of august@01:15]"   ]
+[ 5@0, "GMT-01:37-DST[october 31@01:15,first thursday on or after april 
31@01:15]" ]
+[ 6@0, "GMT-01:37-DST[may 26@01:15,22th tuesday from start of 
september@01:15]"]
+[ 7@0, "GMT+23:00-DST[first thursday on or after april 31@01:15,first 
wednesday on or after november 22@01:15]"]
+[ 8@0, "GMT-23:36" ]
+[ 9@0, "GMT"   ]
+[ 10@0,"GMT-01:00" ]
+[ 11@0,"GMT+23:59" ]
+[ 12@0,"GMT+01:00" ]
 [ 13@0,  nil   
  ]
 [ 14@0,  nil   
  ]
 [ 15@0,  nil   
  ]
@@ -1021,31 +1021,31 @@ Ready.
 
#-#
 # ht   t   
  # name
 # void str timezone
  # type
-#-#
-[ 0@0,

MonetDB: default - When number of columns changes, discard colum...

2015-12-18 Thread Sjoerd Mullender

Changeset: c512382b590c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c512382b590c
Modified Files:
clients/mapilib/mapi.c
monetdb5/mal/Tests/tst960.stable.out
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/tst4030.stable.out
Branch: default
Log Message:

When number of columns changes, discard column information.


diffs (61 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -5048,6 +5048,21 @@ mapi_slice_row(struct MapiResultSet *res
  result->fieldcnt, ']');
free(p);
}
+   if (i != result->fieldcnt) {
+   int j;
+   for (j = 0; j < result->fieldcnt; j++) {
+   if (result->fields[j].columnname)
+   free(result->fields[j].columnname);
+   result->fields[j].columnname = NULL;
+   if (result->fields[j].columntype)
+   free(result->fields[j].columntype);
+   result->fields[j].columntype = NULL;
+   if (result->fields[j].tablename)
+   free(result->fields[j].tablename);
+   result->fields[j].tablename = NULL;
+   result->fields[j].columnlength = 0;
+   }
+   }
if (i > result->fieldcnt) {
result->fieldcnt = i;
if (i > result->maxfields) {
diff --git a/monetdb5/mal/Tests/tst960.stable.out 
b/monetdb5/mal/Tests/tst960.stable.out
--- a/monetdb5/mal/Tests/tst960.stable.out
+++ b/monetdb5/mal/Tests/tst960.stable.out
@@ -110,7 +110,7 @@ Ready.
 [ 1@0,   "brave" ]
 [ 2@0,   "new"   ]
 [ 3@0,   "world" ]
-[ Start searches   ]
+[ "Start searches" ]
 #--#
 # ht  # name
 # void int   # type
diff --git a/monetdb5/optimizer/Tests/joinchain.stable.out 
b/monetdb5/optimizer/Tests/joinchain.stable.out
--- a/monetdb5/optimizer/Tests/joinchain.stable.out
+++ b/monetdb5/optimizer/Tests/joinchain.stable.out
@@ -173,7 +173,7 @@ end user.qry;
 #--#
 [ 0@0, "The"  ]
 [ 1@0, "jumps"  ]
-[ empty sequences  ]
+[ "empty sequences"]
 #--#
 # ht  # name
 # void str  # type
diff --git a/monetdb5/optimizer/Tests/tst4030.stable.out 
b/monetdb5/optimizer/Tests/tst4030.stable.out
--- a/monetdb5/optimizer/Tests/tst4030.stable.out
+++ b/monetdb5/optimizer/Tests/tst4030.stable.out
@@ -60,7 +60,7 @@ end user.foo;
 [ 0@0, 1  ]
 [ 1@0, 2  ]
 [ 2@0, 3  ]
-[ done ]
+[ "done"   ]
 
 # 23:52:52 >  
 # 23:52:52 >  Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - fixed bug 3887, ie return error when profiler...

2015-12-18 Thread Niels Nes

Changeset: 6a05428d4df7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a05428d4df7
Modified Files:
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
sql/backends/monet5/sql.c
sql/server/rel_select.c
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
Branch: default
Log Message:

fixed bug 3887, ie return error when profiler isn't started

handle over() again on query without where.


diffs (128 lines):

diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -560,12 +560,11 @@ static BAT *TRACE_id_majflt = 0;
 static BAT *TRACE_id_nvcsw = 0;
 static BAT *TRACE_id_stmt = 0;
 
-
-void
+int
 TRACEtable(BAT **r)
 {
if (TRACE_init == 0)
-   return ;   /* not initialized */
+   return -1;   /* not initialized */
MT_lock_set(_profileLock);
r[0] = COLcopy(TRACE_id_event, TRACE_id_event->ttype, 0, TRANSIENT);
r[1] = COLcopy(TRACE_id_time, TRACE_id_time->ttype, 0, TRANSIENT);
@@ -581,6 +580,7 @@ TRACEtable(BAT **r)
r[11] = COLcopy(TRACE_id_nvcsw, TRACE_id_nvcsw->ttype, 0, TRANSIENT);
r[12] = COLcopy(TRACE_id_stmt, TRACE_id_stmt->ttype, 0, TRANSIENT);
MT_lock_unset(_profileLock);
+   return 13;
 }
 
 BAT *
diff --git a/monetdb5/mal/mal_profiler.h b/monetdb5/mal/mal_profiler.h
--- a/monetdb5/mal/mal_profiler.h
+++ b/monetdb5/mal/mal_profiler.h
@@ -39,7 +39,7 @@ mal_export void MPresetProfiler(stream *
 
 mal_export int malProfileMode;
 mal_export void clearTrace(void);
-mal_export void TRACEtable(BAT **r);
+mal_export int TRACEtable(BAT **r);
 mal_export int initTrace(void);
 mal_export str cleanupTraces(void);
 mal_export BAT *getTrace(const char *ev);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4202,7 +4202,8 @@ dump_trace(Client cntxt, MalBlkPtr mb, M
 
(void) cntxt;
(void) mb;
-   TRACEtable(t);
+   if (TRACEtable(t) != 13)
+   throw(SQL, "sql.dump_trace", "3F000!Profiler not started");
for(i=0; i< 13; i++){
id = t[i]->batCacheid;
*getArgReference_bat(stk, pci, i) = id;
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
@@ -4951,7 +4951,7 @@ rel_frame(mvc *sql, symbol *frame, list 
  * aa = project (a) [ x, y, r = rank_op(diff(x) (marks a new partition), 
rediff(diff(x), y) (marks diff value with in partition)), z, w, v ]
  * project(aa) [ aa.x, aa.y, aa.r ] -- only keep current output list 
  * bb = project (b) [ x, y, a = aggr_op(z, diff(y), rediff(diff(y), x)), z, w, 
v ]
- * project(j) [ bb.x, bb.y, bb.a ]  -- only keep current output list
+ * project(bb) [ bb.x, bb.y, bb.a ]  -- only keep current output list
  */
 static sql_exp *
 rel_rankop(mvc *sql, sql_rel **rel, symbol *se, int f)
@@ -4967,7 +4967,7 @@ rel_rankop(mvc *sql, sql_rel **rel, symb
sql_rel *r = *rel, *p;
list *gbe = NULL, *obe = NULL, *fbe = NULL, *args, *types;
sql_schema *s = sql->session->schema;
-   int distinct = 0;
+   int distinct = 0, project_added = 0;

if (window_function->token == SQL_RANK) {
aname = qname_fname(window_function->data.lval);
@@ -4990,6 +4990,10 @@ rel_rankop(mvc *sql, sql_rel **rel, symb
}
 
/* window operations are only allowed in the projection */
+   if (r && r->op != op_project) {
+   *rel = r = rel_project(sql->sa, r, rel_projections(sql, r, 
NULL, 1, 1));
+   project_added = 1;
+   }
if (f != sql_sel || !r || r->op != op_project || is_processed(r))
return sql_error(sql, 02, "OVER: only possible within the 
selection");
 
@@ -5110,6 +5114,10 @@ rel_rankop(mvc *sql, sql_rel **rel, symb
set_processed(p);
append(p->exps, e);
e = rel_lastexp(sql, p);
+   if (project_added) {
+   append(r->exps, e);
+   e = rel_lastexp(sql, r);
+   }
return e;
 }
 
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err 
b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
--- a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
+++ b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
@@ -27,7 +27,11 @@ stderr of test 'sys_tracelog.Bug-3887` i
 # cmdline opt  gdk_debug = 536870922
 
 
-# 14:11:11 >  
-# 14:11:11 >  "Done."
-# 14:11:11 >  
+MAPI  = (monetdb) /var/tmp/mtest-25081/.s.monetdb.33961
+QUERY = select count(*) from "sys"."tracelog";
+ERROR = !Profiler not started
 
+# 12:53:39 >  
+# 12:53:39 >  "Done."
+# 12:53:39 >  
+
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out

MonetDB: default - approve error output.

2015-12-18 Thread Niels Nes

Changeset: cf7b0d826b82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf7b0d826b82
Modified Files:
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
Branch: default
Log Message:

approve error output.


diffs (88 lines):

diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py 
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
@@ -1,3 +1,9 @@
+"""
+Test if server doesn't crash when remote and local table definitions do not 
match
+
+Current result is an mal error (compilation failed)
+"""
+
 import os, sys, socket, glob, monetdb.sql, threading, time, codecs, shutil, 
tempfile
 try:
 from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err 
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
@@ -30,8 +30,57 @@ stderr of test 'schemadiff.Bug-3778` in 
 # 15:29:05 >  "/usr/bin/python2" "schemadiff.Bug-3778.SQL.py" 
"schemadiff.Bug-3778"
 # 15:29:05 >  
 
+# 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_usock = /var/tmp/mtest-25081/.s.monetdb.33961
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  mapi_port = 37355
+# cmdline opt  gdk_dbpath = /tmp/tmpou_du0/master/master
+# cmdline opt  gdk_debug = 536870922
+# 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_usock = /var/tmp/mtest-25081/.s.monetdb.33961
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  mapi_port = 48845
+# cmdline opt  gdk_dbpath = /tmp/tmpou_du0/worker_0/worker_0
+# cmdline opt  gdk_debug = 536870922
+Traceback (most recent call last):
+  File "schemadiff.Bug-3778.SQL.py", line 85, in 
+c.execute("select * from " + shardtable + workers[0]['tpf'] )
+  File 
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/cursors.py",
 line 158, in execute
+block = self.connection.execute(query)
+  File 
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
 line 127, in execute
+return self.command('s' + query + '\n;')
+  File 
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
 line 132, in command
+return self.mapi.cmd(command)
+  File 
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/mapi.py",
 line 178, in cmd
+raise OperationalError(response[1:])
+monetdb.exceptions.OperationalError: 
(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in: 
rmt5_X_1_bat_oid_int:bat[:oid,:int] := user.l1();
 
-# 15:29:06 >  
-# 15:29:06 >  "Done."
-# 15:29:06 >  
+!failed to open file: No such file or directory 
(/tmp/tmpou_du0/worker_0/worker_0/.uplog)!failed to open file: No such file or 
directory (/tmp/tmpou_du0/master/master/.uplog)
+# 12:53:25 >  
+# 12:53:25 >  "Done."
+# 12:53:25 >  
 
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out 
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
@@ -27,7 +27,6 @@ Ready.
 # 15:29:05 >  "/usr/bin/python2" "schemadiff.Bug-3778.SQL.py" 
"schemadiff.Bug-3778"
 # 15:29:05 >  
 
-! Correct/expected stable output need to provided/approved !
 
 # 15:29:06 >  
 # 15:29:06 >  "Done."
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - add ability to set gdk_debug, ie much faster ...

2015-12-18 Thread Niels Nes

Changeset: ce86607b01c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce86607b01c7
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
sql/scripts/25_debug.sql
sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.sql
sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

add ability to set gdk_debug, ie much faster long_insert test


diffs (truncated from 2562 to 300 lines):

diff --git a/clients/Tests/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -126,6 +126,7 @@ SYSTEM FUNCTION  sys.corr
 SYSTEM FUNCTION  sys.crosses
 SYSTEM FUNCTION  sys.date_to_str
 SYSTEM FUNCTION  sys.db_users
+SYSTEM FUNCTION  sys.debug
 SYSTEM FUNCTION  sys.degrees
 SYSTEM FUNCTION  sys.dependencies_columns_on_functions
 SYSTEM FUNCTION  sys.dependencies_columns_on_indexes
diff --git a/clients/Tests/SQL-dump.stable.out.int128 
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -122,6 +122,7 @@ SYSTEM FUNCTION  sys.corr
 SYSTEM FUNCTION  sys.crosses
 SYSTEM FUNCTION  sys.date_to_str
 SYSTEM FUNCTION  sys.db_users
+SYSTEM FUNCTION  sys.debug
 SYSTEM FUNCTION  sys.degrees
 SYSTEM FUNCTION  sys.dependencies_columns_on_functions
 SYSTEM FUNCTION  sys.dependencies_columns_on_indexes
@@ -1691,142 +1692,142 @@ 6231  "def"   "clob"  0   0   6233NULL
true1   N
 6232   "status""clob"  0   0   6233NULLtrue2   
NULL
 6239   "name"  "clob"  0   0   6241NULLtrue0   NULL
 6240   "value" "clob"  0   0   6241NULLtrue1   NULL
-6277   "qtag"  "bigint"64  0   6285NULLtrue0   
NULL
-6278   "user"  "clob"  0   0   6285NULLtrue1   NULL
-6279   "started"   "timestamp" 7   0   6285NULLtrue
2   NULL
-6280   "estimate"  "timestamp" 7   0   6285NULLtrue
3   NULL
-6281   "progress"  "int"   32  0   6285NULLtrue4   
NULL
-6282   "status""clob"  0   0   6285NULLtrue5   
NULL
-6283   "tag"   "oid"   63  0   6285NULLtrue6   NULL
-6284   "query" "clob"  0   0   6285NULLtrue7   NULL
-6311   "rowid" "bigint"64  0   6315NULLtrue0   
NULL
-6312   "fldid" "int"   32  0   6315NULLtrue1   NULL
-6313   "message"   "clob"  0   0   6315NULLtrue2   
NULL
-6314   "input" "clob"  0   0   6315NULLtrue3   NULL
-6985   "keyword"   "varchar"   40  0   6988NULLfalse   
0   NULL
-6990   "table_type_id" "smallint"  16  0   6996NULLfalse   
0   NULL
-6993   "table_type_name"   "varchar"   25  0   6996NULL
false   1   NULL
-6998   "dependency_type_id""smallint"  16  0   7004NULL
false   0   NULL
-7001   "dependency_type_name"  "varchar"   15  0   7004NULL
false   1   NULL
-7019   "file_id"   "int"   32  0   7021NULLtrue0   
NULL
-7020   "location"  "char"  256 0   7021NULLtrue1   
NULL
-7023   "dim_id""int"   32  0   7027NULLtrue0   
NULL
-7024   "file_id"   "int"   32  0   7027NULLtrue1   
NULL
-7025   "name"  "varchar"   64  0   7027NULLtrue2   
NULL
-7026   "length""int"   32  0   7027NULLtrue3   
NULL
-7029   "var_id""int"   32  0   7035NULLtrue0   
NULL
-7030   "file_id"   "int"   32  0   7035NULLtrue1   
NULL
-7031   "name"  "varchar"   64  0   7035NULLtrue2   
NULL
-7032   "vartype"   "varchar"   64  0   7035NULLtrue
3   NULL
-7033   "ndim"  "int"   32  0   7035NULLtrue4   NULL
-7034   "coord_dim_id"  "int"   32  0   7035NULLtrue5   
NULL
-7037   "var_id""int"   32  0   7041NULLtrue0   
NULL
-7038   "dim_id""int"   32  0   7041NULLtrue1   
NULL
-7039   "file_id"   "int"   32  0   7041NULLtrue2   
NULL
-7040   "dimpos""int"   32  0   7041NULLtrue3   
NULL
-7043   "obj_name"  "varchar"   256 0   7049NULLtrue
0   NULL
-7044   "att_name"  "varchar"   256 0

MonetDB: default - Approvals for non 128 bit systems.

2015-12-18 Thread Sjoerd Mullender

Changeset: 1728b95b6c3e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1728b95b6c3e
Added Files:
sql/test/pg_regress/Tests/oid.stable.err.int128
Modified Files:
clients/Tests/SQL-dump.stable.out
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/remote03.stable.out
sql/benchmarks/nobench/Tests/nobench.stable.err
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out
sql/test/Users/Tests/dropManyUsers.Bug-3764.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/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/oid.stable.err
Branch: default
Log Message:

Approvals for non 128 bit systems.


diffs (truncated from 7287 to 300 lines):

diff --git a/clients/Tests/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1651,142 +1651,142 @@ 5748  "def"   "clob"  0   0   5750NULL
true1   N
 5749   "status""clob"  0   0   5750NULLtrue2   
NULL
 5756   "name"  "clob"  0   0   5758NULLtrue0   NULL
 5757   "value" "clob"  0   0   5758NULLtrue1   NULL
-5794   "qtag"  "bigint"64  0   5802NULLtrue0   
NULL
-5795   "user"  "clob"  0   0   5802NULLtrue1   NULL
-5796   "started"   "timestamp" 7   0   5802NULLtrue
2   NULL
-5797   "estimate"  "timestamp" 7   0   5802NULLtrue
3   NULL
-5798   "progress"  "int"   32  0   5802NULLtrue4   
NULL
-5799   "status""clob"  0   0   5802NULLtrue5   
NULL
-5800   "tag"   "oid"   63  0   5802NULLtrue6   NULL
-5801   "query" "clob"  0   0   5802NULLtrue7   NULL
-5828   "rowid" "bigint"64  0   5832NULLtrue0   
NULL
-5829   "fldid" "int"   32  0   5832NULLtrue1   NULL
-5830   "message"   "clob"  0   0   5832NULLtrue2   
NULL
-5831   "input" "clob"  0   0   5832NULLtrue3   NULL
-6467   "keyword"   "varchar"   40  0   6470NULLfalse   
0   NULL
-6472   "table_type_id" "smallint"  16  0   6478NULLfalse   
0   NULL
-6475   "table_type_name"   "varchar"   25  0   6478NULL
false   1   NULL
-6480   "dependency_type_id""smallint"  16  0   6486NULL
false   0   NULL
-6483   "dependency_type_name"  "varchar"   15  0   6486NULL
false   1   NULL
-6501   "file_id"   "int"   32  0   6503NULLtrue0   
NULL
-6502   "location"  "char"  256 0   6503NULLtrue1   
NULL
-6505   "dim_id""int"   32  0   6509NULLtrue0   
NULL
-6506   "file_id"   "int"   32  0   6509NULLtrue1   
NULL
-6507   "name"  "varchar"   64  0   6509NULLtrue2   
NULL

MonetDB: default - approved output

2015-12-18 Thread Niels Nes

Changeset: 462e1b72d9e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=462e1b72d9e1
Modified Files:
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
Branch: default
Log Message:

approved output


diffs (18 lines):

diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out 
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
@@ -75,10 +75,10 @@ Ready.
 % varchar, varchar,int # type
 % 7,   13, 4 # length
 [ "monetdb",   "MonetDB Admin",2000]
-[ "user1", "1st user", 7414]
-[ "user2", "2nd user", 7414]
-[ "user3", "3rd user", 7414]
-[ "user4", "4th user", 7414]
+[ "user1", "1st user", 7418]
+[ "user2", "2nd user", 7418]
+[ "user3", "3rd user", 7418]
+[ "user4", "4th user", 7418]
 #DROP USER user1;
 #DROP USER user2;
 #DROP USER user3;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Cleanup: unexport BUNreplace and change its i...

2015-12-18 Thread Sjoerd Mullender

Changeset: 1e99b6f514fd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e99b6f514fd
Modified Files:
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_logger.c
gdk/gdk_private.h
monetdb5/modules/kernel/bat5.c
Branch: default
Log Message:

Cleanup: unexport BUNreplace and change its interface.
Note, there's also BUNinplace and void_inplace.


diffs (218 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -201,7 +201,6 @@ void BBPunlock(const char *s);
 gdk_return BUNappend(BAT *b, const void *right, bit force);
 BUN BUNfnd(BAT *b, const void *right);
 gdk_return BUNinplace(BAT *b, BUN p, const void *right, bit force);
-gdk_return BUNreplace(BAT *b, const void *left, const void *right, bit force);
 BAT *COLcopy(BAT *b, int tt, int writeable, int role);
 size_t GDK_mem_maxsize;
 size_t GDK_vm_maxsize;
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Fri Dec 18 2015 Sjoerd Mullender 
+- Removed BUNreplace from list of exported functions.  It wasn't used,
+  and there is still BUNinplace and void_inplace that do more-or-less
+  the same thing.
+
 * Thu Dec 17 2015 Sjoerd Mullender 
 - Changed BATderiveHeadProps to BATderiveTailProps (and it now works on
   the tail column).
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1079,7 +1079,7 @@ gdk_export bte ATOMelmshift(int sz);
  * @item BAT*
  * @tab BUNappend (BAT *b, ptr right, bit force)
  * @item BAT*
- * @tab BUNreplace (BAT *b, ptr left, ptr right, bit force)
+ * @tab BUNreplace (BAT *b, oid left, ptr right, bit force)
  * @item int
  * @tab BUNfnd (BAT *b, ptr tail)
  * @item BUN
@@ -1258,7 +1258,6 @@ gdk_export gdk_return GDKupgradevarheap(
 gdk_export gdk_return BUNappend(BAT *b, const void *right, bit force);
 gdk_export gdk_return BATappend(BAT *b, BAT *c, bit force);
 
-gdk_export gdk_return BUNreplace(BAT *b, const void *left, const void *right, 
bit force);
 gdk_export gdk_return BUNinplace(BAT *b, BUN p, const void *right, bit force);
 gdk_export gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force);
 
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1062,7 +1062,7 @@ BUNinplace(BAT *b, BUN p, const void *t,
 
/* uncommitted BUN elements */
 
-   ALIGNinp(b, "BUNreplace", force, GDK_FAIL); /* zap alignment info */
+   ALIGNinp(b, "BUNinplace", force, GDK_FAIL); /* zap alignment info */
if (b->T->nil &&
atom_CMP(BUNtail(bi, p), ATOMnilptr(b->ttype), b->ttype) == 0 &&
atom_CMP(t, ATOMnilptr(b->ttype), b->ttype) != 0) {
@@ -1122,57 +1122,47 @@ BUNinplace(BAT *b, BUN p, const void *t,
return GDK_FAIL;
 }
 
+/* very much like void_inplace, except this materializes a void tail
+ * column if necessarry */
 gdk_return
-BUNreplace(BAT *b, const void *h, const void *t, bit force)
+BUNreplace(BAT *b, oid id, const void *t, bit force)
 {
-   BUN p;
-
BATcheck(b, "BUNreplace", GDK_FAIL);
-   BATcheck(h, "BUNreplace: head value is nil", GDK_FAIL);
BATcheck(t, "BUNreplace: tail value is nil", GDK_FAIL);
 
-   if ((p = BUNfnd(BATmirror(b), h)) == BUN_NONE)
+   if (id < b->hseqbase || id >= b->hseqbase + BATcount(b))
return GDK_SUCCEED;
 
if ((b->tkey & BOUND2BTRUE) && BUNfnd(b, t) != BUN_NONE) {
return GDK_SUCCEED;
}
if (b->ttype == TYPE_void) {
-   BUN i;
-
/* no need to materialize if value doesn't change */
-   if (b->tseqbase == oid_nil || (b->hseqbase + p) == *(oid *) t)
+   if (b->tseqbase == oid_nil ||
+   b->tseqbase + id - b->hseqbase == *(const oid *) t)
return GDK_SUCCEED;
-   i = p;
if (BATmaterialize(b) != GDK_SUCCEED)
return GDK_FAIL;
-   p = i;
}
 
-   return BUNinplace(b, p, t, force);
+   return BUNinplace(b, id - b->hseqbase + BUNfirst(b), t, force);
 }
 
+/* very much like BUNreplace, but this doesn't make any changes if the
+ * tail column is void */
 gdk_return
 void_inplace(BAT *b, oid id, const void *val, bit force)
 {
-   gdk_return res = GDK_SUCCEED;
-   BUN p = BUN_NONE;
-   BUN oldInserted = b->batInserted;
-   BAT *bm = BATmirror(b);
-
-   assert(b->htype == TYPE_void);
-   assert(b->hseqbase != oid_nil);
-   assert(b->batCount > (id - b->hseqbase));
-
-   b->batInserted = 0;
-   p = BUNfndVOID(bm, );
-
-   assert(force || p >= b->batInserted);   /* we don't want delete/ins */
-   assert(force ||

MonetDB: default - merged

2015-12-18 Thread Niels Nes

Changeset: a31cd1cab348 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a31cd1cab348
Added Files:
sql/test/pg_regress/Tests/oid.stable.err.int128
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_logger.c
gdk/gdk_private.h
monetdb5/ChangeLog
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/Tests/remote03.stable.out
sql/benchmarks/nobench/Tests/nobench.stable.err
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out
sql/test/Users/Tests/dropManyUsers.Bug-3764.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/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/oid.stable.err
Branch: default
Log Message:

merged


diffs (truncated from 7973 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -30848,6 +30848,14 @@ command bat.delete(b:bat[:oid,:any_1]):b
 address BKCdelete_all;
 comment Delete all entries.
 
+command bat.delete(b:bat[:oid,:any_1],d:bat[:oid,:oid]):bat[:oid,:any_1] 
+address BKCdelete_multi;
+comment Delete multiple BUN, shifting BUNs up
+
+command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] 
+address BKCdelete;
+comment Delete BUN indicated by head value, exchanging with last BUN
+
 command bat.getName(b:bat[:oid,:any_1]):str 
 address BKCgetBBPname;
 comment Gives back the logical name of a BAT.
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -39817,6 +39817,14 @@ command bat.delete(b:bat[:oid,:any_1]):b
 address BKCdelete_all;
 comment Delete all entries.
 
+command bat.delete(b:bat[:oid,:any_1],d:bat[:oid,:oid]):bat[:oid,:any_1] 
+address BKCdelete_multi;
+comment Delete multiple BUN, shifting BUNs up
+
+command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] 
+address BKCdelete;
+comment Delete BUN indicated by head value, exchanging with last BUN
+
 command bat.getName(b:bat[:oid,:any_1]):str 
 address BKCgetBBPname;
 comment Gives back the logical name of a BAT.
diff --git a/clients/Tests/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1651,142 +1651,142 @@ 5748  "def"   "clob"  0   0   5750NULL
true1   N
 5749   "status""clob"  0   0   5750NULLtrue2   
NULL
 5756   "name"  "clob"  0   0   5758NULLtrue0   NULL
 5757   "value" "clob"  0   0   5758NULL

MonetDB: default - approve output

2015-12-18 Thread Niels Nes

Changeset: 35e28172407d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35e28172407d
Added Files:
sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.err
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.out
Branch: default
Log Message:

approve output


diffs (287 lines):

diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err 
b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'constant-random.Bug-3836` in directory 
'sql/test/BugTracker-2015` itself:
+
+
+# 17:48:01 >  
+# 17:48:01 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31631" "--set" 
"mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:48:01 >  
+
+# 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 = 31631
+# cmdline opt  mapi_usock = /var/tmp/mtest-18246/.s.monetdb.31631
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 17:48:01 >  
+# 17:48:01 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-18246" "--port=31631"
+# 17:48:01 >  
+
+
+# 17:48:01 >  
+# 17:48:01 >  "Done."
+# 17:48:01 >  
+
diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out 
b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
@@ -0,0 +1,85 @@
+stdout of test 'constant-random.Bug-3836` in directory 
'sql/test/BugTracker-2015` itself:
+
+
+# 17:48:01 >  
+# 17:48:01 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31631" "--set" 
"mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:48:01 >  
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31631/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-18246/.s.monetdb.31631
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.55'
+# Finished reading the write-ahead log 'sql_logs/sql/log.55'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 17:48:01 >  
+# 17:48:01 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-18246" "--port=31631"
+# 17:48:01 >  
+
+#create table tr(a int);
+#insert into tr values (1), (1);
+[ 2]
+#select a + rand() from tr;
+% sys.L # table_name
+% sql_add_a # name
+% bigint # type
+% 10 # length
+[ 2024039433   ]
+[ 61050385 ]
+#create table trand (a int, b int default rand());
+#insert into trand(a) values (1);
+[ 1]
+#insert into trand(a) values (2);
+[ 1]
+#insert into trand(a) values (3);
+[ 1]
+#alter table trand add column c int default rand();
+#alter table trand add column d int default null;
+#select * from trand;
+% sys.trand,   sys.trand,  sys.trand,  sys.trand # table_name
+% a,   b,  c,  d # name
+% int, int,int,int # type
+% 1,   10, 10, 1 # length
+[ 1,   1608666431, 2022107617, NULL]
+[ 2,   1889558987, 237295360,

MonetDB: default - workaround rand unsafe problem (ie special ca...

2015-12-18 Thread Niels Nes

Changeset: 764eee365b0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=764eee365b0e
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_multiplex.h
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_support.c
Branch: default
Log Message:

workaround rand unsafe problem (ie special case in opt_evaluate)
bailout of multiplex will do an extra simple optimize call, such
that functions with inline property set get the multiplex call
rewriten.


diffs (92 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1519,7 +1519,7 @@ int OPTmergetableImplementation(Client c
 int OPTmitosisImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTmitosisPlanOverdue(Client cntxt, str fname);
 int OPTmultiplexImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-str OPTmultiplexSimple(Client cntxt);
+str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
 str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
p);
 int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
diff --git a/monetdb5/optimizer/opt_evaluate.c 
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -16,10 +16,12 @@ OPTallConstant(Client cntxt, MalBlkPtr m
int i;
(void)cntxt;
 
-   if ( !( p->token == ASSIGNsymbol ||
-   getModuleId(p) == calcRef ||
+   if ( !(p->token == ASSIGNsymbol ||
+  getModuleId(p) == calcRef ||
   getModuleId(p) == strRef ||
-  getModuleId(p) == mmathRef ))
+  getModuleId(p) == mmathRef))
+   return FALSE;
+   if (getModuleId(p) == mmathRef && strcmp(getFunctionId(p), "rand") == 0)
return FALSE;
 
for (i = p->retc; i < p->argc; i++)
diff --git a/monetdb5/optimizer/opt_multiplex.c 
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -184,9 +184,9 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
  * and interpretation overhead.
  */
 str
-OPTmultiplexSimple(Client cntxt)
+OPTmultiplexSimple(Client cntxt, MalBlkPtr mb)
 {
-   MalBlkPtr mb= cntxt->curprg->def;
+   //MalBlkPtr mb= cntxt->curprg->def;
int i, doit=0;
InstrPtr p;
if(mb)
diff --git a/monetdb5/optimizer/opt_multiplex.h 
b/monetdb5/optimizer/opt_multiplex.h
--- a/monetdb5/optimizer/opt_multiplex.h
+++ b/monetdb5/optimizer/opt_multiplex.h
@@ -14,7 +14,7 @@
 #include "opt_support.h"
 
 opt_export int OPTmultiplexImplementation(Client cntxt, MalBlkPtr mb, 
MalStkPtr stk, InstrPtr pci);
-opt_export str OPTmultiplexSimple(Client cntxt);
+opt_export str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
 
 #define OPTDEBUGmultiplex  if ( optDebug & ((lng)1 <def);
+   s->def->inlineProp = 0;
return 0;
}
/*
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -292,7 +292,7 @@ MALoptimizer(Client c)
return MAL_SUCCEED;
msg= optimizeMALBlock(c, c->curprg->def);
if( msg == MAL_SUCCEED)
-   OPTmultiplexSimple(c);
+   OPTmultiplexSimple(c, c->curprg->def);
return msg;
 }
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Reimplemented bat.delete with two arguments.

2015-12-18 Thread Sjoerd Mullender

Changeset: d0f4b2dc4565 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0f4b2dc4565
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
monetdb5/ChangeLog
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
Branch: default
Log Message:

Reimplemented bat.delete with two arguments.


diffs (truncated from 637 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -30848,6 +30848,14 @@ command bat.delete(b:bat[:oid,:any_1]):b
 address BKCdelete_all;
 comment Delete all entries.
 
+command bat.delete(b:bat[:oid,:any_1],d:bat[:oid,:oid]):bat[:oid,:any_1] 
+address BKCdelete_multi;
+comment Delete multiple BUN, shifting BUNs up
+
+command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] 
+address BKCdelete;
+comment Delete BUN indicated by head value, exchanging with last BUN
+
 command bat.getName(b:bat[:oid,:any_1]):str 
 address BKCgetBBPname;
 comment Gives back the logical name of a BAT.
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -39817,6 +39817,14 @@ command bat.delete(b:bat[:oid,:any_1]):b
 address BKCdelete_all;
 comment Delete all entries.
 
+command bat.delete(b:bat[:oid,:any_1],d:bat[:oid,:oid]):bat[:oid,:any_1] 
+address BKCdelete_multi;
+comment Delete multiple BUN, shifting BUNs up
+
+command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] 
+address BKCdelete;
+comment Delete BUN indicated by head value, exchanging with last BUN
+
 command bat.getName(b:bat[:oid,:any_1]):str 
 address BKCgetBBPname;
 comment Gives back the logical name of a BAT.
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -106,6 +106,7 @@ BAT *BATconst(BAT *l, int tt, const void
 BAT *BATconstant(int tt, const void *val, BUN cnt, int role);
 BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error);
 BUN BATcount_no_nil(BAT *b);
+gdk_return BATdel(BAT *b, BAT *d);
 BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((warn_unused_result));
 void BATderiveProps(BAT *b, int expensive);
 void BATderiveTailProps(BAT *b, int expensive);
@@ -199,6 +200,7 @@ void BBPshare(bat b);
 gdk_return BBPsync(int cnt, bat *subcommit);
 void BBPunlock(const char *s);
 gdk_return BUNappend(BAT *b, const void *right, bit force);
+gdk_return BUNdelete(BAT *b, oid o);
 BUN BUNfnd(BAT *b, const void *right);
 gdk_return BUNinplace(BAT *b, BUN p, const void *right, bit force);
 BAT *COLcopy(BAT *b, int tt, int writeable, int role);
@@ -759,7 +761,9 @@ str BKCbat_inplace(bat *r, const bat *bi
 str BKCbat_inplace_force(bat *r, const bat *bid, const bat *rid, const bat 
*uid, const bit *force);
 str BKCbun_inplace(bat *r, const bat *bid, const oid *id, const void *t);
 str BKCbun_inplace_force(bat *r, const bat *bid, const oid *id, const void *t, 
const bit *force);
+str BKCdelete(bat *r, const bat *bid, const oid *h);
 str BKCdelete_all(bat *r, const bat *bid);
+str BKCdelete_multi(bat *r, const bat *bid, const bat *sid);
 str BKCdensebat(bat *ret, const wrd *size);
 str BKCgetAccess(str *res, const bat *bid);
 str BKCgetBBPname(str *ret, const bat *bid);
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -2,6 +2,12 @@
 # This file is updated with Maddlog
 
 * Fri Dec 18 2015 Sjoerd Mullender 
+- BUNdelete and BATdel don't accept a foce argument and only allow
+  deleting values that have not yet been committed.  BUNdelete exchanges
+  the deleted value with the last value (if the deleted value isn't the
+  last value).  BATdel compacts the BAT by shifting values after the
+  deleted values up.  The list of to-be-deleted values in BATdel must
+  be sorted and unique.
 - Removed BUNreplace from list of exported functions.  It wasn't used,
   and there is still BUNinplace and void_inplace that do more-or-less
   the same thing.
@@ -11,9 +17,6 @@
   the tail column).
 - Removed unused functions BATalpha, BATdelta, and BATprev.
 
-* Mon Dec 14 2015 Sjoerd Mullender 
-- Removed functions BATins, BATdel, BUNdel and BUNdelete.
-
 * Fri Dec 11 2015 Sjoerd Mullender 
 - Removed function VIEWcombine.  Use BATdense instead.
 - Removed "left" parameter from BUNinplace.  It wasn't used since the
diff --git a/gdk/gdk.h b/gdk/gdk.h

MonetDB: default - Disable -ei for MAL testing

2015-12-18 Thread Martin Kersten

Changeset: 06dedadc886d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06dedadc886d
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:

Disable -ei for MAL testing


diffs (12 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3952,7 +3952,7 @@ def main(argv) :
 exe['Mdiff'] = CheckExec('Mdiff'), 'Mdiff'
 exe['python']= CheckExec(sys.executable) , sys.executable
 exe['ruby_client']   = CheckExec(env['RUBYCLIENT'].split(None, 
1)[0])   , '%s %s' % (env['RUBYCLIENT'], env['MAPIPORT'])
-exe['MAL_Client']= CheckExec(env['MALCLIENT'].split(None, 
1)[0])  , '%s -i -e --host=%s --port=%s' % (env['MALCLIENT'], HOST, 
env['MAPIPORT'])
+exe['MAL_Client']= CheckExec(env['MALCLIENT'].split(None, 
1)[0])  , '%s --host=%s --port=%s' % (env['MALCLIENT'], HOST, env['MAPIPORT'])
 exe['SQL_Client']= CheckExec(env['SQLCLIENT'].split(None, 
1)[0])   , '%s -i -e --host=%s --port=%s' % (env['SQLCLIENT'], HOST, 
env['MAPIPORT'])
 exe['SQL_Dump']  = CheckExec(env['SQLDUMP'].split(None, 1)[0]) 
, '%s --host=%s --port=%s' % (env['SQLDUMP'], HOST, env['MAPIPORT'])
 exe['R_Client']   = CheckExec(env['RCLIENT'].split(None, 1)[0])   
, '%s --args %s' % (env['RCLIENT'], env['MAPIPORT'])
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

2015-12-18 Thread Martin Kersten

Changeset: 7337849bc476 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7337849bc476
Modified Files:
monetdb5/optimizer/Tests/FTexample.stable.out
Branch: default
Log Message:

Approve output


diffs (60 lines):

diff --git a/monetdb5/optimizer/Tests/FTexample.stable.out 
b/monetdb5/optimizer/Tests/FTexample.stable.out
--- a/monetdb5/optimizer/Tests/FTexample.stable.out
+++ b/monetdb5/optimizer/Tests/FTexample.stable.out
@@ -5,23 +5,39 @@ stdout of test 'FTexample` in directory 
 # 23:53:03 >  Mtimeout -timeout 60 Mserver 
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
 --set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set 
mapi_port=39352 --set sql_port=45171 --set xquery_port=52900 --set 
monet_prompt= --trace --dbname=mTests_src_optimizer  FTexample.mal   
 
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_optimizer', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.test(s:str):wrd;
-b := bat.new(:oid,:str);
-bat.append(b,"hello");
-z := algebra.subselect(b,s,s,true,true,false);
-i := aggr.count(z);
-return test := i;
-end user.test;
-function user.main():void;
-#Code factorization 
-mdb.List("user","test");
-end user.main;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33204/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-32050/.s.monetdb.33204
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 23:59:48 >  
+# 23:59:48 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-32050" "--port=33204"
+# 23:59:48 >  
+
+#mdb.List("user","test");
+function user.test(s:str):wrd; #[0]  0 <- 1 
+b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4 
+bat.append(b:bat[:oid,:str],"hello":str);  #[2] BKCappend_val_wrap 5 <- 2 
6 
+z:bat[:oid,:oid] := 
algebra.subselect(b:bat[:oid,:str],s:str,s:str,true:bit,true:bit,false:bit);   
#[3] ALGsubselect1 7 <- 2 1 1 8 9 10 
+i:wrd := aggr.count(z:bat[:oid,:oid]); #[4] ALGcount_bat 11 <- 7 
+return test:wrd := i:wrd;  #[5]  0 <- 11 
+end user.test; #[6]  
+#mdb.List("user","test");
 factory user.test(s:str):wrd;  #[0]  0 <- 1 
 b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4 
 bat.append(b:bat[:oid,:str],"hello":str);  #[2] BKCappend_val_wrap 5 <- 2 
6 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Keep local inline flag

2015-12-18 Thread Martin Kersten

Changeset: e4c92c08e2e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4c92c08e2e0
Modified Files:
monetdb5/optimizer/opt_inline.c
Branch: default
Log Message:

Keep local inline flag


diffs (29 lines):

diff --git a/monetdb5/optimizer/opt_inline.c b/monetdb5/optimizer/opt_inline.c
--- a/monetdb5/optimizer/opt_inline.c
+++ b/monetdb5/optimizer/opt_inline.c
@@ -33,6 +33,7 @@ OPTinlineImplementation(Client cntxt, Ma
int i;
InstrPtr q,sig;
int actions = 0;
+   int inlineProp = 0;
 
(void) p;
(void)stk;
@@ -51,7 +52,7 @@ OPTinlineImplementation(Client cntxt, Ma
mnstr_printf(cntxt->fdout,"#multiplex 
inline function\n");

printInstruction(cntxt->fdout,mb,0,q,LIST_MAL_ALL);
}
-   mb->inlineProp = 1;
+   inlineProp = 1;
} else
/*
 * Check if the function definition is tagged as being 
inlined.
@@ -70,7 +71,7 @@ OPTinlineImplementation(Client cntxt, Ma
/*
 * Check if the local call is tagged as being inlined.
 */
-   if ( q->blk->inlineProp ){
+   if (inlineProp || q->blk->inlineProp ){
inlineMALblock(mb,i,q->blk);
i--;
actions++;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

2015-12-18 Thread Martin Kersten

Changeset: a387d75a4436 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a387d75a4436
Modified Files:
monetdb5/extras/rapi/Tests/rapi01.stable.err
monetdb5/extras/rapi/Tests/rapi01.stable.out
monetdb5/mal/Tests/recycle01.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.err
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/tst1002.malC
monetdb5/mal/Tests/tst1002.stable.err
monetdb5/mal/Tests/tst1002.stable.out
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst102.stable.out
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst108.stable.out
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst109.stable.out
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst670.malC
monetdb5/mal/Tests/tst670.stable.err
monetdb5/mal/Tests/tst670.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline08.malC
monetdb5/optimizer/Tests/inline09.malC
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/opt_inline.c
Branch: default
Log Message:

Approve output


diffs (truncated from 1444 to 300 lines):

diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err 
b/monetdb5/extras/rapi/Tests/rapi01.stable.err
--- a/monetdb5/extras/rapi/Tests/rapi01.stable.err
+++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err
@@ -30,26 +30,37 @@ stderr of test 'rapi01` in directory 'mo
 # 11:17:47 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13991" "--port=31221"
 # 11:17:47 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(somevalue));",b);
+MAPI  = (monetdb) /var/tmp/mtest-23471/.s.monetdb.34866
+QUERY = # Error handling tests
+b:= bat.new(:oid,:int);
+bat.append(b,1804289383);
+bat.append(b,846930886);
+bat.append(b,1681692777);
+bat.append(b,1714636915);
+bat.append(b,1957747793);
+bat.append(b,424238335);
+bat.append(b,719885386);
+bat.append(b,1649760492);
+bat.append(b,596516649);
+bat.append(b,1189641421);
+
+io.print(b);
+
+# illegal variables being used
+
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(somevalue));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(arg2));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b);
+
+# illegal R expressions
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2)  )  );",b);
+
+io.print(r);
 ERROR = !MALException:rapi.eval:Error running R expression: Error in 
fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> 
 -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(arg2));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) 
: object 'arg2' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in 
fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> 
 -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) 
: object 'arg2' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg5) 
: object 'arg5' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2)  )  );",b);
-ERROR = !MALException:rapi.eval:Error parsing R expression 'ret0 <- 
Re(fft(arg2)  )  );'. 
 
-# 11:17:47 >  
-# 11:17:47 >  "Done."
-# 11:17:47 >  
+# 20:42:39 >  
+# 20:42:39 >  "Done."
+# 20:42:39 >  
 
diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out 
b/monetdb5/extras/rapi/Tests/rapi01.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi01.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out
@@ -39,8 +39,6 @@ Ready.
 [ 7@0,

MonetDB: default - Approve output

2015-12-18 Thread Martin Kersten

Changeset: db0e8e6b550b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db0e8e6b550b
Modified Files:
monetdb5/extras/rapi/Tests/rapi07.stable.err
monetdb5/extras/rapi/Tests/rapi07.stable.out
monetdb5/mal/Tests/All
monetdb5/mal/Tests/dynamicload.stable.err
monetdb5/mal/Tests/flowchk.stable.err
monetdb5/mal/Tests/parseErrors.stable.err
monetdb5/mal/Tests/parseErrors.stable.out
monetdb5/mal/Tests/pithole.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst003.stable.err
monetdb5/mal/Tests/tst007.stable.err
monetdb5/mal/Tests/tst007.stable.out
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst010.stable.err
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst019.stable.err
monetdb5/mal/Tests/tst019.stable.out
monetdb5/mal/Tests/tst027.stable.err
monetdb5/mal/Tests/tst027.stable.out
monetdb5/mal/Tests/tst036.stable.err
monetdb5/mal/Tests/tst036.stable.out
monetdb5/mal/Tests/tst038.stable.err
monetdb5/mal/Tests/tst050.malC
monetdb5/mal/Tests/tst050.stable.err
monetdb5/mal/Tests/tst054.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst070.stable.err
monetdb5/mal/Tests/tst071.stable.err
monetdb5/mal/Tests/tst071.stable.out
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst104.stable.err
monetdb5/mal/Tests/tst105.stable.err
monetdb5/mal/Tests/tst105a.stable.err
monetdb5/mal/Tests/tst106.stable.err
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst115.stable.err
monetdb5/mal/Tests/tst150.stable.err
monetdb5/mal/Tests/tst1500.stable.err
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst161.stable.err
monetdb5/mal/Tests/tst163.stable.err
monetdb5/mal/Tests/tst163.stable.out
monetdb5/mal/Tests/tst200.stable.err
monetdb5/mal/Tests/tst200.stable.out
monetdb5/mal/Tests/tst201.malC
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst272.stable.err
monetdb5/mal/Tests/tst272.stable.out
monetdb5/mal/Tests/tst275.stable.err
monetdb5/mal/Tests/tst275.stable.out
monetdb5/mal/Tests/tst302.stable.err
monetdb5/mal/Tests/tst303.stable.err
monetdb5/mal/Tests/tst305.stable.err
monetdb5/mal/Tests/tst611.stable.err
monetdb5/mal/Tests/tst660.stable.err
monetdb5/mal/Tests/tst755.stable.err
monetdb5/mal/Tests/tst760.stable.err
monetdb5/mal/Tests/tst804.stable.err
monetdb5/mal/Tests/tst840.stable.err
monetdb5/mal/Tests/tst840.stable.out
monetdb5/mal/Tests/tst850.malC
monetdb5/mal/Tests/tst900.stable.err
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.malC
monetdb5/mal/Tests/tst905.malC
monetdb5/mal/Tests/tst907.malC
monetdb5/optimizer/Tests/ARexample.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/ifthencst.stable.out
monetdb5/optimizer/Tests/inline04.malC
monetdb5/optimizer/Tests/inline05.malC
monetdb5/optimizer/Tests/inline06.malC
monetdb5/optimizer/Tests/inline07.malC
monetdb5/optimizer/Tests/inline08.malC
monetdb5/optimizer/Tests/inline09.malC
monetdb5/optimizer/Tests/inline10.malC
monetdb5/optimizer/Tests/inlineCst.malC
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4001.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 3366 to 300 lines):

diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.err 
b/monetdb5/extras/rapi/Tests/rapi07.stable.err
--- a/monetdb5/extras/rapi/Tests/rapi07.stable.err
+++ b/monetdb5/extras/rapi/Tests/rapi07.stable.err
@@ -1,11 +1,11 @@
 stderr of test 'rapi07` in directory 'monetdb5/extras/rapi` itself:
 
 
-# 20:20:45 >  
-# 20:20:45 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=38117" "--set" 
"mapi_usock=/var/tmp/mtest-2827/.s.monetdb.38117" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2"

MonetDB: default - Approve output

2015-12-18 Thread Martin Kersten

Changeset: 8648c37526ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8648c37526ef
Added Files:
monetdb5/mal/Tests/tst005.malC
monetdb5/mal/Tests/tst005.stable.err
monetdb5/mal/Tests/tst022.stable.err
monetdb5/mal/Tests/tst022.stable.out
monetdb5/mal/Tests/tst116.malC
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst116.stable.out
monetdb5/mal/Tests/tst237.malC
monetdb5/mal/Tests/tst237.stable.err
monetdb5/mal/Tests/tst237.stable.out
Removed Files:
monetdb5/mal/Tests/tst040.mal
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst005.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 579 to 300 lines):

diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -3,6 +3,7 @@ tst001
 tst002
 tst003
 tst004
+tst005
 tst006
 tst007
 tst008
@@ -35,7 +36,6 @@ tst036
 tst037
 tst038
 tst039
-tst040
 tst041
 tst042
 tst043
@@ -80,6 +80,7 @@ tst108
 tst109
 tst110
 tst115
+tst116
 tst1150
 #tst120files are not located in module and paths are runtime dependent
 tst1200
@@ -114,6 +115,7 @@ tst232
 tst233
 tst234
 tst235
+tst237
 tst250
 tst2500
 tst2501
diff --git a/monetdb5/mal/Tests/tst005.malC b/monetdb5/mal/Tests/tst005.malC
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.malC
@@ -0,0 +1,23 @@
+# test proper exists
+function foo();
+   i:= 1;
+   j:= 2;
+barrier v:=i;
+   io.print("entered");
+   io.print(v);
+   redo v:= iterator.next(-1,0);
+exit   v;
+   io.print("doubles");
+   i:= 1;
+barrier (v,w):=(i,j);
+   io.print("entered2");
+   io.print(v);
+   v:= v-1;
+   barrier b:= v == 0;
+   leave (v,w);
+   exit b;
+   redo (v,w):= (v,w);
+exit   (v,w);
+   io.print("finished");
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst005.stable.err 
b/monetdb5/mal/Tests/tst005.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'tst005` in directory 'monetdb5/mal` itself:
+
+
+# 08:15:16 >  
+# 08:15:16 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=32746" "--set" 
"mapi_usock=/var/tmp/mtest-26338/.s.monetdb.32746" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" 
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 08:15:16 >  
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//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 = 32746
+# cmdline opt  mapi_usock = /var/tmp/mtest-26338/.s.monetdb.32746
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
+# cmdline opt  mal_listing = 2
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 08:15:16 >  
+# 08:15:16 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-26338" "--port=32746"
+# 08:15:16 >  
+
+
+# 08:15:16 >  
+# 08:15:16 >  "Done."
+# 08:15:16 >  
+
diff --git a/monetdb5/mal/Tests/tst005.stable.out 
b/monetdb5/mal/Tests/tst005.stable.out
--- a/monetdb5/mal/Tests/tst005.stable.out
+++ b/monetdb5/mal/Tests/tst005.stable.out
@@ -1,52 +1,37 @@
-# Monet Database Server V4.5.0
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/src/mal/Tests/All.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:demo
-# Visit http://monetdb.cwi.nl for further information.
-## test proper exists
-#  i:= 1;
-#  j:= 2;
-#barrier v:=i;
-#  print("entered");
-#  print(v);
-#  redo v:= v -1;
-#exit  v;
-#  print("doubles");
-#barrier (v,w):=(i,j);
-#  print("entered");
-#  print(v);
-#  v:= v-1;
-#  redo (v,w):= (v,w);
-#exit  (v,w);
-#
-#  print("finished");
-#
-function Admin.main():int; # 0  (main:int)
-i := 1;# 1  (i:int)<-($2:int)
-j := 2;# 2  (j:int)<-($4:int)
-barrier v := i;# 3  (v:int)<-(i:int) jump 7
-io.print("entered");   # 4 IOprint_val ($6:int)<-($7:str)
-io.print(v);   # 5 IOprint_val ($8:int)<-(v:int)
-redo v := calc.-(v,1); # 6 CALCbinarySUBintint 
(v:int)<-(v:int)($2:int) jump 4
-exit v;# 7  (v:int)
-io.print("doubles");   # 8 IOprint_val ($9:int)<-($10:str)
-barrier (v,w):=

MonetDB: default - Approvals.

MonetDB: default - tests subdirectory is gone.

MonetDB: default - Quote timezone string: it may have an embedde...

MonetDB: default - When number of columns changes, discard colum...

MonetDB: default - fixed bug 3887, ie return error when profiler...

MonetDB: default - approve error output.

MonetDB: default - add ability to set gdk_debug, ie much faster ...

MonetDB: default - Approvals for non 128 bit systems.

MonetDB: default - approved output

MonetDB: default - Cleanup: unexport BUNreplace and change its i...

MonetDB: default - merged

MonetDB: default - approve output

MonetDB: default - workaround rand unsafe problem (ie special ca...

MonetDB: default - Reimplemented bat.delete with two arguments.

MonetDB: default - Disable -ei for MAL testing

MonetDB: default - Approve output

MonetDB: default - Keep local inline flag

MonetDB: default - Approve output

MonetDB: default - Approve output

MonetDB: default - Approve output

20 matches

Site Navigation

Mail list logo

Footer information