MonetDB: default - merge from Jun2010

2010-08-12 Thread Stefan Manegold 
Changeset: 06b217de92a5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06b217de92a5
Modified Files:
sql/src/server/rel_select.mx

sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err

sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out

sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Branch: default
Log Message:

merge from Jun2010


diffs (173 lines):

diff -r 45d9390822b2 -r 06b217de92a5 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx  Wed Aug 11 22:56:02 2010 +0200
+++ b/sql/src/server/rel_select.mx  Thu Aug 12 08:23:34 2010 +0200
@@ -3192,6 +3192,36 @@
r = or;
ol = exp_dup(l);
or = exp_dup(r);
+   t1 = exp_subtype(l);
+   t2 = exp_subtype(r);
+
+   if ((f = sql_bind_member(s, fname, t1, 2)) != NULL 
+  (table_func || !f-res.comp_type)) {
+   /* try finding function based on first argument */
+   node *m = f-func-ops-h;
+   sql_arg *a = m-data;
+
+   l = rel_check_type(sql, a-type, l, type_equal);
+   a = m-next-data;
+   r = rel_check_type(sql, a-type, r, type_equal);
+   if (l  r) {
+   exp_destroy(ol);
+   exp_destroy(or);
+   return exp_binop(l, r, f);
+   }
+   }
+   /* reset error */
+   sql-session-status = 0;
+   sql-errstr[0] = '\0';
+
+   if (l)
+   exp_destroy(l);
+   if (r)
+   exp_destroy(r);
+   l = ol;
+   r = or;
+   ol = exp_dup(l);
+   or = exp_dup(r);
 
