Changeset: c570bbe3e75f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c570bbe3e75f Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/Tests/without_oid.stable.out Branch: mosaic Log Message:
Approve output diffs (truncated from 478 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -684,7 +684,7 @@ Ready. [ "sys", "stddev_samp", 1, "timestamp", "" ] [ "sys", "stop", 0, "int", "create procedure sys.stop(tag int)\nexternal name sql.sysmon_stop;" ] [ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag bigint)\nexternal name sql.sysmon_stop;" ] -[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean)\nexternal name sql.\"storage\";" ] +[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean, compress boolean)\nexternal name sql.\"storage\";" ] [ "sys", "storage", 1, "clob", "" ] [ "sys", "storage", 2, "clob", "" ] [ "sys", "storage", 3, "clob", "" ] @@ -698,6 +698,7 @@ Ready. [ "sys", "storage", 11, "boolean", "" ] [ "sys", "storage", 12, "bigint", "" ] [ "sys", "storage", 13, "boolean", "" ] +[ "sys", "storage", 14, "boolean", "" ] [ "sys", "storagemodel", 0, "clob", "create function sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n\thashsize(i.\"reference\", i.\"count\"),\n\timprintsize(i.\"count\",i.\"type\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ] [ "sys", "storagemodel", 1, "clob", "" ] [ "sys", "storagemodel", 2, "clob", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -709,7 +709,7 @@ Ready. [ "sys", "stddev_samp", 1, "hugeint", "" ] [ "sys", "stop", 0, "int", "create procedure sys.stop(tag int)\nexternal name sql.sysmon_stop;" ] [ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag bigint)\nexternal name sql.sysmon_stop;" ] -[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean)\nexternal name sql.\"storage\";" ] +[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean, compress boolean)\nexternal name sql.\"storage\";" ] [ "sys", "storage", 1, "clob", "" ] [ "sys", "storage", 2, "clob", "" ] [ "sys", "storage", 3, "clob", "" ] @@ -723,6 +723,7 @@ Ready. [ "sys", "storage", 11, "boolean", "" ] [ "sys", "storage", 12, "bigint", "" ] [ "sys", "storage", 13, "boolean", "" ] +[ "sys", "storage", 14, "boolean", "" ] [ "sys", "storagemodel", 0, "clob", "create function sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n\thashsize(i.\"reference\", i.\"count\"),\n\timprintsize(i.\"count\",i.\"type\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ] [ "sys", "storagemodel", 1, "clob", "" ] [ "sys", "storagemodel", 2, "clob", "" ] diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 b/sql/test/leaks/Tests/check1.stable.out.int128 --- a/sql/test/leaks/Tests/check1.stable.out.int128 +++ b/sql/test/leaks/Tests/check1.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 50 ] -[ "oid", "bit", 352 ] +[ "oid", "bit", 353 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] -[ "oid", "bte", 4259 ] +[ "oid", "bte", 4260 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 232 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -259,15 +259,15 @@ Ready. [ "oid", "str", 50 ] [ "oid", "str", 50 ] [ "oid", "str", 232 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] -[ "oid", "str", 4259 ] -[ "oid", "str", 4259 ] +[ "oid", "str", 4260 ] +[ "oid", "str", 4260 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check2.stable.out.int128 b/sql/test/leaks/Tests/check2.stable.out.int128 --- a/sql/test/leaks/Tests/check2.stable.out.int128 +++ b/sql/test/leaks/Tests/check2.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 50 ] -[ "oid", "bit", 352 ] +[ "oid", "bit", 353 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] -[ "oid", "bte", 4259 ] +[ "oid", "bte", 4260 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 232 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] -[ "oid", "int", 352 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] +[ "oid", "int", 353 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -259,15 +259,15 @@ Ready. [ "oid", "str", 50 ] [ "oid", "str", 50 ] [ "oid", "str", 232 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] -[ "oid", "str", 352 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] +[ "oid", "str", 353 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] -[ "oid", "str", 4259 ] -[ "oid", "str", 4259 ] +[ "oid", "str", 4260 ] +[ "oid", "str", 4260 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check3.stable.out.int128 b/sql/test/leaks/Tests/check3.stable.out.int128 --- a/sql/test/leaks/Tests/check3.stable.out.int128 +++ b/sql/test/leaks/Tests/check3.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 51 ] -[ "oid", "bit", 354 ] +[ "oid", "bit", 355 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] -[ "oid", "bte", 4259 ] +[ "oid", "bte", 4260 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 235 ] -[ "oid", "int", 354 ] -[ "oid", "int", 354 ] -[ "oid", "int", 354 ] -[ "oid", "int", 354 ] -[ "oid", "int", 354 ] +[ "oid", "int", 355 ] +[ "oid", "int", 355 ] +[ "oid", "int", 355 ] +[ "oid", "int", 355 ] +[ "oid", "int", 355 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -259,15 +259,15 @@ Ready. [ "oid", "str", 51 ] [ "oid", "str", 51 ] [ "oid", "str", 235 ] -[ "oid", "str", 354 ] -[ "oid", "str", 354 ] -[ "oid", "str", 354 ] -[ "oid", "str", 354 ] +[ "oid", "str", 355 ] +[ "oid", "str", 355 ] +[ "oid", "str", 355 ] +[ "oid", "str", 355 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] [ "oid", "str", 1520 ] -[ "oid", "str", 4259 ] -[ "oid", "str", 4259 ] +[ "oid", "str", 4260 ] +[ "oid", "str", 4260 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check4.stable.out.int128 b/sql/test/leaks/Tests/check4.stable.out.int128 --- a/sql/test/leaks/Tests/check4.stable.out.int128 +++ b/sql/test/leaks/Tests/check4.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 52 ] -[ "oid", "bit", 356 ] +[ "oid", "bit", 357 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] [ "oid", "bit", 1520 ] -[ "oid", "bte", 4259 ] +[ "oid", "bte", 4260 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 238 ] -[ "oid", "int", 356 ] -[ "oid", "int", 356 ] -[ "oid", "int", 356 ] -[ "oid", "int", 356 ] -[ "oid", "int", 356 ] +[ "oid", "int", 357 ] +[ "oid", "int", 357 ] +[ "oid", "int", 357 ] +[ "oid", "int", 357 ] +[ "oid", "int", 357 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] [ "oid", "int", 1520 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] -[ "oid", "int", 4259 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] +[ "oid", "int", 4260 ] [ "oid", "lng", 0 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
