Changeset: b3260b4ba45b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3260b4ba45b
Added Files:
clients/Tests/SQL-dump.stable.out.oid32.int128
Modified Files:
clients/Tests/SQL-dump.stable.out.oid32
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 9643 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out.oid32
b/clients/Tests/SQL-dump.stable.out.oid32
--- a/clients/Tests/SQL-dump.stable.out.oid32
+++ b/clients/Tests/SQL-dump.stable.out.oid32
@@ -5543,7 +5543,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 229 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 227 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5269 7
364 5269 7
866 5269 7
@@ -5576,7 +5576,6 @@ 2086 5567 7
2090 5567 7
2083 5567 7
2079 5567 7
-34 5567 7
5201 5572 7
2047 5572 7
2046 5572 7
@@ -5629,7 +5628,6 @@ 2087 5597 7
2103 5597 7
2102 5597 7
2104 5597 7
-34 5597 7
31 5597 7
30 5597 7
32 5597 7
@@ -6907,7 +6905,7 @@ 5489 "querylog_disable" "create procedur
5491 "tracelog" "-- 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--
make the offline tracing table available for inspection\ncreate function
sys.tracelog() \n\treturns table (\n\t\tevent integer,\t\t-- event
counter\n\t\tclk varchar(20), \t-- wallclock, no mtime in kernel\n\t\tpc
varchar(50), \t-- module.function[nr]\n\t\tthread int, \t\t-- thread
identifier\n\t\tticks bigint, \t\t-- time in microseconds\n\t\trrsmb bigint,
\t\t-- resident memory in MB\n\t\tvmmb bigint, \t\t-- virtual size in
MB\n\t\treads bigint, \t\t-- number of blocks read\n\t\twrites bigint, \t\t--
number of blocks written\n\t\tminflt bigint, \t\t-- minor page
faults\n\t\tmajflt bigint, \t\t-- major page faults\n\t\tnvcsw bigint, \t\t--
non-volantary conext switch\n\t\tstmt string\t\t\t-- actual statement executed\n
\t)\n\texternal name sql.dump_trace;" "sql" 1 5 false false
false 2000
5521 "profiler_openstream" "create procedure profiler_openstream(host
string, port int) external name profiler.""openStream"";" "profiler" 1
2 true false false 2000
5525 "profiler_stethoscope" "create procedure profiler_stethoscope(ticks
int) external name profiler.stethoscope;" "profiler" 1 2 true
false false 2000
-5528 "epoch" "-- 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-- assume milliseconds when converted to
TIMESTAMP\ncreate function ""epoch""(sec bigint) returns timestamp\n
external name timestamp.""epoch"";" "timestamp" 1 1 false
false false 2000
+5528 "epoch" "-- 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-- assume milliseconds when converted to
TIMESTAMP\ncreate function ""epoch""(sec bigint) returns timestamp\n\texternal
name timestamp.""epoch"";" "timestamp" 1 1 false false
false 2000
5532 "epoch" "create function ""epoch""(sec int) returns
timestamp\n\texternal name timestamp.""epoch"";" "timestamp" 1 1
false false false 2000
5536 "epoch" "create function ""epoch""(ts timestamp) returns
int\n\texternal name timestamp.""epoch"";" "timestamp" 1 1
false false false 2000
5540 "shrink" "-- 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--
Vacuum a relational table should be done with care.\n-- For, the oid's are used
in join-indices.\n\n-- Vacuum of tables may improve IO performance and disk
footprint.\n-- The foreign key constraints should be dropped before\n-- and
re-established after the cluster operation.\n\ncreate procedure shrink(sys
string, tab string)\n\texternal name sql.shrink;" "sql" 1 2
true false false 2000
@@ -7090,7 +7088,7 @@ 6374 "text" "create function json.text(j
6378 "output" "-- The remainder awaits the implementation \n\ncreate
aggregate json.output(js json)\nreturns string external name json.output;"
"json" 1 3 false false false 6294
6382 "tojsonarray" "-- create function json.object(*) returns json
external name json.objectrender;\n\n-- create function json.array(*) returns
json external name json.arrayrender;\n\n-- unnesting the JSON structure\n\n--
create function json.unnest(js json)\n-- returns table( id integer, k string, v
string) external name json.unnest;\n\n-- create function json.unnest(js
json)\n-- returns table( k string, v string) external name json.unnest;\n\n--
create function json.unnest(js json)\n-- returns table( v string) external name
json.unnest;\n\n-- create function json.nest table( id integer, k string, v
string)\n-- returns json external name json.nest;\n\ncreate aggregate
json.tojsonarray( x string ) returns string external name aggr.jsonaggr;"
"aggr" 1 3 false false false 6294
6386 "tojsonarray" "create aggregate json.tojsonarray( x double ) returns
string external name aggr.jsonaggr;" "aggr" 1 3 false false
false 6294
-6390 "md5" "-- 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-- (co) Arjen de Rijke\n-- Functions
supporting jsonstore\n\ncreate function sys.md5(v string)\nreturns string
external name clients.md5sum;" "clients" 1 1 false false
false 2000
+6390 "md5" "-- 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-- (co) Arjen de Rijke\n\ncreate function
sys.md5(v string)\nreturns string external name clients.md5sum;" "clients"
1 1 false false false 2000
6395 "uuid" "-- generate a new uuid\ncreate function sys.uuid()\nreturns
uuid external name uuid.""new"";" "uuid" 1 1 false false
false 2000
6398 "isauuid" "create function sys.isauuid(u uuid)\nreturns uuid
external name uuid.""isaUUID"";" "uuid" 1 1 false false
false 2000
6402 "isauuid" "create function sys.isauuid(u string)\nreturns uuid
external name uuid.""isaUUID"";" "uuid" 1 1 false false
false 2000
diff --git a/clients/Tests/SQL-dump.stable.out.oid32.int128
b/clients/Tests/SQL-dump.stable.out.oid32.int128
new file mode 100644
--- /dev/null
+++ b/clients/Tests/SQL-dump.stable.out.oid32.int128
@@ -0,0 +1,9592 @@
+stdout of test 'SQL-dump` 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-2015 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: 41_md5sum.sql
+# loading sql script: 45_uuid.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 >
+
+SYSTEM SCHEMA bam
+SYSTEM SCHEMA json
+SYSTEM SCHEMA sys
+SYSTEM SCHEMA tmp
+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.columnsize
+SYSTEM FUNCTION sys.contains
+SYSTEM FUNCTION sys.convert
+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.env
+SYSTEM FUNCTION sys.envelope
+SYSTEM FUNCTION sys.environment
+SYSTEM FUNCTION sys.epoch
+SYSTEM FUNCTION sys.equals
+SYSTEM FUNCTION sys.evalalgebra
+SYSTEM FUNCTION sys.fitsattach
+SYSTEM FUNCTION sys.fitsload
+SYSTEM FUNCTION sys.fuse
+SYSTEM FUNCTION sys.generate_series
+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.hashsize
+SYSTEM FUNCTION sys.heapsize
+SYSTEM FUNCTION sys.host
+SYSTEM FUNCTION sys.hostmask
+SYSTEM FUNCTION sys.ilike
+SYSTEM FUNCTION sys.imprintsize
+SYSTEM FUNCTION sys.intersection
+SYSTEM FUNCTION sys.isaurl
+SYSTEM FUNCTION sys.isauuid
+SYSTEM FUNCTION sys.isempty
+SYSTEM FUNCTION sys.issimple
+SYSTEM FUNCTION sys.left_shift
+SYSTEM FUNCTION sys.left_shift_assign
+SYSTEM FUNCTION sys.length
+SYSTEM FUNCTION sys.like
+SYSTEM FUNCTION sys.linefromtext
+SYSTEM FUNCTION sys.listdir
+SYSTEM FUNCTION sys.listdirpat
+SYSTEM FUNCTION sys.masklen
+SYSTEM FUNCTION sys.mbr
+SYSTEM FUNCTION sys.mbroverlaps
+SYSTEM FUNCTION sys.md5
+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.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.profiler_openstream
+SYSTEM FUNCTION sys.profiler_stethoscope
+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.right_shift
+SYSTEM FUNCTION sys.right_shift_assign
+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.uuid
+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
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