/* everything failed, fall back to bind on function name only */
if ((f = sql_find_func(s, fname, 2)) != NULL 
diff -r 45d9390822b2 -r 06b217de92a5 
sql/src/test/BugTracker-2010/Tests/shift_with_cast.Bug-2638.sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/shift_with_cast.Bug-2638.sql   Thu Aug 
12 08:23:34 2010 +0200
@@ -0,0 +1,3 @@
+select cast(1 as bigint)  8;
+select cast(98 as bigint)  32;
+
diff -r 45d9390822b2 -r 06b217de92a5 
sql/src/test/BugTracker-2010/Tests/shift_with_cast.Bug-2638.stable.err
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/shift_with_cast.Bug-2638.stable.err
Thu Aug 12 08:23:34 2010 +0200
@@ -0,0 +1,74 @@
+stderr of test 'shift_with_cast.Bug-2638` in directory 
'src/test/BugTracker-2010` itself:
+
+
+# 23:40:19   
+# 23:40:19mserver5 
--config=/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf
 --debug=10 --set gdk_nr_threads=0 --set 
monet_mod_path=/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin
 --set 
gdk_dbfarm=/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm
  --set mapi_open=true --set xrpc_open=true --set mapi_port=39470 --set 
xrpc_port=40525 --set monet_prompt= --set mal_listing=2 --trace  
--dbname=mTests_src_test_BugTracker-2010 --set mal_listing=0 ; echo ; echo 
Over..
+# 23:40:19   
+
+# builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt  gdk_version = 1.38.4
+# builtin opt  prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# builtin opt  exec_prefix = ${prefix}
+# builtin opt  gdk_dbname = demo
+# builtin opt  gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_alloc_map = no
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_admin = adm
+# builtin opt  monet_prompt = 
+# builtin opt  monet_welcome = yes
+# builtin opt  monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt  monet_daemon = no
+# builtin opt  host = localhost
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_clients = 2
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_debug = 0
+# builtin opt  standoff_ns = 
+# builtin opt  standoff_start = start
+# builtin opt  standoff_end = end
+# config opt   prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# config opt   config = ${prefix}/etc/monetdb5.conf
+# config opt   prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# config opt   exec_prefix = ${prefix}
+# config opt   gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt   monet_mod_path = 
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt   mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt   mero_controlport =

MonetDB: default - merge from Jun2010

2010-08-11 Thread Stefan Manegold 
Changeset: 21ea89ae3a17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21ea89ae3a17
Modified Files:
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_search.mx
Branch: default
Log Message:

merge from Jun2010


diffs (32 lines):

diff -r 98b9327fd486 -r 21ea89ae3a17 MonetDB/src/gdk/gdk_relop.mx
--- a/MonetDB/src/gdk/gdk_relop.mx  Wed Aug 11 09:57:20 2010 +0200
+++ b/MonetDB/src/gdk/gdk_relop.mx  Wed Aug 11 10:07:02 2010 +0200
@@ -1251,10 +1251,12 @@
lcount = BATcount(l);
rcount = BATcount(r);
 
-   if (lcount == 0 || rcount == 0) {
+   if (lcount == 0 || rcount == 0 ||
+   (l-ttype == TYPE_void  l-tseqbase == oid_nil) ||
+   (r-htype == TYPE_void  r-hseqbase == oid_nil)) {
BAT *bn;
 
-   @:return_empty_join_result(l,r, BATjoin: |l|==0 or |r|==0,0)@
+   @:return_empty_join_result(l,r, BATjoin: |l|==0 or |r|==0 or 
tail(l)==NIL or head(r)==NIL,0)@
}
 @-
 collect statistics that help us decide what to do
diff -r 98b9327fd486 -r 21ea89ae3a17 MonetDB/src/gdk/gdk_search.mx
--- a/MonetDB/src/gdk/gdk_search.mx Wed Aug 11 09:57:20 2010 +0200
+++ b/MonetDB/src/gdk/gdk_search.mx Wed Aug 11 10:07:02 2010 +0200
@@ -394,6 +394,10 @@
cnt = BATcapacity(b);
 
if (b-htype == TYPE_void) {
+   if (b-hseqbase == oid_nil) {
+   ALGODEBUG THRprintf(GDKout, #BAThash: cannot 
create hash-table on void column.\n);
+   return NULL;
+   }
ALGODEBUG THRprintf(GDKout, #BAThash: creating 
hash-table on void column..\n);
 
tpe = TYPE_void;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010

2010-08-11 Thread Stefan Manegold 
Changeset: 1f889ecdb5f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f889ecdb5f8
Modified Files:
MonetDB/src/gdk/gdk_search.mx
Branch: default
Log Message:

merge from Jun2010


diffs (12 lines):

diff -r 21ea89ae3a17 -r 1f889ecdb5f8 MonetDB/src/gdk/gdk_search.mx
--- a/MonetDB/src/gdk/gdk_search.mx Wed Aug 11 10:07:02 2010 +0200
+++ b/MonetDB/src/gdk/gdk_search.mx Wed Aug 11 10:11:52 2010 +0200
@@ -395,7 +395,7 @@
 
if (b-htype == TYPE_void) {
if (b-hseqbase == oid_nil) {
-   ALGODEBUG THRprintf(GDKout, #BAThash: cannot 
create hash-table on void column.\n);
+   ALGODEBUG THRprintf(GDKout, #BAThash: cannot 
create hash-table on void-NIL column.\n);
return NULL;
}
ALGODEBUG THRprintf(GDKout, #BAThash: creating 
hash-table on void column..\n);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010

2010-08-10 Thread Stefan Manegold 
Changeset: 1d43b02fbcb1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d43b02fbcb1
Modified Files:
MonetDB/src/gdk/gdk_storage.mx
sql/src/server/rel_bin.mx
Branch: default
Log Message:

merge from Jun2010


diffs (160 lines):

diff -r 0a6a45c2a2b0 -r 1d43b02fbcb1 MonetDB/src/gdk/gdk_storage.mx
--- a/MonetDB/src/gdk/gdk_storage.mxTue Aug 10 16:58:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk_storage.mxWed Aug 11 01:29:16 2010 +0200
@@ -760,21 +760,31 @@
   view and heap.base of views are not necessarily
   aligned */
size_t *lo = (size_t *) (((size_t) base + sizeof(size_t) - 1)  
(~(sizeof(size_t) - 1)));
-   size_t *hi = (size_t *) (base + touch);
-   for (hi -= 8 * page; lo = hi; lo += 8 * page) {
-   /* try to trigger loading of multiple pages
-  without blocking */
-   v0 += lo[0 * page];
-   v1 += lo[1 * page];
-   v2 += lo[2 * page];
-   v3 += lo[3 * page];
-   v4 += lo[4 * page];
-   v5 += lo[5 * page];
-   v6 += lo[6 * page];
-   v7 += lo[7 * page];
-   }
-   for (hi += 7 * page; lo = hi; lo += page)
-   v0 += *lo;
+   size_t *hi = (size_t *) (base + touch), *hi8 = NULL, hi1 = NULL;
+   /* page size: [bytes] - [sizeof(size_t)]
+* to make sure we touch each page,
+* not only 1 in sizeof(size_t) pages */
+   page /= sizeof(size_t);
+   hi8 = hi - 8 * page;
+   hi1 = hi - page;
+   /* detect address underrun */
+   if (hi8  hi)
+   for (; lo = hi8; lo += 8 * page) {
+   /* try to trigger loading of multiple pages
+  without blocking */
+   v0 += lo[0 * page];
+   v1 += lo[1 * page];
+   v2 += lo[2 * page];
+   v3 += lo[3 * page];
+   v4 += lo[4 * page];
+   v5 += lo[5 * page];
+   v6 += lo[6 * page];
+   v7 += lo[7 * page];
+   }
+   /* detect address underrun */
+   if (hi1  hi)
+   for (; lo = hi1; lo += page)
+   v0 += *lo;
}
IODEBUG THRprintf(GDKout,
  #BATpreload(%s-%s,preload=%d,sz=%dMB,touch=%dMB,%s) 
= %dms \n,
diff -r 0a6a45c2a2b0 -r 1d43b02fbcb1 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Tue Aug 10 16:58:06 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Aug 11 01:29:16 2010 +0200
@@ -935,7 +935,6 @@
stmt *c = n-data;
char *rnme = table_name(c);
char *nme = column_name(c);
-   //stmt *s = stmt_join(stmt_dup(jl), column(c), cmp_equal);
stmt *s = stmt_project(stmt_dup(jl), column(c) );
 
/* as append isn't save, we append to a new copy */
@@ -955,7 +954,6 @@
stmt *c = n-data;
char *rnme = table_name(c);
char *nme = column_name(c);
-   //stmt *s = stmt_join(stmt_dup(jr), column(c), cmp_equal);
stmt *s = stmt_project(stmt_dup(jr), column(c) );
 
/* as append isn't save, we append to a new copy */
@@ -1060,7 +1058,6 @@
stmt *c = n-data;
char *rnme = table_name(c);
char *nme = column_name(c);
-   //stmt *s = stmt_join(stmt_dup(join), column(c), cmp_equal);
stmt *s = stmt_project(stmt_dup(join), column(c));
 
s = stmt_alias(s, rnme, nme);
@@ -1789,7 +1786,6 @@
if (col-nrcols == 0) /* constant */
col = stmt_const(sel, col);
else
-   //col = stmt_join(sel, col, cmp_equal);
col = stmt_project(sel, col);
list_append(l, col);
}
@@ -1952,20 +1948,12 @@
 
if (n) {
stmt *limit = NULL, *p, *j;
-   //sql_exp *lmt = le;
 
if (le)
l = exp_bin(sql, le, NULL, NULL, NULL, NULL);
if (oe)
o = exp_bin(sql, oe, NULL, NULL, NULL, NULL);
 
-/*
-   if (!le) {
-   l = o;
-   o = stmt_atom_wrd(0);
-   }
-*/
-
if (!le) 
l = stmt_atom_wrd_nil();
if (!o)
@@ -1980,22 +1968,15 @@
 
sc = column(sc);

MonetDB: default - merge from Jun2010

2010-08-10 Thread Stefan Manegold 
Changeset: 05da8d9dd82c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05da8d9dd82c
Modified Files:
MonetDB/src/gdk/gdk_storage.mx
Branch: default
Log Message:

merge from Jun2010


diffs (12 lines):

diff -r 1d43b02fbcb1 -r 05da8d9dd82c MonetDB/src/gdk/gdk_storage.mx
--- a/MonetDB/src/gdk/gdk_storage.mxWed Aug 11 01:29:16 2010 +0200
+++ b/MonetDB/src/gdk/gdk_storage.mxWed Aug 11 01:34:41 2010 +0200
@@ -760,7 +760,7 @@
   view and heap.base of views are not necessarily
   aligned */
size_t *lo = (size_t *) (((size_t) base + sizeof(size_t) - 1)  
(~(sizeof(size_t) - 1)));
-   size_t *hi = (size_t *) (base + touch), *hi8 = NULL, hi1 = NULL;
+   size_t *hi = (size_t *) (base + touch), *hi8 = NULL, *hi1 = 
NULL;
/* page size: [bytes] - [sizeof(size_t)]
 * to make sure we touch each page,
 * not only 1 in sizeof(size_t) pages */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010

2010-07-15 Thread Stefan Manegold 
Changeset: cfcbc128ac59 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cfcbc128ac59
Modified Files:

Branch: default
Log Message:

merge from Jun2010


diffs (42 lines):

diff -r 2d5ec1088431 -r cfcbc128ac59 testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in   Wed Jul 14 20:26:28 2010 +0200
+++ b/testing/src/Mtest.py.in   Thu Jul 15 09:46:18 2010 +0200
@@ -1650,7 +1650,11 @@
 test = re.compile(^+TST+((_[sp][0-9][0-9])?\..*)?$, re.MULTILINE)
 for f in os.listdir(RELSRCDIR):
 if test.match(f):
-
SymlinkOrCopy(os.path.join(RELSRCDIR,f),os.path.join(TSTTRGDIR,f))
+try:
+
SymlinkOrCopy(os.path.join(RELSRCDIR,f),os.path.join(TSTTRGDIR,f))
+except IOError, (IOerrNo, IOerrStr):
+ErrMsg(SymlinkOrCopy('%s','%s') in '%s' failed with #%d: 
'%s'.
+   % 
(os.path.join(RELSRCDIR,f),os.path.join(TSTTRGDIR,f),os.getcwd(),IOerrNo, 
IOerrStr))
 
 # Check for available sockets and block them until we're ready to run 
the actual test
 MAPIsockets, reason = CheckSocket2(env, MAPI)   #, SrvrErr)
@@ -1666,7 +1670,11 @@
 TSTSRC = expandvars(path(f.readline().strip()), env)
 f.close()
 if os.path.isfile(TSTSRC):
-SymlinkOrCopy(TSTSRC,TST+EXT)
+try:
+SymlinkOrCopy(TSTSRC,TST+EXT)
+except IOError, (IOerrNo, IOerrStr):
+ErrMsg(SymlinkOrCopy('%s','%s') in '%s' failed with #%d: 
'%s'.
+   % (TSTSRC,TST+EXT,os.getcwd(),IOerrNo, IOerrStr))
 else:
 elem = SkipTest(env, TST, EXT+.src, as source file 
'+TSTSRC+` is missing.)
 # Release reserved sockets before bailing out
@@ -1682,7 +1690,11 @@
 TSTSRC = expandvars(path(f.readline().strip()), env)
 f.close()
 if os.path.isfile(TSTSRC):
-SymlinkOrCopy(TSTSRC,ff[:-4])
+try:
+SymlinkOrCopy(TSTSRC,ff[:-4])
+except IOError, (IOerrNo, IOerrStr):
+ErrMsg(SymlinkOrCopy('%s','%s') in '%s' failed with 
#%d: '%s'.
+   % (TSTSRC,ff[:-4],os.getcwd(),IOerrNo, 
IOerrStr))
 else:
 Warn(source file '+TSTSRC+` is missing.)
 test = re.compile(^+TST+(_[sp][0-9][0-9])?\..*\.in$, re.MULTILINE)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010: back-port of mitosis oc...

2010-07-15 Thread Stefan Manegold 
Changeset: 0874779b1d56 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0874779b1d56
Modified Files:
MonetDB5/src/optimizer/opt_mitosis.mx
MonetDB5/src/optimizer/opt_octopus.mx
MonetDB5/src/optimizer/opt_support.mx
Branch: default
Log Message:

merge from Jun2010: back-port of mitosis  octopus fix, hence, no changes


diffs (15 lines):

diff -r ad27ec744389 -r 0874779b1d56 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Jul 15 17:31:56 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Jul 15 19:24:53 2010 +0200
@@ -1,3 +1,11 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Thu Jul 15 2010 Stefan Manegold stefan.maneg...@cwi.nl
+- restored genuine original mitosis logic by disabling
+  incorrect octopus dominance (even when octopus was not
+  enabled); basically a selective back-port of changesets
+  http://dev.monetdb.org/hg/MonetDB/rev/2a358751a4b6
+  http://dev.monetdb.org/hg/MonetDB/rev/692eff15bea0 from the default
+  branch
+
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010: disable mitosis optimizer...

2010-07-12 Thread Stefan Manegold 
Changeset: 5733c6d8219b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5733c6d8219b
Modified Files:
sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql
sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out
Branch: default
Log Message:

merge from Jun2010: disable mitosis optimizer to avoid non-deterministic output


diffs (142 lines):

diff -r 8d21c4ba4845 -r 5733c6d8219b 
sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql
--- a/sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql Mon Jul 12 
17:16:49 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql Mon Jul 12 
19:59:02 2010 +0200
@@ -1,1 +1,2 @@
+set optimizer='no_mitosis_pipe'; -- disable mitosis to avoid non-deterministic 
output
 EXPLAIN SELECT name FROM tables;
diff -r 8d21c4ba4845 -r 5733c6d8219b 
sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out   Mon Jul 
12 17:16:49 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out   Mon Jul 
12 19:59:02 2010 +0200
@@ -34,96 +34,52 @@
 ++
 | mal|
 ++
-| function user.s1_1{autoCommit=true}():void; |
+| function user.s2_1{autoCommit=true}():void; |
 | _2 := sql.mvc(); |
-| barrier _143 := language.dataflow(); |
-| _23:bat[:oid,:sht]  := sql.bind(_2,sys,_tables,type,1); |
-| _24 := algebra.thetauselect(_23,2:sht,); |
-| _25:bat[:oid,:oid]  := sql.bind_dbat(_2,sys,_tables,1); |
-| _27 := bat.reverse(_25); |
-| _97 := algebra.kdifference(_24,_27); |
-| _110 := algebra.markT(_97,5,4); |
-| _117 := bat.reverse(_110); |
-| _30:bat[:oid,:str]  := sql.bind(_2,sys,_tables,name,1); |
-| _142 := algebra.leftjoin(_117,_30); |
-| _64:bat[:oid,:sht]  := 
sql.bind(_2,sys,_tables,type,0,7...@0,nil:oid); |
-| _72 := algebra.thetauselect(_64,2:sht,); |
-| _20:bat[:oid,:sht]  := sql.bind(_2,sys,_tables,type,2); |
-| _76 := algebra.kdifference(_72,_20); |
-| _22 := algebra.thetauselect(_20,2:sht,); |
-| _80 := algebra.semijoin(_22,_64); |
-| _85 := algebra.kunion(_76,_80); |
-| _96 := algebra.kdifference(_85,_27); |
-| _107 := algebra.markT(_96,5,3); |
-| _116 := bat.reverse(_107); |
-| _68:bat[:oid,:str]  := 
sql.bind(_2,sys,_tables,name,0,7...@0,nil:oid); |
-| _29:bat[:oid,:str]  := sql.bind(_2,sys,_tables,name,2); |
-| _122 := algebra.kdifference(_68,_29); |
-| _129 := algebra.semijoin(_29,_68); |
-| _133 := algebra.kunion(_122,_129); |
-| _140 := algebra.leftjoin(_116,_133); |
-| _62:bat[:oid,:sht]  := 
sql.bind(_2,sys,_tables,type,0,5...@0,7...@0); |
-| _71 := algebra.thetauselect(_62,2:sht,); |
-| _75 := algebra.kdifference(_71,_20); |
-| _79 := algebra.semijoin(_22,_62); |
-| _84 := algebra.kunion(_75,_79); |
-| _94 := algebra.kdifference(_84,_27); |
-| _104 := algebra.markT(_94,5,2); |
-| _115 := bat.reverse(_104); |
-| _67:bat[:oid,:str]  := 
sql.bind(_2,sys,_tables,name,0,5...@0,7...@0); |
-| _121 := algebra.kdifference(_67,_29); |
-| _127 := algebra.semijoin(_29,_67); |
-| _132 := algebra.kunion(_121,_127); |
-| _138 := algebra.leftjoin(_115,_132); |
-| _60:bat[:oid,:sht]  := 
sql.bind(_2,sys,_tables,type,0,2...@0,5...@0); |
-| _70 := algebra.thetauselect(_60,2:sht,); |
-| _74 := algebra.kdifference(_70,_20); |
-| _78 := algebra.semijoin(_22,_60); |
-| _83 := algebra.kunion(_74,_78); |
-| _92 := algebra.kdifference(_83,_27); |
-| _101 := algebra.markT(_92,5,1); |
-| _114 := bat.reverse(_101); |
-| _66:bat[:oid,:str]  := 
sql.bind(_2,sys,_tables,name,0,2...@0,5...@0); |
-| _120 := algebra.kdifference(_66,_29); |
-| _125 := algebra.semijoin(_29,_66); |
-| _131 := algebra.kunion(_120,_125); |
-| _136 := algebra.leftjoin(_114,_131); |
-| _58:bat[:oid,:sht]  := 
sql.bind(_2,sys,_tables,type,0,0...@0,2...@0); |
-| _69 := algebra.thetauselect(_58,2:sht,); |
-| _73 := algebra.kdifference(_69,_20); |
-| _77 := algebra.semijoin(_22,_58); |
-| _81 := algebra.kunion(_73,_77); |
-| _90 := algebra.kdifference(_81,_27); |
-| _98 := algebra.markT(_90,5,0); |
-| _113 := bat.reverse(_98); |
-| _65:bat[:oid,:str]  := 
sql.bind(_2,sys,_tables,name,0,0...@0,2...@0); |
-| _118 := algebra.kdifference(_65,_29); |
-| _123 := algebra.semijoin(_29,_65); |
-| _130 := algebra.kunion(_118,_123); |
-| _134 := algebra.leftjoin(_113,_130); |
+| barrier _70 := language.dataflow(); |
+| _19:bat[:oid,:sht]  := sql.bind(_2,sys,_tables,type,0); |
+| _21 := algebra.thetauselect(_19,2:sht,); |
+| _22:bat[:oid,:sht]  := sql.bind(_2,sys,_tables,type,2); |
+| _24 := algebra.kdifference(_21,_22); |
+| _25 := algebra.thetauselect(_22,2:sht,); |
+| _26 := algebra.kunion(_24,_25); |
+| _27:bat[:oid,:sht]  := sql.bind(_2,sys,_tables,type,1); |
+| _28 :=

MonetDB: default - Merge from Jun2010 branch.: Change default be...

2010-07-06 Thread Sjoerd Mullender 
Changeset: 94a4f2d07c5a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94a4f2d07c5a
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.: Change default behavior of Maddlog.

By default, don't commit, but remind people that they have to commit.
Also remind people that the have to push.


diffs (47 lines):

diff -r f2c4b449e6fd -r 94a4f2d07c5a buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog   Tue Jul 06 17:17:40 2010 +0200
+++ b/buildtools/conf/Maddlog   Tue Jul 06 17:36:54 2010 +0200
@@ -28,7 +28,7 @@
exit -1
 fi
 
-nocommit=
+nocommit=true
 while [ $# -gt 0 ]; do
 case $1 in
 --logfile=*)
@@ -44,8 +44,8 @@
CL=${1#-f}
shift
;;
---nocommit)
-   nocommit=true
+--commit)
+   nocommit=
shift
;;
 --)
@@ -57,7 +57,7 @@
$0: unknown option $1
Valid options are:
--logfile=filename (-f filename)
-   --nocommit
+   --commit
EOF
exit 1
;;
@@ -135,7 +135,12 @@
 
 mv $file $CL
 
+hg add $CL  /dev/null
+
 if [ ! $nocommit ]; then
-hg add $CL  /dev/null
-   hg commit -m   $msg $CL
+hg commit -m   $msg $CL
+else
+hg diff $CL
+echo Don't forget to COMMIT.
 fi
+echo Don't forget to PUSH.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: If only one thread...

2010-07-05 Thread Sjoerd Mullender 
Changeset: f35835c337d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f35835c337d4
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:

Merge from Jun2010 branch: If only one thread, don't reorder work.

This should make that the test sql/src/test/copy/Tests/overflow_error.sql 
becomes stable.


diffs (12 lines):

diff -r b76d01a2549b -r f35835c337d4 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 10:45:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 12:29:45 2010 +0200
@@ -377,7 +377,7 @@
if ( task-rounds  8 )
return;
/* simple round robin the first time */
-   if ( task-rounds++ == 0){
+   if ( threads == 1 || task-rounds++ == 0){
for ( i=j=0; i  nr_attrs; i++, j++)
ptask[ j % threads].cols[i] = task-cols[i];
return;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Hardening: check f...

2010-07-05 Thread Sjoerd Mullender 
Changeset: 0db23ac1d990 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0db23ac1d990
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/mal/mal_function.mx
MonetDB5/src/mal/mal_instruction.mx
MonetDB5/src/mal/mal_profiler.mx
Branch: default
Log Message:

Merge from Jun2010 branch: Hardening: check for allocation failures and stuff 
like that.


diffs (91 lines):

diff -r f35835c337d4 -r 0db23ac1d990 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:31:17 2010 +0200
@@ -102,6 +102,8 @@
 @c
BATstore *bs = (BATstore *) GDKzalloc(sizeof(BATstore));
 
+   if (bs == NULL)
+   return NULL;
 @-
 assert needed in the kernel to get symbol eprintf resolved.
 Else modules using assert fail to load.
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_box.mx
--- a/MonetDB5/src/mal/mal_box.mx   Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_box.mx   Mon Jul 05 12:31:17 2010 +0200
@@ -599,12 +599,13 @@
int i;
 
b = BATnew(TYPE_int, TYPE_str, (BUN) MAXSPACES);
+   if (b == NULL)
+   throw(MAL, box.getBoxNames, MAL_MALLOC_FAIL);
for (i = 0; i  topbox; i++)
if (malbox[i] != NULL) {
BUNins(b, i, malbox[i]-name, FALSE);
}
-   BBPincref(*bid = b-batCacheid, TRUE);
-   BBPunfix(*bid);
+   BBPkeepref(*bid = b-batCacheid);
return MAL_SUCCEED;
 }
 
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx  Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx  Mon Jul 05 12:31:17 2010 +0200
@@ -115,7 +115,11 @@
InstrPtr p;
 
s = newSymbol(nme,kind);
+   if (s == NULL)
+   return NULL;
p = newInstruction(NULL,kind);
+   if (p == NULL)
+   return NULL;
setModuleId(p, mod);  
setFunctionId(p, nme);  
setDestVar(p, newVariable(s-def,GDKstrdup(nme),TYPE_any));
@@ -125,6 +129,8 @@
 InstrPtr newCall(Module scope, str fcnname, int kind){
InstrPtr p;
p= newInstruction(NULL,kind);
+   if (p == NULL)
+   return NULL;
setModuleScope(p, scope);
setFunctionId(p, putName(fcnname,strlen(fcnname)));
return p;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx   Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx   Mon Jul 05 12:31:17 2010 +0200
@@ -600,7 +600,7 @@
}
cur = (Symbol) GDKzalloc(sizeof(SymRecord));
if (cur == NULL) {
-   GDKerror(@1:MAL_MALLOC_FAIL);
+   GDKerror(newSymbol:MAL_MALLOC_FAIL);
return NULL;
}
cur-name = putName(nme,strlen(nme));
@@ -990,6 +990,8 @@
}
if (p == NULL) {
p = GDKzalloc(MAXARG * sizeof(p-maxarg) + sizeof(InstrRecord));
+   if (p == NULL)
+   return NULL;
p-maxarg = MAXARG;
}
p-typechk = TYPE_UNKNOWN;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx  Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx  Mon Jul 05 12:31:17 2010 +0200
@@ -1033,10 +1033,10 @@
}
 
b = BATnew(TYPE_void, tt, 1  16);
-   BATseqbase(b, 0);
if (b == NULL)
return NULL;
 
+   BATseqbase(b, 0);
BATkey(b, TRUE);
BBPrename(b-batCacheid, buf);
BATmode(b, PERSISTENT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-23 Thread Sjoerd Mullender 
Changeset: 6471ec4d124f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6471ec4d124f
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (9 lines):

diff -r fd214ada7e0e -r 6471ec4d124f .hgtags
--- a/.hgtags   Tue Jun 22 18:48:02 2010 +0200
+++ b/.hgtags   Wed Jun 23 09:36:20 2010 +0200
@@ -406,3 +406,5 @@
 e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root
 d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root
 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
+659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
+d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-23 Thread Sjoerd Mullender 
Changeset: 0797a45f23a5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0797a45f23a5
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (10 lines):

diff -r b2073a1b0b44 -r 0797a45f23a5 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Wed Jun 23 12:33:52 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Wed Jun 23 13:35:38 2010 +0200
@@ -1,3 +1,6 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org
+- When libxml2 is available, the XML module is automatically loaded.
+
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Extend test format...

2010-06-23 Thread Sjoerd Mullender 
Changeset: f8988a2c5eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8988a2c5eb0
Modified Files:
clients/src/mapiclient/mclient.mx
geom/src/sql/Tests/spatial.stable.out.32bit
Branch: default
Log Message:

Merge from Jun2010 branch: Extend test formatting to geom types.


diffs (truncated from 548 to 300 lines):

diff -r 11d6591fc870 -r f8988a2c5eb0 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jun 23 14:10:24 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jun 23 16:41:33 2010 +0200
@@ -855,6 +855,35 @@
case '':
stream_write(toConsole, \\\, 
1, 2);
break;
+   case '0':
+   case '1':
+   case '2':
+   case '3':
+   case '4':
+   case '5':
+   case '6':
+   case '7':
+   case '8':
+   case '9':
+   if (strcmp(tp, curve) == 0 ||
+   strcmp(tp, geometry) == 0 
||
+   strcmp(tp, linestring) == 
0 ||
+   strcmp(tp, mbr) == 0 ||
+   strcmp(tp, 
multilinestring) == 0 ||
+   strcmp(tp, point) == 0 ||
+   strcmp(tp, polygon) == 0 
||
+   strcmp(tp, surface) == 0) 
{
+   char *e;
+   double d;
+   d = strtod(s, e);
+   if (s != e) {
+   
stream_printf(toConsole, %.10g, d);
+   l -= e - s;
+   s = e;
+   continue;
+   }
+   }
+   /* fall through */
default:
if ((unsigned char) *s  ' ')
stream_printf(toConsole,
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/basic.stable.out
--- a/geom/src/sql/Tests/basic.stable.out   Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/basic.stable.out   Wed Jun 23 16:41:33 2010 +0200
@@ -35,35 +35,35 @@
 % g # name
 % geometry # type
 % 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20. 
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10. 
20., 20. 20., 
20. 15., 10. 
10.))]
-[ POLYGON ((10. 10., 10. 
20., 20. 20., 
20. 15., 10. 
10.), (15. 15., 
15. 20., 10. 
15., 15. 15.))  ]
+[ POINT (10 10)  ]
+[ LINESTRING (10 10, 20 20, 30 40)   ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))  ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 
15))]
 [ NULL ]
 % sys.geoms # table_name
 % g # name
 % geometry # type
 % 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20. 
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10. 
20., 20. 20., 
20. 15., 10. 
10.))]
-[ POLYGON ((10. 10., 10. 
20., 20. 20., 
20. 15., 10. 
10.), (15.

MonetDB: default - Merge from Jun2010 branch.

2010-06-23 Thread Sjoerd Mullender 
Changeset: da87f97d31f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da87f97d31f8
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (23 lines):

diff -r f8988a2c5eb0 -r da87f97d31f8 .hgeol
--- a/.hgeolWed Jun 23 16:41:33 2010 +0200
+++ b/.hgeolWed Jun 23 17:09:51 2010 +0200
@@ -7,6 +7,7 @@
 # various binary files
 **.bmp = BIN
 **.bz2 = BIN
+**.chm = BIN
 **.dll = BIN
 **.gif = BIN
 **.gz  = BIN
@@ -16,11 +17,5 @@
 **.png = BIN
 **.zip = BIN
 
-# Windows specific files
-**.chm = BIN
-**.rtf = CRLF
-**.sln = CRLF
-**.vdproj = CRLF
-
 # all the rest is text
 ** = native
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Create monetdb use...

2010-06-22 Thread Sjoerd Mullender 
Changeset: dd95b836c486 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd95b836c486
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch: Create monetdb user with correct group (monetdb).


diffs (24 lines):

diff -r 6abda8507eb5 -r dd95b836c486 MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst  Mon Jun 21 23:35:48 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst  Tue Jun 22 11:47:40 2010 +0200
@@ -8,7 +8,7 @@
addgroup --system monetdb
fi
 if ! getent passwd monetdb  /dev/null; then
-adduser --system --home /var/lib/monetdb --disabled-password 
--shell /usr/sbin/nologin monetdb
+adduser --system --ingroup monetdb --home /var/lib/monetdb 
--disabled-password --shell /usr/sbin/nologin monetdb
 fi
mkdir -p /var/MonetDB4
chown monetdb:monetdb /var/MonetDB4
diff -r 6abda8507eb5 -r dd95b836c486 MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst  Mon Jun 21 23:35:48 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst  Tue Jun 22 11:47:40 2010 +0200
@@ -8,7 +8,7 @@
addgroup --system monetdb
fi
 if ! getent passwd monetdb  /dev/null; then
-adduser --system --home /var/lib/monetdb --disabled-password 
--shell /usr/sbin/nologin monetdb
+adduser --system --ingroup monetdb --home /var/lib/monetdb 
--disabled-password --shell /usr/sbin/nologin monetdb
 fi
mkdir -p /var/MonetDB5
chown monetdb:monetdb /var/MonetDB5
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Preparations for b...

2010-06-22 Thread Sjoerd Mullender 
Changeset: 24c4d5e6120d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24c4d5e6120d
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:

Merge from Jun2010 branch: Preparations for building the Jun2010 release.


diffs (truncated from 470 to 300 lines):

diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec  Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/MonetDB.spec  Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: http://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
 
 BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,9 @@
 %{_libdir}/libbat.so
 
 %changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618
 - Rebuilt.
 
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/debian/changelog  Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100622) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org  Tue, 22 Jun 2010 14:39:07 +0200
+
 monetdb (1.38.1-20100618) unstable; urgency=low
 
   * Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec  Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec  Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
 
 Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
 %{_libdir}/libembeddedmil.so
 
 %changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618
 - Rebuilt.
 
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100622) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org  Tue, 22 Jun 2010 14:39:07 +0200
+
 monetdb4-server (4.38.1-20100618) unstable; urgency=low
 
   * Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec  Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec  Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
 
 %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -213,6 +213,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100618
 - Rebuilt.
 
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.1-20100622) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org  Tue, 22 Jun 2010 14:39:07 +0200
+
 monetdb5-server (5.20.1-20100618) unstable; urgency=low
 
   * Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec   Tue Jun 22 13:28:29 2010 +0200
