Changeset: 23463c13d268 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23463c13d268
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/tests/gdkTests/Tests/casts.stable.out
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
Branch: default
Log Message:
Approvals.
diffs (truncated from 309 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -46,17 +46,14 @@ end user.main;
[ "delete", "command", "bat", "(sz:wrd):bat[:oid,:oid] ",
"BKCdensebat;" ]
[ "delete", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
[ "delete", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCdelete_all;" ]
-[ "delete", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
-[ "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCdelete_bun;" ]
+[ "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
[ "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetBBPname;" ]
-[ "getAlpha", "command", "bat", "(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
-[ "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;" ]
-[ "getColumnType", "command", "bat", "(bid:bat[:oid,:any_1]):str ",
"BKCgetRole;" ]
-[ "getDelta", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetColumnType;" ]
-[ "getName", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetCapacity;" ]
-[ "getRole", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetSize;" ]
-[ "getSequenceBase", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCgetDelta;" ]
-[ "getSize", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCgetAlpha;" ]
+[ "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
+[ "getColumnType", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;" ]
+[ "getName", "command", "bat", "(bid:bat[:oid,:any_1]):str ",
"BKCgetRole;" ]
+[ "getRole", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetColumnType;" ]
+[ "getSequenceBase", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetCapacity;" ]
+[ "getSize", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetSize;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng ",
"CMDBATimprintsize;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:flt]):lng ",
"CMDBATimprintsize;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:lng]):lng ",
"CMDBATimprintsize;" ]
@@ -70,20 +67,13 @@ end user.main;
[ "imprintsize", "command", "bat", "(b:bat[:oid,:sht]):void ",
"CMDBATimprints;" ]
[ "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):void ",
"CMDBATimprints;" ]
[ "info", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ]
-[ "inplace", "command", "bat",
"(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ]
-[ "inplace", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisPersistent;" ]
-[ "inplace", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisTransient;" ]
-[ "inplace", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSortedReverse;" ]
-[ "insert", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSorted;" ]
-[ "insert", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCgetKey;" ]
-[ "intersectcand", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
-[ "isPersistent", "command", "bat",
"(o:bat[:oid,:any_1],d:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ",
"BKCbat_inplace_force;" ]
-[ "isSorted", "command", "bat",
"(o:bat[:oid,:any_1],id:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
-[ "isSortedReverse", "command", "bat",
"(o:bat[:oid,:any_1],d:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCbat_inplace;" ]
-[ "isSynced", "command", "bat",
"(o:bat[:oid,:any_1],id:oid,t:any_1):bat[:oid,:any_1] ",
"BKCbun_inplace;" ]
-[ "isTransient", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ",
"BKCinsert_bat_force;" ]
-[ "isaKey", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCinsert_bat;" ]
-[ "load", "command", "bat", "(name:str):bat[:oid,:any_1] ",
"BKCload;" ]
+[ "intersectcand", "command", "bat",
"(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ]
+[ "isPersistent", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisPersistent;" ]
+[ "isSorted", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisTransient;" ]
+[ "isSortedReverse", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSortedReverse;" ]
+[ "isSynced", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSorted;" ]
+[ "isTransient", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCgetKey;" ]
+[ "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
[ "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
[ "mirror", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ]
[ "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
@@ -107,24 +97,17 @@ end user.main;
[ "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
[ "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ]
[ "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1] ",
"CMDBATsingle;" ]
-[ "save", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCshrinkBATmap;" ]
-[ "setAccess", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ", "BKCshrinkBAT;"
]
-[ "setCold", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
-[ "setColumn", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetHash;" ]
-[ "setColumn", "command", "bat", "(b:bat[:oid,:any_1],mode:int):bit ",
"BKCmmap2;" ]
-[ "setHash", "command", "bat",
"(b:bat[:oid,:any_1],head_mode:int,tail_mode:int,hheap_mode:int,theap_mode:int):bit
", "BKCmmap;" ]
-[ "setHot", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetHotBAT;" ]
-[ "setImprints", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetColdBAT;" ]
-[ "setKey", "command", "bat", "(nme:str):bit ", "BKCsave;" ]
-[ "setMemoryMap", "command", "bat", "(nme:bat[:oid,:any_1]):void ",
"BKCsave2;" ]
-[ "setMemoryMap", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetPersistent;" ]
-[ "setName", "command", "bat", "(b:bat[:oid,:any_1],f:bit):void ",
"BKCpersists;" ]
-[ "setPersistent", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetTransient;" ]
-[ "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ "setRole", "command", "bat", "(b:bat[:oid,:any_1],t:str):void ",
"BKCsetColumn;" ]
-[ "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ "shrink", "command", "bat", "(b:bat[:oid,:any_1],s:str):void ",
"BKCsetName;" ]
-[ "shrinkMap", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
+[ "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
+[ "setAccess", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetHash;" ]
+[ "setColumn", "command", "bat", "(nme:str):bit ", "BKCsave;" ]
+[ "setColumn", "command", "bat", "(nme:bat[:oid,:any_1]):void ",
"BKCsave2;" ]
+[ "setHash", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetPersistent;" ]
+[ "setImprints", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetTransient;" ]
+[ "setKey", "command", "bat", "(b:bat[:oid,:any_1],h:str,t:str):void
", "BKCsetColumns;" ]
+[ "setName", "command", "bat", "(b:bat[:oid,:any_1],t:str):void ",
"BKCsetColumn;" ]
+[ "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
+[ "setRole", "command", "bat", "(b:bat[:oid,:any_1],s:str):void ",
"BKCsetName;" ]
+[ "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
[ "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -69,7 +69,7 @@ exit MALException:str;
remote.disconnect(conn);
end user.main;
[ "Received first error from the remote site" ]
-!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_monetdb5_modules_mal)
rmt0_X_8_void := io.print.bla();
+!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_monetdb5_modules_mal)
rmt0_X_8_void := io.print.bla();
SyntaxException:parseError: ^'(' expected
[ "rmt1_bn_bat_oid_str" ]
@@ -110,7 +110,7 @@ SyntaxException:parseError:
[ 29@0, "pcre" ]
[ 30@0, "mbr" ]
[ 31@0, "wkb" ]
-[ "rmt2__8_void" ]
+[ "rmt2_X_8_void" ]
[ nil ]
# 22:17:31 >
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out
b/monetdb5/tests/gdkTests/Tests/casts.stable.out
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out
@@ -1901,75 +1901,75 @@ exit SQLException:str;
o9 := -2147483647;
o := calc.oid(o9);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# o3:= 2147483647 +1; o:= calc.oid(o3); io.print(o);\n");
o3 := calc.+(2147483647,1);
o := calc.oid(o3);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# o4:= -2147483647 -1; o:= calc.oid(o4); io.print(o);\n");
o4 := calc.-(-2147483647,1);
o := calc.oid(o4);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# should this produce nil (overflow)?\n");
io.printf("# o5:= 2147483647 +2; o:=calc.oid(o5); io.print(o);\n");
o5 := calc.+(2147483647,2);
o := calc.oid(o5);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# should this produce nil (overflow)?\n");
io.printf("# o6:= -2147483647 -2; o:=calc.oid(o6); io.print(o);\n");
o6 := calc.-(-2147483647,2);
o := calc.oid(o6);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# oid from lng\n");
io.printf("# io.print(1LL:oid);\n");
io.print(1@0:oid);
io.printf("# io.print(2147483647LL:oid);\n");
io.print(2147483647@0:oid);
io.printf("# ol3:= 2147483647LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483647:lng;
+ ol3 := 2147483647;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(2147483648LL:oid);\n");
io.print(nil:oid);
io.printf("# ol3:= 2147483648LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483648:lng;
+ ol3 := 2147483648;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(2147483649LL:oid);\n");
io.print(nil:oid);
io.printf("# ol3:= 2147483649LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483649:lng;
+ ol3 := 2147483649;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(-2147483647LL:oid);\n");
io.print(nil:oid);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# io.print(-2147483648LL:oid);\n");
io.print(nil:oid);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# io.print(-2147483649LL:oid);\n");
io.print(nil:oid);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# oid from flt\n");
io.printf("# io.print(0.0:oid);\n");
io.print(0@0:oid);
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
@@ -1901,75 +1901,75 @@ exit SQLException:str;
o9 := -2147483647;
o := calc.oid(o9);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# o3:= 2147483647 +1; o:= calc.oid(o3); io.print(o);\n");
o3 := calc.+(2147483647,1);
o := calc.oid(o3);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# o4:= -2147483647 -1; o:= calc.oid(o4); io.print(o);\n");
o4 := calc.-(-2147483647,1);
o := calc.oid(o4);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# should this produce nil (overflow)?\n");
io.printf("# o5:= 2147483647 +2; o:=calc.oid(o5); io.print(o);\n");
o5 := calc.+(2147483647,2);
o := calc.oid(o5);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# should this produce nil (overflow)?\n");
io.printf("# o6:= -2147483647 -2; o:=calc.oid(o6); io.print(o);\n");
o6 := calc.-(-2147483647,2);
o := calc.oid(o6);
io.print(o);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# oid from lng\n");
io.printf("# io.print(1LL:oid);\n");
io.print(1@0:oid);
io.printf("# io.print(2147483647LL:oid);\n");
io.print(2147483647@0:oid);
io.printf("# ol3:= 2147483647LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483647:lng;
+ ol3 := 2147483647;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(2147483648LL:oid);\n");
io.print(nil:oid);
io.printf("# ol3:= 2147483648LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483648:lng;
+ ol3 := 2147483648;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(2147483649LL:oid);\n");
io.print(nil:oid);
io.printf("# ol3:= 2147483649LL; o:= calc.oid(ol3); io.print(o);\n");
- ol3 := 2147483649:lng;
+ ol3 := 2147483649;
o := calc.oid(ol3);
io.print(o);
io.printf("# io.print(-2147483647LL:oid);\n");
io.print(nil:oid);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# io.print(-2147483648LL:oid);\n");
io.print(nil:oid);
-catch MALException:str ;
+catch MALException:str;
io.printf("Caught exception\n");
-exit MALException:str ;
+exit MALException:str;
io.printf("# io.print(-2147483649LL:oid);\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
