Changeset: 1f2be75386e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f2be75386e7
Added Files:
clients/Tests/SQL-dump_gsl.stable.out.oid32.int128
Modified Files:
clients/Tests/SQL-dump_gsl.stable.out.oid32
sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.err
sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.err.int128
Branch: int128
Log Message:
more output approvals
diffs (truncated from 9263 to 300 lines):
diff --git a/clients/Tests/SQL-dump_gsl.stable.out.oid32
b/clients/Tests/SQL-dump_gsl.stable.out.oid32
--- a/clients/Tests/SQL-dump_gsl.stable.out.oid32
+++ b/clients/Tests/SQL-dump_gsl.stable.out.oid32
@@ -511,6 +511,7 @@ begin
when nme = 'smallint' then return 2 * i;
when nme = 'int' then return 4 * i;
when nme = 'bigint' then return 8 * i;
+ when nme = 'hugeint' then return 16 * i;
when nme = 'timestamp' then return 8 * i;
when nme = 'varchar' then
case
@@ -6882,7 +6883,7 @@ 6206 "symdifference" "create function sy
6211 "chi2prob" "-- The contents of this file are subject to the
MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this
file except in\n-- compliance with the License. You may obtain a copy of the
License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software
distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT
WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the
specific language governing rights and limitations\n-- under the
License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The
Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are
Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB
B.V.\n-- All Rights Reserved.\n\n-- (co) Arjen de Rijke, Bart Scheers\n-- Use
statistical functions from gsl library\n\n-- Calculate Chi squared
probability\ncreate function sys.chi2prob(chi2 double, datapoints
double)\nreturns double external nam
e gsl.\"chi2prob\";" "gsl" true 1 false 2000
6228 "storage" "-- The contents of this file are subject to the
MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this
file except in\n-- compliance with the License. You may obtain a copy of the
License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software
distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT
WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the
specific language governing rights and limitations\n-- under the
License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The
Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are
Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB
B.V.\n-- All Rights Reserved.\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 cha
ncing 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 (\"schema\" string,
\"table\" string, \"column\" string, \"type\" string, location string,
\"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, indices
bigint, sorted boolean)\nexternal name sql.storage;" "sql" true 1
false 2000
6256 "storagemodelinit" "-- this table can be adjusted to reflect the
anticipated final database size\n\n-- The model input can be derived from the
current database using\ncreate procedure
sys.storagemodelinit()\nbegin\n\tdelete from sys.storagemodelinput;\n\n\tinsert
into sys.storagemodelinput\n\tselect x.\"schema\", x.\"table\", x.\"column\",
x.\"type\", x.typewidth, x.count, 0, x.typewidth, false, x.sorted from
sys.storage() x;\n\n\tupdate sys.storagemodelinput\n\tset reference =
true\n\twhere concat(concat(\"schema\",\"table\"), \"column\") in (\n\t\tselect
concat( concat(\"fkschema\".\"name\", \"fktable\".\"name\"),
\"fkkeycol\".\"name\" )\n\t\tfrom\t\"sys\".\"keys\" as
\"fkkey\",\n\t\t\t\t\"sys\".\"objects\" as
\"fkkeycol\",\n\t\t\t\t\"sys\".\"tables\" as
\"fktable\",\n\t\t\t\t\"sys\".\"schemas\" as \"fkschema\"\n\t\twhere
\"fktable\".\"id\" = \"fkkey\".\"table_id\"\n\t\t\tand \"fkkey\".\"id\" =
\"fkkeycol\".\"id\"\n\t\t\tand \"fkschema\".\"id\" = \"fktable\".\"schema_id
\"\n\t\t\tand \"fkkey\".\"rkey\" > -1);\n\n\tupdate
sys.storagemodelinput\n\tset \"distinct\" = \"count\" -- assume all
distinct\n\twhere \"type\" = 'varchar' or \"type\"='clob';\nend;" "user"
true 2 false 2000
-6258 "columnsize" "-- The predicted storage footprint of the complete
database\n-- determines the amount of diskspace needed for persistent
storage\n-- and the upperbound when all possible index structures are
created.\n-- The storage requirement for foreign key joins is split amongst the
participants.\n\ncreate function sys.columnsize(nme string, i bigint, d
bigint)\nreturns bigint\nbegin\n\tcase\n\twhen nme = 'boolean' then return
i;\n\twhen nme = 'char' then return 2*i;\n\twhen nme = 'smallint' then return 2
* i;\n\twhen nme = 'int'\t then return 4 * i;\n\twhen nme = 'bigint'\t then
return 8 * i;\n\twhen nme = 'timestamp' then return 8 * i;\n\twhen nme =
'varchar' then\n\t\tcase\n\t\twhen cast(d as bigint) << 8 then return
i;\n\t\twhen cast(d as bigint) << 16 then return 2 * i;\n\t\twhen cast(d as
bigint) << 32 then return 4 * i;\n\t\telse return 8 * i;\n\t\tend case;\n\telse
return 8 * i;\n\tend case;\nend;" "user" true 1 false 2000
+6258 "columnsize" "-- The predicted storage footprint of the complete
database\n-- determines the amount of diskspace needed for persistent
storage\n-- and the upperbound when all possible index structures are
created.\n-- The storage requirement for foreign key joins is split amongst the
participants.\n\ncreate function sys.columnsize(nme string, i bigint, d
bigint)\nreturns bigint\nbegin\n\tcase\n\twhen nme = 'boolean' then return
i;\n\twhen nme = 'char' then return 2*i;\n\twhen nme = 'smallint' then return 2
* i;\n\twhen nme = 'int'\t then return 4 * i;\n\twhen nme = 'bigint'\t then
return 8 * i;\n\twhen nme = 'hugeint'\t then return 16 * i;\n\twhen nme =
'timestamp' then return 8 * i;\n\twhen nme = 'varchar'
then\n\t\tcase\n\t\twhen cast(d as bigint) << 8 then return i;\n\t\twhen cast(d
as bigint) << 16 then return 2 * i;\n\t\twhen cast(d as bigint) << 32 then
return 4 * i;\n\t\telse return 8 * i;\n\t\tend case;\n\telse return 8 *
i;\n\tend case;\nend;" "user" true 1 false 2000
6264 "heapsize" "create function sys.heapsize(tpe string, i bigint, w
int)\nreturns bigint\nbegin\n\tif tpe <> 'varchar' and tpe <>
'clob'\n\tthen\n\t\treturn 0;\n\tend if;\n\treturn 10240 + i * w;\nend;"
"user" true 1 false 2000
6270 "indexsize" "create function sys.indexsize(b boolean, i
bigint)\nreturns bigint\nbegin\n\t-- assume non-compound keys\n\tif b =
true\n\tthen\n\t\treturn 8 * i;\n\tend if;\n\treturn 0;\nend;" "user" true
1 false 2000
6285 "storagemodel" "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\tindices 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\tindexsize(i.\"reference\",
i.\"count\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" "user" true
1 false 2000
diff --git a/clients/Tests/SQL-dump_gsl.stable.out.oid32.int128
b/clients/Tests/SQL-dump_gsl.stable.out.oid32.int128
new file mode 100644
--- /dev/null
+++ b/clients/Tests/SQL-dump_gsl.stable.out.oid32.int128
@@ -0,0 +1,9208 @@
+stdout of test 'SQL-dump_gsl` in directory 'clients` itself:
+
+
+# 15:01:36 >
+# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34237" "--set"
"mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set"
"mal_listing=0"
+# 15:01:36 >
+
+# MonetDB 5 server v11.17.0 (hg id: 51cced809df4)
+# This is an unreleased version
+# Serving database 'mTests_clients', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:34237/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13451/.s.monetdb.34237
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 15:01:36 >
+# 15:01:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13451" "--port=34237"
+# 15:01:36 >
+
+SCHEMA tmp
+SCHEMA tmp
+SYSTEM SCHEMA sys
+SYSTEM TABLE sys._columns
+SYSTEM TABLE sys._tables
+SYSTEM TABLE sys.args
+SYSTEM TABLE sys.auths
+SYSTEM TABLE sys.connections
+SYSTEM TABLE sys.db_user_info
+SYSTEM TABLE sys.dependencies
+SYSTEM TABLE sys.functions
+SYSTEM TABLE sys.idxs
+SYSTEM TABLE sys.keys
+SYSTEM TABLE sys.objects
+SYSTEM TABLE sys.privileges
+SYSTEM TABLE sys.schemas
+SYSTEM TABLE sys.sequences
+SYSTEM TABLE sys.statistics
+SYSTEM TABLE sys.storagemodelinput
+SYSTEM TABLE sys.systemfunctions
+SYSTEM TABLE sys.triggers
+SYSTEM TABLE sys.types
+SYSTEM TABLE sys.user_role
+SYSTEM VIEW sys.columns
+SYSTEM VIEW sys.environment
+SYSTEM VIEW sys.optimizers
+SYSTEM VIEW sys.querylog_calls
+SYSTEM VIEW sys.querylog_catalog
+SYSTEM VIEW sys.querylog_history
+SYSTEM VIEW sys.queue
+SYSTEM VIEW sys.sessions
+SYSTEM VIEW sys.storage
+SYSTEM VIEW sys.storagemodel
+SYSTEM VIEW sys.tables
+SYSTEM VIEW sys.tablestoragemodel
+SYSTEM VIEW sys.tracelog
+SYSTEM VIEW sys.users
+SYSTEM FUNCTION sys.Intersect
+SYSTEM FUNCTION sys.Union
+SYSTEM FUNCTION sys.abbrev
+SYSTEM FUNCTION sys.alpha
+SYSTEM FUNCTION sys.analyze
+SYSTEM FUNCTION sys.area
+SYSTEM FUNCTION sys.astext
+SYSTEM FUNCTION sys.bbp
+SYSTEM FUNCTION sys.boundary
+SYSTEM FUNCTION sys.broadcast
+SYSTEM FUNCTION sys.buffer
+SYSTEM FUNCTION sys.chi2prob
+SYSTEM FUNCTION sys.cluster1
+SYSTEM FUNCTION sys.cluster2
+SYSTEM FUNCTION sys.columnsize
+SYSTEM FUNCTION sys.contains
+SYSTEM FUNCTION sys.convexhull
+SYSTEM FUNCTION sys.corr
+SYSTEM FUNCTION sys.crosses
+SYSTEM FUNCTION sys.date_to_str
+SYSTEM FUNCTION sys.db_users
+SYSTEM FUNCTION sys.degrees
+SYSTEM FUNCTION sys.dependencies_columns_on_functions
+SYSTEM FUNCTION sys.dependencies_columns_on_indexes
+SYSTEM FUNCTION sys.dependencies_columns_on_keys
+SYSTEM FUNCTION sys.dependencies_columns_on_triggers
+SYSTEM FUNCTION sys.dependencies_columns_on_views
+SYSTEM FUNCTION sys.dependencies_functions_on_functions
+SYSTEM FUNCTION sys.dependencies_functions_os_triggers
+SYSTEM FUNCTION sys.dependencies_keys_on_foreignkeys
+SYSTEM FUNCTION sys.dependencies_owners_on_schemas
+SYSTEM FUNCTION sys.dependencies_schemas_on_users
+SYSTEM FUNCTION sys.dependencies_tables_on_foreignkeys
+SYSTEM FUNCTION sys.dependencies_tables_on_functions
+SYSTEM FUNCTION sys.dependencies_tables_on_indexes
+SYSTEM FUNCTION sys.dependencies_tables_on_triggers
+SYSTEM FUNCTION sys.dependencies_tables_on_views
+SYSTEM FUNCTION sys.dependencies_views_on_functions
+SYSTEM FUNCTION sys.dependencies_views_on_triggers
+SYSTEM FUNCTION sys.difference
+SYSTEM FUNCTION sys.dimension
+SYSTEM FUNCTION sys.disjoint
+SYSTEM FUNCTION sys.distance
+SYSTEM FUNCTION sys.dropdictionary
+SYSTEM FUNCTION sys.env
+SYSTEM FUNCTION sys.envelope
+SYSTEM FUNCTION sys.environment
+SYSTEM FUNCTION sys.equals
+SYSTEM FUNCTION sys.evalalgebra
+SYSTEM FUNCTION sys.fuse
+SYSTEM FUNCTION sys.geomcollectionfromtext
+SYSTEM FUNCTION sys.geometrytypeid
+SYSTEM FUNCTION sys.geomfromtext
+SYSTEM FUNCTION sys.getanchor
+SYSTEM FUNCTION sys.getbasename
+SYSTEM FUNCTION sys.getcontent
+SYSTEM FUNCTION sys.getcontext
+SYSTEM FUNCTION sys.getdomain
+SYSTEM FUNCTION sys.getextension
+SYSTEM FUNCTION sys.getfile
+SYSTEM FUNCTION sys.gethost
+SYSTEM FUNCTION sys.getport
+SYSTEM FUNCTION sys.getprotocol
+SYSTEM FUNCTION sys.getquery
+SYSTEM FUNCTION sys.getroboturl
+SYSTEM FUNCTION sys.getuser
+SYSTEM FUNCTION sys.gzcompress
+SYSTEM FUNCTION sys.gzdecompress
+SYSTEM FUNCTION sys.gzexpand
+SYSTEM FUNCTION sys.gztruncate
+SYSTEM FUNCTION sys.heapsize
+SYSTEM FUNCTION sys.host
+SYSTEM FUNCTION sys.hostmask
+SYSTEM FUNCTION sys.ilike
+SYSTEM FUNCTION sys.indexsize
+SYSTEM FUNCTION sys.initializedictionary
+SYSTEM FUNCTION sys.intersection
+SYSTEM FUNCTION sys.isaurl
+SYSTEM FUNCTION sys.isempty
+SYSTEM FUNCTION sys.issimple
+SYSTEM FUNCTION sys.length
+SYSTEM FUNCTION sys.like
+SYSTEM FUNCTION sys.linefromtext
+SYSTEM FUNCTION sys.masklen
+SYSTEM FUNCTION sys.mbr
+SYSTEM FUNCTION sys.mbroverlaps
+SYSTEM FUNCTION sys.median
+SYSTEM FUNCTION sys.mlinefromtext
+SYSTEM FUNCTION sys.mpointfromtext
+SYSTEM FUNCTION sys.mpolyfromtext
+SYSTEM FUNCTION sys.ms_round
+SYSTEM FUNCTION sys.ms_str
+SYSTEM FUNCTION sys.ms_stuff
+SYSTEM FUNCTION sys.ms_trunc
+SYSTEM FUNCTION sys.netmask
+SYSTEM FUNCTION sys.network
+SYSTEM FUNCTION sys.newdictionary
+SYSTEM FUNCTION sys.newurl
+SYSTEM FUNCTION sys.optimizer_stats
+SYSTEM FUNCTION sys.optimizers
+SYSTEM FUNCTION sys.overlaps
+SYSTEM FUNCTION sys.password_hash
+SYSTEM FUNCTION sys.pause
+SYSTEM FUNCTION sys.point
+SYSTEM FUNCTION sys.pointfromtext
+SYSTEM FUNCTION sys.polyfromtext
+SYSTEM FUNCTION sys.polygonfromtext
+SYSTEM FUNCTION sys.quantile
+SYSTEM FUNCTION sys.querycache
+SYSTEM FUNCTION sys.querylog
+SYSTEM FUNCTION sys.querylog_calls
+SYSTEM FUNCTION sys.querylog_catalog
+SYSTEM FUNCTION sys.querylog_disable
+SYSTEM FUNCTION sys.querylog_empty
+SYSTEM FUNCTION sys.querylog_enable
+SYSTEM FUNCTION sys.queue
+SYSTEM FUNCTION sys.radians
+SYSTEM FUNCTION sys.relate
+SYSTEM FUNCTION sys.resume
+SYSTEM FUNCTION sys.reuse
+SYSTEM FUNCTION sys.reverse
+SYSTEM FUNCTION sys.sessions
+SYSTEM FUNCTION sys.setmasklen
+SYSTEM FUNCTION sys.setsession
+SYSTEM FUNCTION sys.settimeout
+SYSTEM FUNCTION sys.shrink
+SYSTEM FUNCTION sys.shutdown
+SYSTEM FUNCTION sys.srid
+SYSTEM FUNCTION sys.stddev_pop
+SYSTEM FUNCTION sys.stddev_samp
+SYSTEM FUNCTION sys.stop
+SYSTEM FUNCTION sys.storage
+SYSTEM FUNCTION sys.storagemodel
+SYSTEM FUNCTION sys.storagemodelinit
+SYSTEM FUNCTION sys.str_to_date
+SYSTEM FUNCTION sys.symdifference
+SYSTEM FUNCTION sys.text
+SYSTEM FUNCTION sys.times
+SYSTEM FUNCTION sys.touches
+SYSTEM FUNCTION sys.tracelog
+SYSTEM FUNCTION sys.vacuum
+SYSTEM FUNCTION sys.var
+SYSTEM FUNCTION sys.var_pop
+SYSTEM FUNCTION sys.var_samp
+SYSTEM FUNCTION sys.within
+SYSTEM FUNCTION sys.x
+SYSTEM FUNCTION sys.y
+SYSTEM FUNCTION sys.zorder_decode_x
+SYSTEM FUNCTION sys.zorder_decode_y
+SYSTEM FUNCTION sys.zorder_encode
+CREATE SCHEMA "tmp";
+CREATE SCHEMA "sys";
+CREATE TABLE "sys"."_columns" (
+ "id" INTEGER,
+ "name" VARCHAR(1024),
+ "type" VARCHAR(1024),
+ "type_digits" INTEGER,
+ "type_scale" INTEGER,
+ "table_id" INTEGER,
+ "default" VARCHAR(2048),
+ "null" BOOLEAN,
+ "number" INTEGER,
+ "storage" VARCHAR(2048)
+);
+CREATE TABLE "sys"."_tables" (
+ "id" INTEGER,
+ "name" VARCHAR(1024),
+ "schema_id" INTEGER,
+ "query" VARCHAR(2048),
+ "type" SMALLINT,
+ "system" BOOLEAN,
+ "commit_action" SMALLINT,
+ "readonly" BOOLEAN
+);
+CREATE TABLE "sys"."args" (
+ "id" INTEGER,
+ "func_id" INTEGER,
+ "name" VARCHAR(256),
+ "type" VARCHAR(1024),
+ "type_digits" INTEGER,
+ "type_scale" INTEGER,
+ "number" INTEGER
+);
+CREATE TABLE "sys"."auths" (
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