+++ b/clients/MonetDB-client.spec   Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source:

MonetDB: default - Merge from Jun2010 branch.

2010-06-17 Thread Sjoerd Mullender 
Changeset: ca5de789af67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca5de789af67
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (229 lines):

diff -r 20f7b1dd3807 -r ca5de789af67 clients/NT/mclient.bat
--- a/clients/NT/mclient.batThu Jun 17 13:05:14 2010 +0200
+++ b/clients/NT/mclient.batThu Jun 17 13:16:38 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
 
-...@rem remove the final backslash from the path
-...@set MONETDB=%MONETDB:~0,-1%
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
 
-...@rem extend the search path with our EXE and DLL folders
-...@rem we depend on pthreadVCE.dll having been copied to the lib folder
-...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
 
-...@rem start the real client
-@%MONETDB%\bin\mclient.exe %*
+if %1==/STARTED-FROM-MENU (
+shift
+if %DOTMONETDBFILE%== if exist %MONETDB%\etc\.monetdb set 
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
 
-...@if ERRORLEVEL 1 pause
+rem start the real client
+%MONETDB%\bin\mclient.exe %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 20f7b1dd3807 -r ca5de789af67 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:16:38 2010 +0200
@@ -4371,7 +4371,7 @@
 
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
 {
 Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
 Description = 8:
 ShowCmd = 3:1
 IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:16:38 2010 +0200
@@ -4339,7 +4339,7 @@
 
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
 {
 Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
 Description = 8:
 ShowCmd = 3:1
 IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67 sql/NT/Makefile
--- a/sql/NT/Makefile   Thu Jun 17 13:05:14 2010 +0200
+++ b/sql/NT/Makefile   Thu Jun 17 13:16:38 2010 +0200
@@ -18,7 +18,7 @@
 IBITS = 64
 !ENDIF
 
-all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix) 
bits=$(bits) all
 
 check: $(SRCDIR)\Makefile.msc RunMtest.bat
@@ -28,6 +28,7 @@
 install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix) 
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\MSQLserver.bat 
$(prefix)
+   $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32 
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/ 
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t;  inttypes.h
$(ECHO) typedef unsigned int uint32_t;  inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb .monetdb
+   $(ECHO) password=monetdb .monetdb
+
 RunMtest.bat: $(SRCDIR)\RunMtest.bat.in
$(CONFIGURE) $(SRCDIR)\RunMtest.bat.in  RunMtest.bat
 
diff -r 20f7b1dd3807 -r ca5de789af67 
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:05:14 
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:16:38 
2010 +0200
@@ -1269,6 +1269,12 @@
 }
 Entry
 {
+MsmKey = 8:_D301CC5DC1BE412A900D7C90166AC804
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
 MsmKey = 8:_D5C7D6567FD6463E846405B973A4AD8A

MonetDB: default - Merge from Jun2010 branch.

2010-06-17 Thread Sjoerd Mullender 
Changeset: 99d16aff6ce6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d16aff6ce6
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (166 lines):

diff -r 4d32d055c1ea -r 99d16aff6ce6 clients/NT/Makefile
--- a/clients/NT/Makefile   Thu Jun 17 13:47:19 2010 +0200
+++ b/clients/NT/Makefile   Thu Jun 17 14:39:08 2010 +0200
@@ -19,7 +19,7 @@
 IBITS = 64
 !ENDIF
 
-all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix) 
bits=$(bits) all
 
 check: $(SRCDIR)\Makefile.msc
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix) 
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\mclient.bat 
$(prefix)
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\msqldump.bat 
$(prefix)
+   $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32 
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/ 
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t;  inttypes.h
$(ECHO) typedef unsigned int uint32_t;  inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb .monetdb
+   $(ECHO) password=monetdb .monetdb
+
 Runmclient.bat: $(SRCDIR)\Runmclient.bat.in
