Changeset: 9adc234ab5c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9adc234ab5c8
Modified Files:
monetdb5/mal/Tests/tst275.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/Tests/remote12.stable.out
monetdb5/modules/mal/Tests/tokenizer00.stable.out
Branch: profiler
Log Message:
Approve output
diffs (147 lines):
diff --git a/monetdb5/mal/Tests/tst275.stable.out
b/monetdb5/mal/Tests/tst275.stable.out
--- a/monetdb5/mal/Tests/tst275.stable.out
+++ b/monetdb5/mal/Tests/tst275.stable.out
@@ -55,8 +55,8 @@ end user.main;
# t t t # name
# void str str # type
#--------------------------#
-[ 0@0, "batId", "tmp_541" ]
-[ 1@0, "batCacheid", "353" ]
+[ 0@0, "batId", "tmp_434" ]
+[ 1@0, "batCacheid", "284" ]
[ 2@0, "hparentid", "0" ]
[ 3@0, "tparentid", "0" ]
[ 4@0, "batSharecnt", "0" ]
@@ -104,9 +104,9 @@ end user.main;
[ 46@0, "batFirst", "0" ]
[ 47@0, "htop", "0" ]
[ 48@0, "ttop", "0" ]
-[ 49@0, "batStamp", "165" ]
-[ 50@0, "lastUsed", "1130" ]
-[ 51@0, "curStamp", "167" ]
+[ 49@0, "batStamp", "443" ]
+[ 50@0, "lastUsed", "44218" ]
+[ 51@0, "curStamp", "445" ]
[ 52@0, "batCopiedtodisk", "0" ]
[ 53@0, "batDirtydesc", "dirty" ]
[ 54@0, "H->heap.dirty", "clean" ]
@@ -120,7 +120,7 @@ end user.main;
[ 62@0, "tail.size", "1024" ]
[ 63@0, "tail.storage", "malloced" ]
[ 64@0, "tail.newstorage", "malloced" ]
-[ 65@0, "tail.filename", "05/541.tail" ]
+[ 65@0, "tail.filename", "04/434.tail" ]
[ 66@0, "H->vheap->dirty", "clean" ]
[ 67@0, "T->vheap->dirty", "clean" ]
#~EndVariableOutput~#
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -44,9 +44,9 @@ end user.main;
[ 3@0, "append", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ",
"BKCappend_force_wrap;" ]
[ 4@0, "attach", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCappend_wrap;" ]
[ 5@0, "delete", "command", "bat", "(sz:wrd):bat[:oid,:oid] ",
"BKCdensebat;" ]
-[ 6@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
-[ 7@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_all;" ]
-[ 8@0, "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
+[ 6@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_all;" ]
+[ 7@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
+[ 8@0, "densebat", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
[ 9@0, "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetBBPname;" ]
[ 10@0, "getCapacity", "command", "bat",
"(b:bat[:oid,:any_1]):oid ", "BKCgetSequenceBase;" ]
[ 11@0, "getColumnType", "command", "bat",
"(b:bat[:oid,:any_1]):str ", "BKCgetAccess;" ]
@@ -77,7 +77,7 @@ end user.main;
[ 36@0, "isTransient", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCgetKey;" ]
[ 37@0, "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
[ 38@0, "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
-[ 39@0, "mirror", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ]
+[ 39@0, "mirror", "command", "bat",
"(b:bat[:oid,:any_2]):bat[:oid,:oid] ", "BKCmirror;" ]
[ 40@0, "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
[ 41@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
[ 42@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
@@ -95,20 +95,19 @@ end user.main;
[ 54@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCbat_inplace;" ]
[ 55@0, "reuse", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
[ 56@0, "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
-[ 57@0, "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ]
-[ 58@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
-[ 59@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
-[ 60@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
-[ 61@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 62@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
-[ 63@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
-[ 64@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
-[ 65@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ 66@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
-[ 67@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ 68@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
-[ 69@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
-[ 70@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
+[ 57@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
+[ 58@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
+[ 59@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
+[ 60@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
+[ 61@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
+[ 62@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
+[ 63@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
+[ 64@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
+[ 65@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 66@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
+[ 67@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
+[ 68@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
+[ 69@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out
b/monetdb5/modules/mal/Tests/remote12.stable.out
--- a/monetdb5/modules/mal/Tests/remote12.stable.out
+++ b/monetdb5/modules/mal/Tests/remote12.stable.out
@@ -27,6 +27,7 @@ function user.main():void;
io.print(v);
mdb.var();
end user.main;
+!MALException:remote.put:Object not found
diff --git a/monetdb5/modules/mal/Tests/tokenizer00.stable.out
b/monetdb5/modules/mal/Tests/tokenizer00.stable.out
--- a/monetdb5/modules/mal/Tests/tokenizer00.stable.out
+++ b/monetdb5/modules/mal/Tests/tokenizer00.stable.out
@@ -73,7 +73,7 @@ end user.main;
# oid str # type
#-------------------------#
[ 0@0, "http:" ]
-[ 0@0, "ftp:" ]
+[ 1@0, "ftp:" ]
#--------------------------#
# t t # name
# void str # type
@@ -85,20 +85,20 @@ end user.main;
# oid str # type
#---------------------------------#
[ 0@0, "www.cwi.nl" ]
-[ 0@0, "www.ics.forth.gr" ]
-[ 0@0, "www.cook.gr" ]
-[ 0@0, "www.nocook.nl" ]
-[ 1@0, "thepiratebay.org" ]
+[ 1@0, "www.ics.forth.gr" ]
+[ 2@0, "www.cook.gr" ]
+[ 3@0, "www.nocook.nl" ]
+[ 4@0, "thepiratebay.org" ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
[ 0@0, "~lsidir" ]
-[ 0@0, "~mk" ]
-[ 1@0, "~lsidir" ]
+[ 1@0, "~mk" ]
[ 2@0, "~lsidir" ]
-[ 2@0, "~mk" ]
-[ 3@0, "~mk" ]
+[ 3@0, "~lsidir" ]
+[ 4@0, "~mk" ]
+[ 5@0, "~mk" ]
#--------------------------#
# t t # name
# void wrd # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
