Changeset: 4963b9c0d305 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4963b9c0d305 Modified Files: clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_none.stable.out Branch: Oct2014 Log Message:
updated SQL-dump.sql according to ((not that) recent) schema changes diffs (truncated from 614 to 300 lines): diff --git a/clients/Tests/SQL-dump.sql b/clients/Tests/SQL-dump.sql --- a/clients/Tests/SQL-dump.sql +++ b/clients/Tests/SQL-dump.sql @@ -10,6 +10,8 @@ \dSs \dSf +\dn bam +\dn json \dn tmp \dSn sys @@ -94,13 +96,13 @@ \dSf sys.dimension \dSf sys.disjoint \dSf sys.distance -\dSf sys.dropdictionary \dSf sys.env \dSf sys.envelope \dSf sys.environment \dSf sys.equals \dSf sys.evalalgebra \dSf sys.fuse +\dSf sys.generate_series \dSf sys.geomcollectionfromtext \dSf sys.geometrytypeid \dSf sys.geomfromtext @@ -117,29 +119,17 @@ \dSf sys.getquery \dSf sys.getroboturl \dSf sys.getuser -\dSf sys.gzcompress -\dSf sys.gzdecompress -\dSf sys.gzexpand -\dSf sys.gztruncate +\dSf sys.hashsize \dSf sys.heapsize \dSf sys.host \dSf sys.hostmask \dSf sys.ilike -\dSf sys.indexsize -\dSf sys.initializedictionary +\dSf sys.imprintsize \dSf sys.intersection \dSf sys.isaurl \dSf sys.isauuid \dSf sys.isempty \dSf sys.issimple -\dSf sys.json_filter -\dSf sys.json_filter_all -\dSf sys.json_isvalid -\dSf sys.json_isvalidarray -\dSf sys.json_isvalidobject -\dSf sys.json_length -\dSf sys.json_path -\dSf sys.json_text \dSf sys.length \dSf sys.like \dSf sys.linefromtext @@ -157,7 +147,6 @@ \dSf sys.ms_trunc \dSf sys.netmask \dSf sys.network -\dSf sys.newdictionary \dSf sys.newurl \dSf sys.optimizer_stats \dSf sys.optimizers diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -240,6 +240,7 @@ SYSTEM FUNCTION sys.y SYSTEM FUNCTION sys.zorder_decode_x SYSTEM FUNCTION sys.zorder_decode_y SYSTEM FUNCTION sys.zorder_encode +CREATE SCHEMA "json" AUTHORIZATION "monetdb"; CREATE SCHEMA "tmp"; CREATE SCHEMA "sys"; CREATE TABLE "sys"."_columns" ( @@ -684,6 +685,55 @@ returns integer external name udf.fuse; -- fuse two (4-byte) integer values into one (8-byte) bigint value create function fuse(one integer, two integer) returns bigint external name udf.fuse; +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://www.monetdb.org/Legal/MonetDBLicense +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +-- Copyright August 2008-2014 MonetDB B.V. +-- All Rights Reserved. + +-- (c) Author M.Kersten + +create function sys.generate_series(first tinyint, last tinyint) +returns table (value tinyint) +external name generator.series; +create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint) +returns table (value tinyint) +external name generator.series; +create function sys.generate_series(first int, last int) +returns table (value int) +external name generator.series; +create function sys.generate_series(first int, last int, stepsize int) +returns table (value int) +external name generator.series; +create function sys.generate_series(first bigint, last bigint) +returns table (value bigint) +external name generator.series; +create function sys.generate_series(first bigint, last bigint, stepsize bigint) +returns table (value bigint) +external name generator.series; +create function sys.generate_series(first real, last real, stepsize real) +returns table (value real) +external name generator.series; +create function sys.generate_series(first double, last double, stepsize double) +returns table (value double) +external name generator.series; +create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2)) +returns table (value decimal(10,2)) +external name generator.series; +create function sys.generate_series(first timestamp, last timestamp, stepsize interval second) +returns table (value timestamp) +external name generator.series; create function geomcollectionfromtext(wkt string, srid smallint) returns multipolygon external name geom."GeomCollectionFromText"; create function geometrytypeid(g geometry) returns integer external name geom."GeometryTypeId"; -- The srid in the *FromText Functions is currently not used @@ -714,6 +764,16 @@ create function getroboturl(theurl url) external name url."getRobotURL"; create function getuser(theurl url) returns string external name url."getUser"; +create function sys.hashsize(b boolean, i bigint) +returns bigint +begin + -- assume non-compound keys + if b = true + then + return 8 * i; + end if; + return 0; +end; create function sys.heapsize(tpe string, i bigint, w int) returns bigint begin @@ -728,6 +788,24 @@ create function "host" (p inet) returns create function "hostmask" (p inet) returns inet external name inet."hostmask"; create filter function "ilike"(val string, pat string, esc string) external name algebra.ilikesubselect; +create function sys.imprintsize(i bigint, nme string) +returns bigint +begin + if nme = 'boolean' + or nme = 'tinyint' + or nme = 'smallint' + or nme = 'int' + or nme = 'bigint' + or nme = 'decimal' + or nme = 'date' + or nme = 'timestamp' + or nme = 'real' + or nme = 'double' + then + return cast( i * 0.12 as bigint); + end if ; + return 0; +end; create function intersection(a geometry, b geometry) returns geometry external name geom."Intersection"; create function isaurl(theurl url) returns bool external name url."isaURL"; diff --git a/clients/Tests/SQL-dump.stable.out.64bit.oid32 b/clients/Tests/SQL-dump.stable.out.64bit.oid32 --- a/clients/Tests/SQL-dump.stable.out.64bit.oid32 +++ b/clients/Tests/SQL-dump.stable.out.64bit.oid32 @@ -240,6 +240,7 @@ SYSTEM FUNCTION sys.y SYSTEM FUNCTION sys.zorder_decode_x SYSTEM FUNCTION sys.zorder_decode_y SYSTEM FUNCTION sys.zorder_encode +CREATE SCHEMA "json" AUTHORIZATION "monetdb"; CREATE SCHEMA "tmp"; CREATE SCHEMA "sys"; CREATE TABLE "sys"."_columns" ( @@ -684,6 +685,55 @@ returns integer external name udf.fuse; -- fuse two (4-byte) integer values into one (8-byte) bigint value create function fuse(one integer, two integer) returns bigint external name udf.fuse; +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://www.monetdb.org/Legal/MonetDBLicense +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +-- Copyright August 2008-2014 MonetDB B.V. +-- All Rights Reserved. + +-- (c) Author M.Kersten + +create function sys.generate_series(first tinyint, last tinyint) +returns table (value tinyint) +external name generator.series; +create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint) +returns table (value tinyint) +external name generator.series; +create function sys.generate_series(first int, last int) +returns table (value int) +external name generator.series; +create function sys.generate_series(first int, last int, stepsize int) +returns table (value int) +external name generator.series; +create function sys.generate_series(first bigint, last bigint) +returns table (value bigint) +external name generator.series; +create function sys.generate_series(first bigint, last bigint, stepsize bigint) +returns table (value bigint) +external name generator.series; +create function sys.generate_series(first real, last real, stepsize real) +returns table (value real) +external name generator.series; +create function sys.generate_series(first double, last double, stepsize double) +returns table (value double) +external name generator.series; +create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2)) +returns table (value decimal(10,2)) +external name generator.series; +create function sys.generate_series(first timestamp, last timestamp, stepsize interval second) +returns table (value timestamp) +external name generator.series; create function geomcollectionfromtext(wkt string, srid smallint) returns multipolygon external name geom."GeomCollectionFromText"; create function geometrytypeid(g geometry) returns integer external name geom."GeometryTypeId"; -- The srid in the *FromText Functions is currently not used @@ -714,6 +764,16 @@ create function getroboturl(theurl url) external name url."getRobotURL"; create function getuser(theurl url) returns string external name url."getUser"; +create function sys.hashsize(b boolean, i bigint) +returns bigint +begin + -- assume non-compound keys + if b = true + then + return 8 * i; + end if; + return 0; +end; create function sys.heapsize(tpe string, i bigint, w int) returns bigint begin @@ -728,6 +788,24 @@ create function "host" (p inet) returns create function "hostmask" (p inet) returns inet external name inet."hostmask"; create filter function "ilike"(val string, pat string, esc string) external name algebra.ilikesubselect; +create function sys.imprintsize(i bigint, nme string) +returns bigint +begin + if nme = 'boolean' + or nme = 'tinyint' + or nme = 'smallint' + or nme = 'int' + or nme = 'bigint' + or nme = 'decimal' + or nme = 'date' + or nme = 'timestamp' + or nme = 'real' + or nme = 'double' + then + return cast( i * 0.12 as bigint); + end if ; + return 0; +end; create function intersection(a geometry, b geometry) returns geometry external name geom."Intersection"; create function isaurl(theurl url) returns bool external name url."isaURL"; diff --git a/clients/Tests/SQL-dump_all.stable.out b/clients/Tests/SQL-dump_all.stable.out --- a/clients/Tests/SQL-dump_all.stable.out +++ b/clients/Tests/SQL-dump_all.stable.out @@ -243,6 +243,8 @@ SYSTEM FUNCTION sys.y SYSTEM FUNCTION sys.zorder_decode_x SYSTEM FUNCTION sys.zorder_decode_y SYSTEM FUNCTION sys.zorder_encode +CREATE SCHEMA "bam" AUTHORIZATION "monetdb"; +CREATE SCHEMA "json" AUTHORIZATION "monetdb"; CREATE SCHEMA "tmp"; CREATE SCHEMA "sys"; CREATE TABLE "sys"."_columns" ( @@ -710,6 +712,55 @@ returns integer external name udf.fuse; -- fuse two (4-byte) integer values into one (8-byte) bigint value create function fuse(one integer, two integer) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
