MonetDB: profiler - merge with default

[Martin Kersten]

Changeset: f9bdad97574f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9bdad97574f
Modified Files:
        monetdb5/mal/Tests/tst025.mal
        monetdb5/mal/Tests/tst025.stable.out
        monetdb5/modules/mal/mal_io.mal
        
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
Branch: profiler
Log Message:

merge with default


diffs (85 lines):

diff --git a/monetdb5/mal/Tests/tst025.mal b/monetdb5/mal/Tests/tst025.mal
--- a/monetdb5/mal/Tests/tst025.mal
+++ b/monetdb5/mal/Tests/tst025.mal
@@ -6,10 +6,9 @@ bat.append(b, 5442033);
 bat.append(b, 5645862);
 io.print(b);
 
-# it left one behind
-bat.delete(b,b);
+bat.delete(b,1@0);
 io.print(b);
 
-bat.delete(b,b);
+bat.delete(b);
 io.print(b);
 
diff --git a/monetdb5/mal/Tests/tst025.stable.out 
b/monetdb5/mal/Tests/tst025.stable.out
--- a/monetdb5/mal/Tests/tst025.stable.out
+++ b/monetdb5/mal/Tests/tst025.stable.out
@@ -33,10 +33,9 @@ function user.main():void;
     bat.append(b,5442033);
     bat.append(b,5645862);
     io.print(b);
-# it left one behind 
-    bat.delete(b,b);
+    bat.delete(b,1@0);
     io.print(b);
-    bat.delete(b,b);
+    bat.delete(b);
     io.print(b);
 end user.main;
 #--------------------------#
@@ -46,14 +45,16 @@ end user.main;
 [ 0@0,   5140046         ]
 [ 1@0,   5442033         ]
 [ 2@0,   5645862         ]
-#-----------------#
-# h    t         # name
-# int  int       # type
-#-----------------#
-#-----------------#
-# h    t         # name
-# int  int       # type
-#-----------------#
+#--------------------------#
+# t    t  # name
+# void int  # type
+#--------------------------#
+[ 0@0, 5140046  ]
+[ 1@0, 5645862  ]
+#--------------------------#
+# t    t  # name
+# void int  # type
+#--------------------------#
 
 # 15:29:54 >  
 # 15:29:54 >  Done.
diff --git a/monetdb5/modules/mal/mal_io.mal b/monetdb5/modules/mal/mal_io.mal
--- a/monetdb5/modules/mal/mal_io.mal
+++ b/monetdb5/modules/mal/mal_io.mal
@@ -27,11 +27,11 @@ comment "BATs are printed with '#' for l
        comma separated values (head and tail). 
        If multiple BATs are passed for printing, 
        print() performs an implicit natural 
-       join, producing a multi attribute table.";
+       join on the void head, producing a multi attribute table.";
 
 pattern print(val:any_1):void 
 address IOprint_val
-comment "Print a MAL value tuple .";
+comment "Print a MAL value.";
 pattern print(val:bat[:oid,:any_1]):void 
 address IOprint_val
 comment "Print a MAL value column .";
diff --git 
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
 
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
--- 
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
+++ 
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
@@ -32,6 +32,7 @@ end user.main;
 #-------------------------#
 [ 0@0,   2,      4       ]
 [ 1@0,   3,      9       ]
+!GDKerror:!ERROR: Columns must be the same size
 
 
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list