Changeset: 657e04cdaf74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=657e04cdaf74
Modified Files:
monetdb5/mal/Tests/tst270.mal
monetdb5/mal/Tests/tst270.stable.out
monetdb5/mal/Tests/tst870.mal
monetdb5/mal/Tests/tst870.stable.out
monetdb5/modules/kernel/bat5.mx
Branch: default
Log Message:
Split the info BAT into two :oid,:str BATs
diffs (truncated from 814 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst270.mal b/monetdb5/mal/Tests/tst270.mal
--- a/monetdb5/mal/Tests/tst270.mal
+++ b/monetdb5/mal/Tests/tst270.mal
@@ -16,8 +16,8 @@ calc.setoid(o);
b:= bat.new(:oid,:int);
io.printf("#~BeginVariableOutput~#\n");
-binfo:= bat.info(b);
-io.print(binfo);
+(bk,bv):= bat.info(b);
+io.print(bk,bv);
io.printf("#~EndVariableOutput~#\n");
profiler.start();
diff --git a/monetdb5/mal/Tests/tst270.stable.out
b/monetdb5/mal/Tests/tst270.stable.out
--- a/monetdb5/mal/Tests/tst270.stable.out
+++ b/monetdb5/mal/Tests/tst270.stable.out
@@ -69,8 +69,8 @@ function user.main():void;
#it includes insertions,deletions,selections, and joins.
b := bat.new(:oid,:int);
io.printf("#~BeginVariableOutput~#\n");
- binfo := bat.info(b);
- io.print(binfo);
+ (bk,bv) := bat.info(b);
+ io.print(bk,bv);
io.printf("#~EndVariableOutput~#\n");
profiler.start();
err := bat.append(b,15);
@@ -93,80 +93,79 @@ function user.main():void;
end main;
#~BeginVariableOutput~#
#-------------------------------------------------#
-# h tmp_5 # name
-# str str # type
-#-----------------------------------------#
-[ "batId", "tmp_665" ]
-[ "batCacheid", "437" ]
-[ "hparentid", "0" ]
-[ "tparentid", "0" ]
-[ "batSharecnt", "0" ]
-[ "batCount", "0" ]
-[ "batCapacity", "256" ]
-[ "head", "void" ]
-[ "tail", "int" ]
-[ "batPersistence", "transient" ]
-[ "batRestricted", "updatable" ]
-[ "batRefcnt", "1" ]
-[ "batLRefcnt", "1" ]
-[ "batDirty", "dirty" ]
-[ "batSet", "0" ]
-[ "hsorted", "1" ]
-[ "hrevsorted", "1" ]
-[ "hident", "h" ]
-[ "hdense", "1" ]
-[ "hseqbase", "0@0" ]
-[ "hkey", "1" ]
-[ "hvarsized", "1" ]
-[ "halign", "0" ]
-[ "hnosorted", "0" ]
-[ "hnorevsorted", "0" ]
-[ "hnodense", "0" ]
-[ "hnokey[0]", "0" ]
-[ "hnokey[1]", "0" ]
-[ "hnonil", "1" ]
-[ "hnil", "0" ]
-[ "tident", "t" ]
-[ "tdense", "0" ]
-[ "tseqbase", "0@0" ]
-[ "tsorted", "1" ]
-[ "trevsorted", "1" ]
-[ "tkey", "1" ]
-[ "tvarsized", "0" ]
-[ "talign", "20000001" ]
-[ "tnosorted", "0" ]
-[ "tnorevsorted", "0" ]
-[ "tnodense", "0" ]
-[ "tnokey[0]", "0" ]
-[ "tnokey[1]", "0" ]
-[ "tnonil", "1" ]
-[ "tnil", "0" ]
-[ "batInserted", "0" ]
-[ "batDeleted", "0" ]
-[ "batFirst", "0" ]
-[ "htop", "0" ]
-[ "ttop", "0" ]
-[ "batStamp", "225" ]
-[ "lastUsed", "21415" ]
-[ "curStamp", "226" ]
-[ "batCopiedtodisk", "0" ]
-[ "batDirtydesc", "dirty" ]
-[ "H->heap.dirty", "clean" ]
-[ "T->heap.dirty", "clean" ]
-[ "head.free", "0" ]
-[ "head.size", "0" ]
-[ "head.maxsize", "0" ]
-[ "head.storage", "absent" ]
-[ "head.newstorage", "malloced" ]
-[ "head.filename", "no file" ]
-[ "tail.free", "0" ]
-[ "tail.size", "1024" ]
-[ "tail.maxsize", "1024" ]
-[ "tail.storage", "malloced" ]
-[ "tail.newstorage", "malloced" ]
-[ "tail.filename", "06/665.tail" ]
-[ "H->vheap->dirty", "clean" ]
-[ "T->vheap->dirty", "clean" ]
+# h t t # name
+# oid str str # type
+#-------------------------------------------------#
+[ 0@0, "tmp_670", "batId" ]
+[ 1@0, "440", "batCacheid" ]
+[ 2@0, "0", "hparentid" ]
+[ 3@0, "0", "tparentid" ]
+[ 4@0, "0", "batSharecnt" ]
+[ 5@0, "256", "batCount" ]
+[ 6@0, "void", "batCapacity" ]
+[ 7@0, "int", "head" ]
+[ 8@0, "transient", "tail" ]
+[ 9@0, "updatable", "batPersistence" ]
+[ 10@0, "1", "batRestricted" ]
+[ 11@0, "1", "batRefcnt" ]
+[ 12@0, "dirty", "batLRefcnt" ]
+[ 13@0, "0", "batDirty" ]
+[ 14@0, "1", "batSet" ]
+[ 15@0, "1", "hsorted" ]
+[ 16@0, "h", "hrevsorted" ]
+[ 17@0, "1", "hident" ]
+[ 18@0, "0@0", "hdense" ]
+[ 19@0, "1", "hseqbase" ]
+[ 20@0, "1", "hkey" ]
+[ 21@0, "0", "hvarsized" ]
+[ 22@0, "0", "halign" ]
+[ 23@0, "0", "hnosorted" ]
+[ 24@0, "0", "hnorevsorted" ]
+[ 25@0, "0", "hnodense" ]
+[ 26@0, "0", "hnokey[0]" ]
+[ 27@0, "1", "hnokey[1]" ]
+[ 28@0, "0", "hnonil" ]
+[ 29@0, "t", "hnil" ]
+[ 30@0, "0", "tident" ]
+[ 31@0, "0@0", "tdense" ]
+[ 32@0, "1", "tseqbase" ]
+[ 33@0, "1", "tsorted" ]
+[ 34@0, "1", "trevsorted" ]
+[ 35@0, "0", "tkey" ]
+[ 36@0, "20000001", "tvarsized" ]
+[ 37@0, "0", "talign" ]
+[ 38@0, "0", "tnosorted" ]
+[ 39@0, "0", "tnorevsorted" ]
+[ 40@0, "0", "tnodense" ]
+[ 41@0, "0", "tnokey[0]" ]
+[ 42@0, "1", "tnokey[1]" ]
+[ 43@0, "0", "tnonil" ]
+[ 44@0, "0", "tnil" ]
+[ 45@0, "0", "batInserted" ]
+[ 46@0, "0", "batDeleted" ]
+[ 47@0, "0", "batFirst" ]
+[ 48@0, "0", "htop" ]
+[ 49@0, "226", "ttop" ]
+[ 50@0, "21554", "batStamp" ]
+[ 51@0, "228", "lastUsed" ]
+[ 52@0, "0", "curStamp" ]
+[ 53@0, "dirty", "batCopiedtodisk" ]
+[ 54@0, "clean", "batDirtydesc" ]
+[ 55@0, "clean", "H->heap.dirty" ]
+[ 56@0, "0", "T->heap.dirty" ]
+[ 57@0, "0", "head.free" ]
+[ 58@0, "0", "head.size" ]
+[ 59@0, "absent", "head.maxsize" ]
+[ 60@0, "malloced", "head.storage" ]
+[ 61@0, "no file", "head.newstorage" ]
+[ 62@0, "0", "head.filename" ]
+[ 63@0, "1024", "tail.free" ]
+[ 64@0, "1024", "tail.size" ]
+[ 65@0, "malloced", "tail.maxsize" ]
+[ 66@0, "malloced", "tail.storage" ]
+[ 67@0, "06/670.tail", "tail.newstorage" ]
+[ 68@0, "clean", "tail.filename" ]
+[ 69@0, "clean", "H->vheap->dirty" ]
#~EndVariableOutput~#
# Start performance profiling
#-----------------#
diff --git a/monetdb5/mal/Tests/tst870.mal b/monetdb5/mal/Tests/tst870.mal
--- a/monetdb5/mal/Tests/tst870.mal
+++ b/monetdb5/mal/Tests/tst870.mal
@@ -13,8 +13,8 @@ bat.insert(b,3@0, 1@0);
io.print(b);
ma_a := io.printf("#~BeginVariableOutput~#\n");
-na_a := bat.info(b);
-oa_a := io.print(na_a);
+(bk,bv) := bat.info(b);
+oa_a := io.print(bk,bv);
pa_a := io.printf("#~EndVariableOutput~#\n");
bt:=algebra.markH(b);
diff --git a/monetdb5/mal/Tests/tst870.stable.out
b/monetdb5/mal/Tests/tst870.stable.out
--- a/monetdb5/mal/Tests/tst870.stable.out
+++ b/monetdb5/mal/Tests/tst870.stable.out
@@ -47,8 +47,8 @@ function user.main():void;
bat.insert(b,3@0,1@0);
io.print(b);
ma_a := io.printf("#~BeginVariableOutput~#\n");
- na_a := bat.info(b);
- oa_a := io.print(na_a);
+ (bk,bv) := bat.info(b);
+ oa_a := io.print(bk,bv);
pa_a := io.printf("#~EndVariableOutput~#\n");
bt := algebra.markH(b);
hb := algebra.markT(b);
@@ -75,81 +75,80 @@ end main;
[ 3@0, nil ]
[ 3@0, 1@0 ]
#~BeginVariableOutput~#
-#-----------------------------------------#
-# h t # name
-# str str # type
-#-----------------------------------------#
-[ "batId", "tmp_657" ]
-[ "batCacheid", "431" ]
-[ "hparentid", "0" ]
-[ "tparentid", "0" ]
-[ "batSharecnt", "0" ]
-[ "batCount", "9" ]
-[ "batCapacity", "256" ]
-[ "head", "oid" ]
-[ "tail", "oid" ]
-[ "batPersistence", "transient" ]
-[ "batRestricted", "updatable" ]
-[ "batRefcnt", "1" ]
-[ "batLRefcnt", "10" ]
-[ "batDirty", "dirty" ]
-[ "batSet", "0" ]
-[ "hsorted", "1" ]
-[ "hrevsorted", "0" ]
-[ "hident", "h" ]
-[ "hdense", "0" ]
-[ "hseqbase", "0@0" ]
-[ "hkey", "0" ]
-[ "hvarsized", "0" ]
-[ "halign", "1968393" ]
-[ "hnosorted", "0" ]
-[ "hnorevsorted", "7" ]
-[ "hnodense", "2" ]
-[ "hnokey[0]", "1" ]
-[ "hnokey[1]", "2" ]
-[ "hnonil", "1" ]
-[ "hnil", "0" ]
-[ "tident", "t" ]
-[ "tdense", "0" ]
-[ "tseqbase", "0@0" ]
-[ "tsorted", "0" ]
-[ "trevsorted", "0" ]
-[ "tkey", "0" ]
-[ "tvarsized", "0" ]
-[ "talign", "1968394" ]
-[ "tnosorted", "4" ]
-[ "tnorevsorted", "1" ]
-[ "tnodense", "4" ]
-[ "tnokey[0]", "2" ]
-[ "tnokey[1]", "4" ]
-[ "tnonil", "0" ]
-[ "tnil", "1" ]
-[ "batInserted", "0" ]
-[ "batDeleted", "0" ]
-[ "batFirst", "0" ]
-[ "htop", "72" ]
-[ "ttop", "72" ]
-[ "batStamp", "1397" ]
-[ "lastUsed", "1265898" ]
-[ "curStamp", "1504" ]
-[ "batCopiedtodisk", "0" ]
-[ "batDirtydesc", "dirty" ]
-[ "H->heap.dirty", "dirty" ]
-[ "T->heap.dirty", "clean" ]
-[ "head.free", "72" ]
-[ "head.size", "2048" ]
-[ "head.maxsize", "2048" ]
-[ "head.storage", "malloced" ]
-[ "head.newstorage", "malloced" ]
-[ "head.filename", "no file" ]
-[ "tail.free", "72" ]
-[ "tail.size", "2048" ]
-[ "tail.maxsize", "2048" ]
-[ "tail.storage", "malloced" ]
-[ "tail.newstorage", "malloced" ]
-[ "tail.filename", "06/657.tail" ]
-[ "H->vheap->dirty", "clean" ]
-[ "T->vheap->dirty", "clean" ]
+#-------------------------------------------------#
+# h t t # name
+# oid str str # type
+#-------------------------------------------------#
+[ 0@0, "tmp_654", "batId" ]
+[ 1@0, "428", "batCacheid" ]
+[ 2@0, "0", "hparentid" ]
+[ 3@0, "0", "tparentid" ]
+[ 4@0, "9", "batSharecnt" ]
+[ 5@0, "256", "batCount" ]
+[ 6@0, "oid", "batCapacity" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