$(CONFIGURE) $(SRCDIR)\Runmclient.bat.in  Runmclient.bat
 
diff -r 4d32d055c1ea -r 99d16aff6ce6 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 14:39:08 2010 +0200
@@ -813,6 +813,12 @@
 }
 Entry
 {
+MsmKey = 8:_E37FEE23A93548469BB7560D5524BD93
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
 MsmKey = 8:_E4A29EC2213B4C99B49B7AC34E99F880
 OwnerKey = 8:_UNDEFINED
 MsmSig = 8:_UNDEFINED
@@ -3654,6 +3660,26 @@
 IsDependency = 11:FALSE
 IsolateTo = 8:
 }
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
 
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880
 {
 SourcePath = 8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll
@@ -4371,7 +4397,7 @@
 
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
 {
 Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --encoding=cp437
+Arguments = 8:/STARTED-FROM-MENU --language=xquery 
--encoding=cp437
 Description = 8:
 ShowCmd = 3:1
 IconIndex = 3:0
diff -r 4d32d055c1ea -r 99d16aff6ce6 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 14:39:08 2010 +0200
@@ -51,6 +51,12 @@
 }
 Entry
 {
+MsmKey = 8:_0EF9137A18874950B2B979E4A3D14364
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
 MsmKey = 8:_0F0962C21371457C8ABE0A563FC8A41A
 OwnerKey = 8:_UNDEFINED
 MsmSig = 8:_UNDEFINED
@@ -1122,6 +1128,26 @@
 IsDependency = 11:FALSE
 IsolateTo = 8:
 }
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+

MonetDB: default - merge from Jun2010

2010-06-15 Thread Stefan Manegold 
Changeset: 42033c61ea66 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42033c61ea66
Modified Files:

sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/src/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
sql/src/test/osm/Tests/drop_constraint_bug.stable.err
Branch: default
Log Message:

merge from Jun2010


diffs (36 lines):

diff -r 04fe188596d5 -r 42033c61ea66 
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
--- 
a/sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err  
Tue Jun 15 12:58:29 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err  
Tue Jun 15 13:48:15 2010 +0200
@@ -71,7 +71,7 @@
 # 22:45:54   mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35519 
 # 22:45:54   
 
-MAPI  = mone...@alf:34381
+MAPI  = mone...@rig:36720
 QUERY = alter table blabla drop constraint dada;
 ERROR = !SQLException:sql.catalog:ALTER TABLE: no such constraint 'dada'
 
diff -r 04fe188596d5 -r 42033c61ea66 
sql/src/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
--- a/sql/src/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
Tue Jun 15 12:58:29 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
Tue Jun 15 13:48:15 2010 +0200
@@ -79,7 +79,7 @@
 # 19:38:47   mclient -lsql -umonetdb -Pmonetdb --host=alf --port=37754 
 # 19:38:47   
 
-MAPI  = mone...@alf:39432
+MAPI  = mone...@rig:37922
 QUERY = exec 0('100');
 ERROR = !SQLException:sql.prepare:wrong type for argument 1 of prepared 
statement: char, expected int
 
diff -r 04fe188596d5 -r 42033c61ea66 
sql/src/test/osm/Tests/drop_constraint_bug.stable.err
--- a/sql/src/test/osm/Tests/drop_constraint_bug.stable.err Tue Jun 15 
12:58:29 2010 +0200
+++ b/sql/src/test/osm/Tests/drop_constraint_bug.stable.err Tue Jun 15 
13:48:15 2010 +0200
@@ -79,7 +79,7 @@
 # 14:06:51   mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35987 
 # 14:06:51   
 
-MAPI  = mone...@alf:33511
+MAPI  = mone...@rig:38981
 QUERY = alter table ways drop constraint ways_id_pkey;
 ERROR = !SQLException:sql.catalog:ALTER TABLE: cannot drop constraint 
'ways_id_pkey': there are database objects which depend on it
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-15 Thread Sjoerd Mullender 
Changeset: 3920853fb751 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3920853fb751
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-15 Thread Sjoerd Mullender 
Changeset: b6ced64542c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6ced64542c1
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (11 lines):

diff -r 3920853fb751 -r b6ced64542c1 pathfinder/NT/Makefile
--- a/pathfinder/NT/MakefileTue Jun 15 15:31:38 2010 +0200
+++ b/pathfinder/NT/MakefileTue Jun 15 16:19:33 2010 +0200
@@ -44,6 +44,7 @@
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\pf.bat $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
+   -if $(bits)==32 if exist C:\Program Files (x86) C:\cygwin\bin\sed.exe 
-i s/Program Files/Program Files (x86)/ 
$(prefix)\$(INSTALLER)$(IBITS).vdproj
-devenv $(prefix)\$(INSTALLER)$(IBITS).sln /build
if exist $(prefix)\$(INSTALLER)$(IBITS).msi del /f 
$(prefix)\$(INSTALLER)$(IBITS).msi
if exist $(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(INSTALL) /Y 
$(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(prefix)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-14 Thread Sjoerd Mullender 
Changeset: c82ff214897c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c82ff214897c
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Ignore backup files.

2010-06-02 Thread Sjoerd Mullender 
Changeset: f0c052d55106 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0c052d55106
Modified Files:
.hgignore
Branch: default
Log Message:

Merge from Jun2010 branch: Ignore backup files.


diffs (11 lines):

diff -r 42775467d209 -r f0c052d55106 .hgignore
--- a/.hgignore Wed Jun 02 11:52:46 2010 +0200
+++ b/.hgignore Wed Jun 02 12:52:11 2010 +0200
@@ -1,6 +1,7 @@
 /\#
 /\.\#
 /@
+~$
 MANIFEST$
 Makefile\.in$
 MonetDB4/NT/MonetDB\.pc$
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010: fixed ref-counting for BA...

2010-06-01 Thread Stefan Manegold 
Changeset: ffac5d51ac0f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffac5d51ac0f
Modified Files:

Branch: default
Log Message:

merge from Jun2010: fixed ref-counting for BAT-of-BATs result created by 
TABLETcollect_bats


diffs (25 lines):

diff -r 7f8845f6d39f -r ffac5d51ac0f MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mxMon May 31 22:46:25 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet.mxTue Jun 01 08:21:49 2010 +0200
@@ -2180,8 +2180,9 @@
tablet_load(bn, names, seps, types, *filename, nr);
if (bn == NULL)
throw(MAL, tablet.load, MAL_MALLOC_FAIL);
+   *ret = bn-batCacheid;
BBPincref(*ret, TRUE);
-   *ret = bn-batCacheid;
+   BBPunfix(*ret);
BBPunfix(names-batCacheid);
BBPunfix(seps-batCacheid);
BBPunfix(types-batCacheid);
@@ -2258,8 +2259,9 @@
BBPunfix(types-batCacheid);
throw(MAL, tablet.load, OPERATION_FAILED);
}
+   *ret = bn-batCacheid;
BBPincref(*ret, TRUE);
-   *ret = bn-batCacheid;
+   BBPunfix(*ret);
BBPunfix(names-batCacheid);
BBPunfix(seps-batCacheid);
BBPunfix(types-batCacheid);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch: Fix reference in a...

2010-06-01 Thread Sjoerd Mullender 
Changeset: 7d70539ee951 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d70539ee951
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch: Fix reference in array module.


diffs (12 lines):

diff -r d3570bb29148 -r 7d70539ee951 MonetDB5/src/modules/kernel/array.mx
--- a/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 14:23:49 2010 +0200
+++ b/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 16:37:36 2010 +0200
@@ -46,7 +46,7 @@
 comment  Fills an index BAT, (grpcount,grpsize,clustersize,offset);
 
 command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] 
-address arraygridb...@1
+address arraygridbatshi...@1
 comment  Fills an index BAT, (grpcount,grpsize,clustersize,offset)
 and shift all elemenets with a factor s;
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010.

2010-05-20 Thread Sjoerd Mullender 
Changeset: d77b51f6d695 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d77b51f6d695
Modified Files:
sql/src/backends/monet5/sql.mx
sql/src/server/rel_optimizer.mx
sql/src/server/rel_schema.mx
Branch: default
Log Message:

Merge from Jun2010.

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010:

2010-05-14 Thread Stefan Manegold 
Changeset: ff4f8c3a851c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff4f8c3a851c
Modified Files:

Branch: default
Log Message:

merge from Jun2010:

 changeset:   35941:9afc509d5113
 branch:  Jun2010
 tag: tip
 parent:  35939:42f38daad16d
 user:Stefan Manegold stefan.maneg...@cwi.nl
 date:Fri May 14 12:29:58 2010 +0200
 files:   buildtools/conf/winrules.msc
 description:
 (hopefully) fixing Windows compilation, again:

 propagated below changes in rules.mk also to winrules.msc
 
  changeset:   35843:3a4e3457
  user:Niels Nes niels@cwi.nl
  date:Fri May 07 17:27:58 2010 +0200
  files:   buildtools/conf/rules.mk
  description:
  need rule for mx-sql
 



diffs (16 lines):

diff -r 8745f56e048f -r ff4f8c3a851c buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc  Fri May 14 12:15:29 2010 +0200
+++ b/buildtools/conf/winrules.msc  Fri May 14 12:31:30 2010 +0200
@@ -490,6 +490,12 @@
if not exist .libs $(MKDIR) .libs
$(INSTALL) $@ .libs\$@
 
+{$(SRCDIR)}.mx.sql:
+   $(MX) $(MXFLAGS) -x sql $
+
+.mx.sql:
+   $(MX) $(MXFLAGS) -x sql $
+
 {$(SRCDIR)}.mx.y:
$(MX) $(MXFLAGS) -x y $
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge from Jun2010: remove explicit include ...

2010-05-08 Thread Stefan Manegold 
Changeset: dd777c76a3f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd777c76a3f9
Modified Files:
geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5
geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5
geom/BugTracker/Tests/geom.dbinit5
geom/src/sql/Tests/basic.dbinit5
geom/src/sql/Tests/example.dbinit5
geom/src/sql/Tests/geom.dbinit5
geom/src/sql/Tests/geom_curve.dbinit5
geom/src/sql/Tests/geom_geometry.dbinit5
geom/src/sql/Tests/geom_linestring.dbinit5
geom/src/sql/Tests/geom_mbr.dbinit5
geom/src/sql/Tests/geom_multi.dbinit5
geom/src/sql/Tests/geom_point.dbinit5
geom/src/sql/Tests/geom_polygon.dbinit5
geom/src/sql/Tests/geom_surface.dbinit5
geom/src/sql/Tests/relation.dbinit5
geom/src/sql/Tests/spatial.dbinit5
Branch: default
Log Message:

merge from Jun2010: remove explicit include geom as this is now automatic


diffs (98 lines):

diff -r 9aa607a857f8 -r dd777c76a3f9 
geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5  Fri May 07 21:10:33 
2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 
geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5  Fri May 07 
21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/BugTracker/Tests/geom.dbinit5
--- a/geom/BugTracker/Tests/geom.dbinit5Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/basic.dbinit5
--- a/geom/src/sql/Tests/basic.dbinit5  Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/example.dbinit5
--- a/geom/src/sql/Tests/example.dbinit5Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom.dbinit5
--- a/geom/src/sql/Tests/geom.dbinit5   Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_curve.dbinit5
--- a/geom/src/sql/Tests/geom_curve.dbinit5 Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_geometry.dbinit5
--- a/geom/src/sql/Tests/geom_geometry.dbinit5  Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_linestring.dbinit5
--- a/geom/src/sql/Tests/geom_linestring.dbinit5Fri May 07 21:10:33 
2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_mbr.dbinit5
--- a/geom/src/sql/Tests/geom_mbr.dbinit5   Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_multi.dbinit5
--- a/geom/src/sql/Tests/geom_multi.dbinit5 Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_point.dbinit5
--- a/geom/src/sql/Tests/geom_point.dbinit5 Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_polygon.dbinit5
--- a/geom/src/sql/Tests/geom_polygon.dbinit5   Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_surface.dbinit5
--- a/geom/src/sql/Tests/geom_surface.dbinit5   Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/relation.dbinit5
--- a/geom/src/sql/Tests/relation.dbinit5   Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/spatial.dbinit5
--- a/geom/src/sql/Tests/spatial.dbinit5Fri May 07 21:10:33 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-include geom;
diff -r 9aa607a857f8 -r dd777c76a3f9 testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in   Fri May 07 21:10:33 2010 +0200
+++ b/testing/src/Mtest.py.in   Sat May 08 09:16:12 2010 +0200
@@ -3729,12 +3729,10 @@
 if MissingMods: