Changeset: 11a51a9287ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11a51a9287ed Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out.int128 sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 Branch: default Log Message:
approve output after orderidx merge diffs (truncated from 1079 to 300 lines): 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 @@ -38,67 +38,72 @@ Ready. [ 6@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ", "BKCdelete_all;" ] [ 7@0, "delete", "command", "bat", "(b:bat[:any_1],d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ] [ 8@0, "densebat", "command", "bat", "(b:bat[:any_1],h:oid):bat[:any_1] ", "BKCdelete;" ] -[ 9@0, "getAccess", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetBBPname;" ] -[ 10@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ] -[ 11@0, "getColumnType", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetAccess;" ] -[ 12@0, "getName", "command", "bat", "(bid:bat[:any_1]):str ", "BKCgetRole;" ] -[ 13@0, "getRole", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetColumnType;" ] -[ 14@0, "getSequenceBase", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetCapacity;" ] -[ 15@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetSize;" ] -[ 16@0, "imprints", "command", "bat", "(b:bat[:hge]):lng ", "CMDBATimprintsize;" ] -[ 17@0, "imprints", "command", "bat", "(b:bat[:hge]):void ", "CMDBATimprints;" ] -[ 18@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ", "CMDBATimprintsize;" ] -[ 19@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ", "CMDBATimprintsize;" ] -[ 20@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ", "CMDBATimprintsize;" ] -[ 21@0, "imprints", "command", "bat", "(b:bat[:int]):lng ", "CMDBATimprintsize;" ] -[ 22@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ", "CMDBATimprintsize;" ] -[ 23@0, "imprintsize", "command", "bat", "(b:bat[:bte]):lng ", "CMDBATimprintsize;" ] -[ 24@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ", "CMDBATimprints;" ] -[ 25@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ", "CMDBATimprints;" ] -[ 26@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ", "CMDBATimprints;" ] -[ 27@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ", "CMDBATimprints;" ] -[ 28@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ", "CMDBATimprints;" ] -[ 29@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ", "CMDBATimprints;" ] -[ 30@0, "info", "command", "bat", "(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ] -[ 31@0, "intersectcand", "command", "bat", "(b1:bat[:any_1],b2:bat[:any_2]):bit ", "BKCisSynced;" ] -[ 32@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisPersistent;" ] -[ 33@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisTransient;" ] -[ 34@0, "isSortedReverse", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ] -[ 35@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSorted;" ] -[ 36@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ", "BKCgetKey;" ] -[ 37@0, "isaKey", "command", "bat", "(b:bat[:any_1]) (X_2:bat[:str],X_3:bat[:str]) ", "BKCinfo;" ] -[ 38@0, "mergecand", "command", "bat", "(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ] -[ 39@0, "mirror", "command", "bat", "(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ] -[ 40@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew_persistent;" ] -[ 41@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew_persistent;" ] -[ 42@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1] ", "CMDBATnew_persistent;" ] -[ 43@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew;" ] -[ 44@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew;" ] -[ 45@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1] ", "CMDBATnew;" ] -[ 46@0, "new_persistent", "pattern", "bat", "(tt:any_1,size:lng):bat[:any_1] ", "CMDBATnewColumn;" ] -[ 47@0, "new_persistent", "pattern", "bat", "(tt:any_1,size:int):bat[:any_1] ", "CMDBATnewColumn;" ] -[ 48@0, "new_persistent", "pattern", "bat", "(tt:any_1):bat[:any_1] ", "CMDBATnewColumn;" ] -[ 49@0, "partition", "pattern", "bat", "(b:bat[:any_1],pieces:int,n:int):bat[:any_1] ", "CMDBATpartition2;" ] -[ 50@0, "partition", "pattern", "bat", "(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ] -[ 51@0, "replace", "command", "bat", "(b:bat[:any_1],del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ] -[ 52@0, "replace", "command", "bat", "(b:bat[:any_1],del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ] -[ 53@0, "replace", "command", "bat", "(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1],force:bit):bat[:any_1] ", "BKCbat_inplace_force;" ] -[ 54@0, "replace", "command", "bat", "(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ] -[ 55@0, "reuse", "command", "bat", "(b:bat[:any_1],h:oid,t:any_1,force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ] -[ 56@0, "reuseMap", "command", "bat", "(b:bat[:any_1],h:oid,t:any_1):bat[:any_1] ", "BKCbun_inplace;" ] -[ 57@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ", "CMDBATsingle;" ] -[ 58@0, "save", "command", "bat", "(b:bat[:any_1]):bit ", "BKCsetImprints;" ] -[ 59@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ", "BKCsetHash;" ] -[ 60@0, "setColumn", "command", "bat", "(nme:str):bit ", "BKCsave;" ] -[ 61@0, "setColumn", "command", "bat", "(nme:bat[:any_1]):void ", "BKCsave2;" ] -[ 62@0, "setHash", "command", "bat", "(b:bat[:any_1]):void ", "BKCsetPersistent;" ] -[ 63@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void ", "BKCsetTransient;" ] -[ 64@0, "setKey", "command", "bat", "(b:bat[:any_1],h:str,t:str):void ", "BKCsetColumns;" ] -[ 65@0, "setName", "command", "bat", "(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ] -[ 66@0, "setPersistent", "command", "bat", "(b:bat[:any_1],h:str,t:str):void ", "BKCsetRole;" ] -[ 67@0, "setRole", "command", "bat", "(b:bat[:any_1],s:str):void ", "BKCsetName;" ] -[ 68@0, "setTransient", "command", "bat", "(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ] -[ 69@0, "single", "command", "bat", "(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ] +[ 9@0, "getAccess", "pattern", "bat", "(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ] +[ 10@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetBBPname;" ] +[ 11@0, "getColumnType", "command", "bat", "(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ] +[ 12@0, "getName", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetAccess;" ] +[ 13@0, "getRole", "command", "bat", "(bid:bat[:any_1]):str ", "BKCgetRole;" ] +[ 14@0, "getSequenceBase", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetColumnType;" ] +[ 15@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetCapacity;" ] +[ 16@0, "getorderidx", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetSize;" ] +[ 17@0, "hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit ", "OIDXhasorderidx;" ] +[ 18@0, "imprints", "command", "bat", "(b:bat[:hge]):lng ", "CMDBATimprintsize;" ] +[ 19@0, "imprints", "command", "bat", "(b:bat[:hge]):void ", "CMDBATimprints;" ] +[ 20@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ", "CMDBATimprintsize;" ] +[ 21@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ", "CMDBATimprintsize;" ] +[ 22@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ", "CMDBATimprintsize;" ] +[ 23@0, "imprints", "command", "bat", "(b:bat[:int]):lng ", "CMDBATimprintsize;" ] +[ 24@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ", "CMDBATimprintsize;" ] +[ 25@0, "imprintsize", "command", "bat", "(b:bat[:bte]):lng ", "CMDBATimprintsize;" ] +[ 26@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ", "CMDBATimprints;" ] +[ 27@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ", "CMDBATimprints;" ] +[ 28@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ", "CMDBATimprints;" ] +[ 29@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ", "CMDBATimprints;" ] +[ 30@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ", "CMDBATimprints;" ] +[ 31@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ", "CMDBATimprints;" ] +[ 32@0, "info", "command", "bat", "(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ] +[ 33@0, "intersectcand", "command", "bat", "(b1:bat[:any_1],b2:bat[:any_2]):bit ", "BKCisSynced;" ] +[ 34@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisPersistent;" ] +[ 35@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisTransient;" ] +[ 36@0, "isSortedReverse", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ] +[ 37@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSorted;" ] +[ 38@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ", "BKCgetKey;" ] +[ 39@0, "isaKey", "command", "bat", "(b:bat[:any_1]) (X_2:bat[:str],X_3:bat[:str]) ", "BKCinfo;" ] +[ 40@0, "mergecand", "command", "bat", "(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ] +[ 41@0, "mirror", "command", "bat", "(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ] +[ 42@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew_persistent;" ] +[ 43@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew_persistent;" ] +[ 44@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1] ", "CMDBATnew_persistent;" ] +[ 45@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew;" ] +[ 46@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew;" ] +[ 47@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1] ", "CMDBATnew;" ] +[ 48@0, "new_persistent", "pattern", "bat", "(tt:any_1,size:lng):bat[:any_1] ", "CMDBATnewColumn;" ] +[ 49@0, "new_persistent", "pattern", "bat", "(tt:any_1,size:int):bat[:any_1] ", "CMDBATnewColumn;" ] +[ 50@0, "new_persistent", "pattern", "bat", "(tt:any_1):bat[:any_1] ", "CMDBATnewColumn;" ] +[ 51@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],l:bat[:any_1]...):void ", "OIDXmerge;" ] +[ 52@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],pieces:int):void ", "OIDXcreate;" ] +[ 53@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1]):void ", "OIDXcreate;" ] +[ 54@0, "partition", "pattern", "bat", "(b:bat[:any_1],pieces:int,n:int):bat[:any_1] ", "CMDBATpartition2;" ] +[ 55@0, "partition", "pattern", "bat", "(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ] +[ 56@0, "replace", "command", "bat", "(b:bat[:any_1],del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ] +[ 57@0, "replace", "command", "bat", "(b:bat[:any_1],del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ] +[ 58@0, "replace", "command", "bat", "(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1],force:bit):bat[:any_1] ", "BKCbat_inplace_force;" ] +[ 59@0, "replace", "command", "bat", "(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ] +[ 60@0, "reuse", "command", "bat", "(b:bat[:any_1],h:oid,t:any_1,force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ] +[ 61@0, "reuseMap", "command", "bat", "(b:bat[:any_1],h:oid,t:any_1):bat[:any_1] ", "BKCbun_inplace;" ] +[ 62@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ", "CMDBATsingle;" ] +[ 63@0, "save", "command", "bat", "(b:bat[:any_1]):bit ", "BKCsetImprints;" ] +[ 64@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ", "BKCsetHash;" ] +[ 65@0, "setColumn", "command", "bat", "(nme:str):bit ", "BKCsave;" ] +[ 66@0, "setColumn", "command", "bat", "(nme:bat[:any_1]):void ", "BKCsave2;" ] +[ 67@0, "setHash", "command", "bat", "(b:bat[:any_1]):void ", "BKCsetPersistent;" ] +[ 68@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void ", "BKCsetTransient;" ] +[ 69@0, "setKey", "command", "bat", "(b:bat[:any_1],h:str,t:str):void ", "BKCsetColumns;" ] +[ 70@0, "setName", "command", "bat", "(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ] +[ 71@0, "setPersistent", "command", "bat", "(b:bat[:any_1],h:str,t:str):void ", "BKCsetRole;" ] +[ 72@0, "setRole", "command", "bat", "(b:bat[:any_1],s:str):void ", "BKCsetName;" ] +[ 73@0, "setTransient", "command", "bat", "(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ] +[ 74@0, "single", "command", "bat", "(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ] # 08:55:30 > # 08:55:30 > Done. diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out --- a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out +++ b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out @@ -92,44 +92,44 @@ Ready. #update storagemodelinput set "distinct" =10 where "table" ='bug3923' and "column" ='i'; [ 1 ] #select * from storagemodel() where "table" = 'bug3923'; -% ., ., ., ., ., ., ., ., ., . # table_name -% schema, table, column, type, count, columnsize, heapsize, hashes, imprints, sorted # name -% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint, boolean # type -% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5 # length -[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0, 1200, true ] +% ., ., ., ., ., ., ., ., ., ., . # table_name +% schema, table, column, type, count, columnsize, heapsize, hashes, imprints, sorted, orderidx # name +% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint, boolean, bigint # type +% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5, 1 # length +[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0, 1200, true, 0 ] #drop table bug3923; #create table bug3923(i integer); #select * from storage() where "table"= '_tables'; -% ., ., ., ., ., ., ., ., ., ., ., ., ., . # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted # name -% clob, clob, clob, clob, clob, clob, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean # type -% 3, 7, 13, 8, 8, 6, 2, 2, 3, 5, 4, 5, 1, 5 # length -[ "sys", "_tables", "id", "int", "writable", "01/160", 58, 4, 232, 0, 2600, false, 0, false ] -[ "sys", "_tables", "name", "varchar", "writable", "01/161", 58, 8, 116, 9712, 0, false, 0, false ] -[ "sys", "_tables", "schema_id", "int", "writable", "01/162", 58, 4, 232, 0, 0, false, 0, false ] -[ "sys", "_tables", "query", "varchar", "writable", "01/163", 58, 45, 116, 11157, 0, false, 0, false ] -[ "sys", "_tables", "type", "smallint", "writable", "01/164", 58, 2, 116, 0, 0, false, 0, false ] -[ "sys", "_tables", "system", "boolean", "writable", "01/165", 58, 1, 58, 0, 0, false, 0, false ] -[ "sys", "_tables", "commit_action", "smallint", "writable", "01/166", 58, 2, 116, 0, 0, false, 0, false ] -[ "sys", "_tables", "access", "smallint", "writable", "01/167", 58, 2, 116, 0, 0, false, 0, true ] -[ "tmp", "_tables", "id", "int", "writable", "02/237", 0, 4, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "name", "varchar", "writable", "02/240", 0, 1, 0, 8192, 0, false, 0, true ] -[ "tmp", "_tables", "schema_id", "int", "writable", "02/241", 0, 4, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "query", "varchar", "writable", "02/242", 0, 1, 0, 8192, 0, false, 0, true ] -[ "tmp", "_tables", "type", "smallint", "writable", "02/243", 0, 2, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "system", "boolean", "writable", "02/244", 0, 1, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "commit_action", "smallint", "writable", "02/245", 0, 2, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "access", "smallint", "writable", "02/246", 0, 2, 0, 0, 0, false, 0, true ] +% ., ., ., ., ., ., ., ., ., ., ., ., ., ., . # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, orderidx # name +% clob, clob, clob, clob, clob, clob, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, bigint # type +% 3, 7, 13, 8, 8, 6, 2, 2, 3, 5, 4, 5, 1, 5, 1 # length +[ "sys", "_tables", "id", "int", "writable", "01/157", 58, 4, 232, 0, 2600, false, 0, false, 0 ] +[ "sys", "_tables", "name", "varchar", "writable", "01/160", 58, 8, 116, 9712, 0, false, 0, false, 0 ] +[ "sys", "_tables", "schema_id", "int", "writable", "01/161", 58, 4, 232, 0, 0, false, 0, false, 0 ] +[ "sys", "_tables", "query", "varchar", "writable", "01/162", 58, 45, 116, 11157, 0, false, 0, false, 0 ] +[ "sys", "_tables", "type", "smallint", "writable", "01/163", 58, 2, 116, 0, 0, false, 0, false, 0 ] +[ "sys", "_tables", "system", "boolean", "writable", "01/164", 58, 1, 58, 0, 0, false, 0, false, 0 ] +[ "sys", "_tables", "commit_action", "smallint", "writable", "01/165", 58, 2, 116, 0, 0, false, 0, false, 0 ] +[ "sys", "_tables", "access", "smallint", "writable", "01/166", 58, 2, 116, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "id", "int", "writable", "02/236", 0, 4, 0, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "name", "varchar", "writable", "02/237", 0, 1, 0, 8192, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "schema_id", "int", "writable", "02/240", 0, 4, 0, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "query", "varchar", "writable", "02/241", 0, 1, 0, 8192, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "type", "smallint", "writable", "02/242", 0, 2, 0, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "system", "boolean", "writable", "02/243", 0, 1, 0, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "commit_action", "smallint", "writable", "02/244", 0, 2, 0, 0, 0, false, 0, true, 0 ] +[ "tmp", "_tables", "access", "smallint", "writable", "02/245", 0, 2, 0, 0, 0, false, 0, true, 0 ] #update storagemodelinput set "count" =10000 where "table" ='bug3923'; [ 1 ] #update storagemodelinput set "distinct" =10 where "table" ='bug3923' and "column" ='i'; [ 1 ] #select * from storagemodel() where "table" = 'bug3923'; -% ., ., ., ., ., ., ., ., ., . # table_name -% schema, table, column, type, count, columnsize, heapsize, hashes, imprints, sorted # name -% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint, boolean # type -% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5 # length -[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0, 1200, true ] +% ., ., ., ., ., ., ., ., ., ., . # table_name +% schema, table, column, type, count, columnsize, heapsize, hashes, imprints, sorted, orderidx # name +% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint, boolean, bigint # type +% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5, 1 # length +[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0, 1200, true, 0 ] #drop table bug3923; # 23:38:44 > diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out b/sql/test/Dependencies/Tests/Dependencies.stable.out --- a/sql/test/Dependencies/Tests/Dependencies.stable.out +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out @@ -275,6 +275,7 @@ Dependencies between database objects [ "name", "dependencies_views_on_functions", "DEP_FUNC" ] [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "name", "f2", "DEP_FUNC" ] +[ "orderidx", "storagemodel", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] @@ -784,6 +785,7 @@ Cleanup [ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "name", "dependencies_views_on_functions", "DEP_FUNC" ] [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "orderidx", "storagemodel", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 --- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 @@ -275,6 +275,7 @@ Dependencies between database objects [ "name", "dependencies_views_on_functions", "DEP_FUNC" ] [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "name", "f2", "DEP_FUNC" ] +[ "orderidx", "storagemodel", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] @@ -645,6 +646,7 @@ Cleanup [ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "name", "dependencies_views_on_functions", "DEP_FUNC" ] [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "orderidx", "storagemodel", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out --- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out +++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out @@ -75,10 +75,10 @@ Ready. % varchar, varchar, int # type % 7, 13, 4 # length [ "monetdb", "MonetDB Admin", 2000 ] -[ "user1", "1st user", 8429 ] -[ "user2", "2nd user", 8429 ] -[ "user3", "3rd user", 8429 ] -[ "user4", "4th user", 8429 ] +[ "user1", "1st user", 8447 ] +[ "user2", "2nd user", 8447 ] +[ "user3", "3rd user", 8447 ] +[ "user4", "4th user", 8447 ] #DROP USER user1; #DROP USER user2; #DROP USER user3; diff --git a/sql/test/leaks/Tests/check0.stable.out b/sql/test/leaks/Tests/check0.stable.out --- a/sql/test/leaks/Tests/check0.stable.out +++ b/sql/test/leaks/Tests/check0.stable.out @@ -66,7 +66,7 @@ Ready. [ "int", 0 ] [ "int", 1 ] [ "int", 1 ] -[ "int", 252 ] +[ "int", 253 ] [ "lng", 1 ] [ "oid", 0 ] [ "oid", 0 ] diff --git a/sql/test/leaks/Tests/check0.stable.out.int128 b/sql/test/leaks/Tests/check0.stable.out.int128 --- a/sql/test/leaks/Tests/check0.stable.out.int128 +++ b/sql/test/leaks/Tests/check0.stable.out.int128 @@ -66,7 +66,7 @@ Ready. [ "int", 0 ] [ "int", 1 ] [ "int", 1 ] -[ "int", 252 ] +[ "int", 253 ] [ "lng", 1 ] [ "oid", 0 ] [ "oid", 0 ] @@ -74,13 +74,13 @@ Ready. [ "str", 1 ] [ "str", 1 ] [ "str", 1 ] -[ "str", 252 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
