Changeset: 06ac708d0e33 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06ac708d0e33 Modified Files: sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out Branch: Jun2016 Log Message:
Remove some variable columns from the output. diffs (100 lines): diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql --- a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql +++ b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql @@ -1,7 +1,8 @@ -- platform dependent script test. create table bug3923(i integer); -select * from storage() where "table"= '_tables'; +-- skip columns location, count, columnsize. +select "schema", "table", "column", "type", "mode", typewidth, heapsize, hashes, phash, imprints, sorted from storage() where "table"= '_tables'; call storagemodelinit(); update storagemodelinput set "count" =10000 where "table" ='bug3923'; diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err --- a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err +++ b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err @@ -28,7 +28,7 @@ stderr of test 'storagemodel.Bug-3923` i # 23:38:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21747" "--port=30783" # 23:38:44 > -MAPI = (monetdb) /var/tmp/mtest-21747/.s.monetdb.30783 +MAPI = (monetdb) /var/tmp/mtest-545/.s.monetdb.36257 QUERY = crate schema bug3923schema; ERROR = !syntax error, unexpected IDENT in: "crate" 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 @@ -66,27 +66,27 @@ Ready. # 23:38:44 > #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, 1, 5, 1, 5 # length -[ "sys", "_tables", "id", "int", "writable", "01/157", 57, 4, 228, 0, 0, false, 0, true ] -[ "sys", "_tables", "name", "varchar", "writable", "01/160", 57, 8, 114, 9712, 0, false, 0, false ] -[ "sys", "_tables", "schema_id", "int", "writable", "01/161", 57, 4, 228, 0, 0, false, 0, false ] -[ "sys", "_tables", "query", "varchar", "writable", "01/162", 57, 45, 114, 11157, 0, false, 0, false ] -[ "sys", "_tables", "type", "smallint", "writable", "01/163", 57, 2, 114, 0, 0, false, 0, false ] -[ "sys", "_tables", "system", "boolean", "writable", "01/164", 57, 1, 57, 0, 0, false, 0, false ] -[ "sys", "_tables", "commit_action", "smallint", "writable", "01/165", 57, 2, 114, 0, 0, false, 0, false ] -[ "sys", "_tables", "access", "smallint", "writable", "01/166", 57, 2, 114, 0, 0, false, 0, true ] -[ "tmp", "_tables", "id", "int", "writable", "02/236", 0, 4, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "name", "varchar", "writable", "02/237", 0, 1, 0, 8192, 0, false, 0, true ] -[ "tmp", "_tables", "schema_id", "int", "writable", "02/240", 0, 4, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "query", "varchar", "writable", "02/241", 0, 1, 0, 8192, 0, false, 0, true ] -[ "tmp", "_tables", "type", "smallint", "writable", "02/242", 0, 2, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "system", "boolean", "writable", "02/243", 0, 1, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "commit_action", "smallint", "writable", "02/244", 0, 2, 0, 0, 0, false, 0, true ] -[ "tmp", "_tables", "access", "smallint", "writable", "02/245", 0, 2, 0, 0, 0, false, 0, true ] +#select "schema", "table", "column", "type", "mode", typewidth, heapsize, hashes, phash, imprints, sorted from storage() where "table"= '_tables'; +% .L, .L, .L, .L, .L, .L, .L, .L, .L, .L, .L # table_name +% schema, table, column, type, mode, typewidth, heapsize, hashes, phash, imprints, sorted # name +% clob, clob, clob, clob, clob, int, bigint, bigint, boolean, bigint, boolean # type +% 3, 7, 13, 8, 8, 2, 5, 1, 5, 1, 5 # length +[ "sys", "_tables", "id", "int", "writable", 4, 0, 0, false, 0, true ] +[ "sys", "_tables", "name", "varchar", "writable", 9, 9432, 0, false, 0, false ] +[ "sys", "_tables", "schema_id", "int", "writable", 4, 0, 0, false, 0, false ] +[ "sys", "_tables", "query", "varchar", "writable", 55, 11157, 0, false, 0, false ] +[ "sys", "_tables", "type", "smallint", "writable", 2, 0, 0, false, 0, false ] +[ "sys", "_tables", "system", "boolean", "writable", 1, 0, 0, false, 0, false ] +[ "sys", "_tables", "commit_action", "smallint", "writable", 2, 0, 0, false, 0, false ] +[ "sys", "_tables", "access", "smallint", "writable", 2, 0, 0, false, 0, true ] +[ "tmp", "_tables", "id", "int", "writable", 4, 0, 0, false, 0, true ] +[ "tmp", "_tables", "name", "varchar", "writable", 1, 8192, 0, false, 0, true ] +[ "tmp", "_tables", "schema_id", "int", "writable", 4, 0, 0, false, 0, true ] +[ "tmp", "_tables", "query", "varchar", "writable", 1, 8192, 0, false, 0, true ] +[ "tmp", "_tables", "type", "smallint", "writable", 2, 0, 0, false, 0, true ] +[ "tmp", "_tables", "system", "boolean", "writable", 1, 0, 0, false, 0, true ] +[ "tmp", "_tables", "commit_action", "smallint", "writable", 2, 0, 0, false, 0, true ] +[ "tmp", "_tables", "access", "smallint", "writable", 2, 0, 0, false, 0, true ] #update storagemodelinput set "count" =10000 where "table" ='bug3923'; [ 1 ] #update storagemodelinput set "distinct" =10 where "table" ='bug3923' and "column" ='i'; @@ -104,14 +104,14 @@ Ready. % 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/157", 58, 4, 232, 0, 2600, false, 0, false ] -[ "sys", "_tables", "name", "varchar", "writable", "01/160", 58, 8, 116, 9712, 0, false, 0, false ] -[ "sys", "_tables", "schema_id", "int", "writable", "01/161", 58, 4, 232, 0, 0, false, 0, false ] -[ "sys", "_tables", "query", "varchar", "writable", "01/162", 58, 45, 116, 11157, 0, false, 0, false ] -[ "sys", "_tables", "type", "smallint", "writable", "01/163", 58, 2, 116, 0, 0, false, 0, false ] -[ "sys", "_tables", "system", "boolean", "writable", "01/164", 58, 1, 58, 0, 0, false, 0, false ] -[ "sys", "_tables", "commit_action", "smallint", "writable", "01/165", 58, 2, 116, 0, 0, false, 0, false ] -[ "sys", "_tables", "access", "smallint", "writable", "01/166", 58, 2, 116, 0, 0, false, 0, true ] +[ "sys", "_tables", "id", "int", "writable", "01/157", 48, 4, 192, 0, 2600, false, 0, false ] +[ "sys", "_tables", "name", "varchar", "writable", "01/160", 48, 9, 96, 9432, 0, false, 0, false ] +[ "sys", "_tables", "schema_id", "int", "writable", "01/161", 48, 4, 192, 0, 0, false, 0, false ] +[ "sys", "_tables", "query", "varchar", "writable", "01/162", 48, 54, 96, 11157, 0, false, 0, false ] +[ "sys", "_tables", "type", "smallint", "writable", "01/163", 48, 2, 96, 0, 0, false, 0, false ] +[ "sys", "_tables", "system", "boolean", "writable", "01/164", 48, 1, 48, 0, 0, false, 0, false ] +[ "sys", "_tables", "commit_action", "smallint", "writable", "01/165", 48, 2, 96, 0, 0, false, 0, false ] +[ "sys", "_tables", "access", "smallint", "writable", "01/166", 48, 2, 96, 0, 0, false, 0, true ] [ "tmp", "_tables", "id", "int", "writable", "02/236", 0, 4, 0, 0, 0, false, 0, true ] [ "tmp", "_tables", "name", "varchar", "writable", "02/237", 0, 1, 0, 8192, 0, false, 0, true ] [ "tmp", "_tables", "schema_id", "int", "writable", "02/240", 0, 4, 0, 0, 0, false, 0, true ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
