Changeset: 73fcb1d8068e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73fcb1d8068e Modified Files: monetdb5/mal/Tests/tst270.stable.out monetdb5/mal/Tests/tst870.stable.out monetdb5/modules/kernel/bat5.c monetdb5/tests/gdkTests/Tests/void.stable.out Branch: default Log Message:
Fix bat.info() so that the key and value columns are in sync. Also approved tests affected by the fix. diffs (truncated from 363 to 300 lines): 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 @@ -96,76 +96,77 @@ end main; # 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" ] +[ 0@0, "batId", "tmp_665" ] +[ 1@0, "batCacheid", "437" ] +[ 2@0, "hparentid", "0" ] +[ 3@0, "tparentid", "0" ] +[ 4@0, "batSharecnt", "0" ] +[ 5@0, "batCount", "0" ] +[ 6@0, "batCapacity", "256" ] +[ 7@0, "head", "void" ] +[ 8@0, "tail", "int" ] +[ 9@0, "batPersistence", "transient" ] +[ 10@0, "batRestricted", "updatable" ] +[ 11@0, "batRefcnt", "1" ] +[ 12@0, "batLRefcnt", "1" ] +[ 13@0, "batDirty", "dirty" ] +[ 14@0, "batSet", "0" ] +[ 15@0, "hsorted", "1" ] +[ 16@0, "hrevsorted", "1" ] +[ 17@0, "hident", "h" ] +[ 18@0, "hdense", "1" ] +[ 19@0, "hseqbase", "0@0" ] +[ 20@0, "hkey", "1" ] +[ 21@0, "hvarsized", "1" ] +[ 22@0, "halign", "0" ] +[ 23@0, "hnosorted", "0" ] +[ 24@0, "hnorevsorted", "0" ] +[ 25@0, "hnodense", "0" ] +[ 26@0, "hnokey[0]", "0" ] +[ 27@0, "hnokey[1]", "0" ] +[ 28@0, "hnonil", "1" ] +[ 29@0, "hnil", "0" ] +[ 30@0, "tident", "t" ] +[ 31@0, "tdense", "0" ] +[ 32@0, "tseqbase", "0@0" ] +[ 33@0, "tsorted", "1" ] +[ 34@0, "trevsorted", "1" ] +[ 35@0, "tkey", "1" ] +[ 36@0, "tvarsized", "0" ] +[ 37@0, "talign", "20000001" ] +[ 38@0, "tnosorted", "0" ] +[ 39@0, "tnorevsorted", "0" ] +[ 40@0, "tnodense", "0" ] +[ 41@0, "tnokey[0]", "0" ] +[ 42@0, "tnokey[1]", "0" ] +[ 43@0, "tnonil", "1" ] +[ 44@0, "tnil", "0" ] +[ 45@0, "batInserted", "0" ] +[ 46@0, "batDeleted", "0" ] +[ 47@0, "batFirst", "0" ] +[ 48@0, "htop", "0" ] +[ 49@0, "ttop", "0" ] +[ 50@0, "batStamp", "224" ] +[ 51@0, "lastUsed", "21615" ] +[ 52@0, "curStamp", "226" ] +[ 53@0, "batCopiedtodisk", "0" ] +[ 54@0, "batDirtydesc", "dirty" ] +[ 55@0, "H->heap.dirty", "clean" ] +[ 56@0, "T->heap.dirty", "clean" ] +[ 57@0, "head.free", "0" ] +[ 58@0, "head.size", "0" ] +[ 59@0, "head.maxsize", "0" ] +[ 60@0, "head.storage", "absent" ] +[ 61@0, "head.newstorage", "malloced" ] +[ 62@0, "head.filename", "no file" ] +[ 63@0, "tail.free", "0" ] +[ 64@0, "tail.size", "1024" ] +[ 65@0, "tail.maxsize", "1024" ] +[ 66@0, "tail.storage", "malloced" ] +[ 67@0, "tail.newstorage", "malloced" ] +[ 68@0, "tail.filename", "06/665.tail" ] +[ 69@0, "H->vheap->dirty", "clean" ] +[ 70@0, "T->vheap->dirty", "clean" ] #~EndVariableOutput~# # Start performance profiling #-----------------# 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 @@ -79,76 +79,77 @@ end main; # 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" ] -[ 7@0, "oid", "head" ] -[ 8@0, "transient", "tail" ] -[ 9@0, "updatable", "batPersistence" ] -[ 10@0, "1", "batRestricted" ] -[ 11@0, "10", "batRefcnt" ] -[ 12@0, "dirty", "batLRefcnt" ] -[ 13@0, "0", "batDirty" ] -[ 14@0, "1", "batSet" ] -[ 15@0, "0", "hsorted" ] -[ 16@0, "h", "hrevsorted" ] -[ 17@0, "0", "hident" ] -[ 18@0, "0@0", "hdense" ] -[ 19@0, "0", "hseqbase" ] -[ 20@0, "0", "hkey" ] -[ 21@0, "0", "hvarsized" ] -[ 22@0, "0", "halign" ] -[ 23@0, "0", "hnosorted" ] -[ 24@0, "2", "hnorevsorted" ] -[ 25@0, "1", "hnodense" ] -[ 26@0, "2", "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, "0", "tseqbase" ] -[ 33@0, "0", "tsorted" ] -[ 34@0, "0", "trevsorted" ] -[ 35@0, "0", "tkey" ] -[ 36@0, "0", "tvarsized" ] -[ 37@0, "4", "talign" ] -[ 38@0, "1", "tnosorted" ] -[ 39@0, "4", "tnorevsorted" ] -[ 40@0, "3", "tnodense" ] -[ 41@0, "4", "tnokey[0]" ] -[ 42@0, "0", "tnokey[1]" ] -[ 43@0, "1", "tnonil" ] -[ 44@0, "0", "tnil" ] -[ 45@0, "0", "batInserted" ] -[ 46@0, "0", "batDeleted" ] -[ 47@0, "72", "batFirst" ] -[ 48@0, "72", "htop" ] -[ 49@0, "214", "ttop" ] -[ 50@0, "17581", "batStamp" ] -[ 51@0, "216", "lastUsed" ] -[ 52@0, "0", "curStamp" ] -[ 53@0, "dirty", "batCopiedtodisk" ] -[ 54@0, "dirty", "batDirtydesc" ] -[ 55@0, "clean", "H->heap.dirty" ] -[ 56@0, "72", "T->heap.dirty" ] -[ 57@0, "2048", "head.free" ] -[ 58@0, "2048", "head.size" ] -[ 59@0, "malloced", "head.maxsize" ] -[ 60@0, "malloced", "head.storage" ] -[ 61@0, "no file", "head.newstorage" ] -[ 62@0, "72", "head.filename" ] -[ 63@0, "2048", "tail.free" ] -[ 64@0, "2048", "tail.size" ] -[ 65@0, "malloced", "tail.maxsize" ] -[ 66@0, "malloced", "tail.storage" ] -[ 67@0, "06/654.tail", "tail.newstorage" ] -[ 68@0, "clean", "tail.filename" ] -[ 69@0, "clean", "H->vheap->dirty" ] +[ 0@0, "batId", "tmp_651" ] +[ 1@0, "batCacheid", "425" ] +[ 2@0, "hparentid", "0" ] +[ 3@0, "tparentid", "0" ] +[ 4@0, "batSharecnt", "0" ] +[ 5@0, "batCount", "9" ] +[ 6@0, "batCapacity", "256" ] +[ 7@0, "head", "oid" ] +[ 8@0, "tail", "oid" ] +[ 9@0, "batPersistence", "transient" ] +[ 10@0, "batRestricted", "updatable" ] +[ 11@0, "batRefcnt", "1" ] +[ 12@0, "batLRefcnt", "10" ] +[ 13@0, "batDirty", "dirty" ] +[ 14@0, "batSet", "0" ] +[ 15@0, "hsorted", "1" ] +[ 16@0, "hrevsorted", "0" ] +[ 17@0, "hident", "h" ] +[ 18@0, "hdense", "0" ] +[ 19@0, "hseqbase", "0@0" ] +[ 20@0, "hkey", "0" ] +[ 21@0, "hvarsized", "0" ] +[ 22@0, "halign", "0" ] +[ 23@0, "hnosorted", "0" ] +[ 24@0, "hnorevsorted", "0" ] +[ 25@0, "hnodense", "2" ] +[ 26@0, "hnokey[0]", "1" ] +[ 27@0, "hnokey[1]", "2" ] +[ 28@0, "hnonil", "1" ] +[ 29@0, "hnil", "0" ] +[ 30@0, "tident", "t" ] +[ 31@0, "tdense", "0" ] +[ 32@0, "tseqbase", "0@0" ] +[ 33@0, "tsorted", "0" ] +[ 34@0, "trevsorted", "0" ] +[ 35@0, "tkey", "0" ] +[ 36@0, "tvarsized", "0" ] +[ 37@0, "talign", "0" ] +[ 38@0, "tnosorted", "4" ] +[ 39@0, "tnorevsorted", "1" ] +[ 40@0, "tnodense", "4" ] +[ 41@0, "tnokey[0]", "3" ] +[ 42@0, "tnokey[1]", "4" ] +[ 43@0, "tnonil", "0" ] +[ 44@0, "tnil", "1" ] +[ 45@0, "batInserted", "0" ] +[ 46@0, "batDeleted", "0" ] +[ 47@0, "batFirst", "0" ] +[ 48@0, "htop", "72" ] +[ 49@0, "ttop", "72" ] +[ 50@0, "batStamp", "212" ] +[ 51@0, "lastUsed", "17698" ] +[ 52@0, "curStamp", "214" ] +[ 53@0, "batCopiedtodisk", "0" ] +[ 54@0, "batDirtydesc", "dirty" ] +[ 55@0, "H->heap.dirty", "dirty" ] +[ 56@0, "T->heap.dirty", "clean" ] +[ 57@0, "head.free", "72" ] +[ 58@0, "head.size", "2048" ] +[ 59@0, "head.maxsize", "2048" ] +[ 60@0, "head.storage", "malloced" ] +[ 61@0, "head.newstorage", "malloced" ] +[ 62@0, "head.filename", "no file" ] +[ 63@0, "tail.free", "72" ] +[ 64@0, "tail.size", "2048" ] +[ 65@0, "tail.maxsize", "2048" ] +[ 66@0, "tail.storage", "malloced" ] +[ 67@0, "tail.newstorage", "malloced" ] +[ 68@0, "tail.filename", "06/651.tail" ] +[ 69@0, "H->vheap->dirty", "clean" ] +[ 70@0, "T->vheap->dirty", "clean" ] #~EndVariableOutput~# _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
