Changeset: 25027e4c22ae for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25027e4c22ae Added Files: sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/All sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message:
Merge with Dec2016 branch. diffs (truncated from 14182 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 @@ -39,10 +39,16 @@ Ready. \dSv \dSs \dSf +\dn bam \dn json \dn profiler \dn sys \dn tmp +\dSt bam.export +\dSt bam.files +\dSt bam.pg +\dSt bam.rg +\dSt bam.sq \dSt sys._columns \dSt sys._tables \dSt sys.args @@ -55,6 +61,11 @@ Ready. \dSt sys.idxs \dSt sys.keys \dSt sys.keywords +\dSt sys.netcdf_attrs +\dSt sys.netcdf_dims +\dSt sys.netcdf_files +\dSt sys.netcdf_vardim +\dSt sys.netcdf_vars \dSt sys.objects \dSt sys.privileges \dSt sys.schemas @@ -94,6 +105,7 @@ Ready. \dSf sys."analyze" \dSf sys."bbp" \dSf sys."broadcast" +\dSf sys."chi2prob" \dSf sys."clearrejects" \dSf sys."columnsize" \dSf sys."contains" @@ -125,6 +137,8 @@ Ready. \dSf sys."environment" \dSf sys."epoch" \dSf sys."evalalgebra" +\dSf sys."fitsattach" +\dSf sys."fitsload" \dSf sys."flush_log" \dSf sys."fuse" \dSf sys."generate_series" @@ -157,7 +171,12 @@ Ready. \dSf sys."isauuid" \dSf sys."left_shift" \dSf sys."left_shift_assign" +\dSf sys."lidarattach" +\dSf sys."lidarexport" +\dSf sys."lidarload" \dSf sys."like" +\dSf sys."listdir" +\dSf sys."listdirpat" \dSf sys."malfunctions" \dSf sys."masklen" \dSf sys."mbr" @@ -167,6 +186,8 @@ Ready. \dSf sys."ms_str" \dSf sys."ms_stuff" \dSf sys."ms_trunc" +\dSf sys."netcdf_attach" +\dSf sys."netcdf_importvar" \dSf sys."netmask" \dSf sys."network" \dSf sys."newurl" @@ -194,6 +215,8 @@ Ready. \dSf sys."setmasklen" \dSf sys."setsession" \dSf sys."settimeout" +\dSf sys."shpattach" +\dSf sys."shpload" \dSf sys."shrink" \dSf sys."shutdown" \dSf sys."st_area" @@ -308,6 +331,7 @@ Ready. \dSf sys."var" \dSf sys."var_pop" \dSf sys."var_samp" +SYSTEM SCHEMA bam SYSTEM SCHEMA json SYSTEM SCHEMA profiler SYSTEM SCHEMA sys @@ -324,6 +348,11 @@ SYSTEM TABLE sys.functions SYSTEM TABLE sys.idxs SYSTEM TABLE sys.keys SYSTEM TABLE sys.keywords +SYSTEM TABLE sys.netcdf_attrs +SYSTEM TABLE sys.netcdf_dims +SYSTEM TABLE sys.netcdf_files +SYSTEM TABLE sys.netcdf_vardim +SYSTEM TABLE sys.netcdf_vars SYSTEM TABLE sys.objects SYSTEM TABLE sys.privileges SYSTEM TABLE sys.schemas @@ -380,6 +409,7 @@ SYSTEM FUNCTION sys.ceiling SYSTEM FUNCTION sys.char_length SYSTEM FUNCTION sys.character_length SYSTEM FUNCTION sys.charindex +SYSTEM FUNCTION sys.chi2prob SYSTEM FUNCTION sys.clearrejects SYSTEM FUNCTION sys.code SYSTEM FUNCTION sys.columnsize @@ -435,6 +465,8 @@ SYSTEM FUNCTION sys.epoch SYSTEM FUNCTION sys.evalalgebra SYSTEM FUNCTION sys.exist SYSTEM FUNCTION sys.exp +SYSTEM FUNCTION sys.fitsattach +SYSTEM FUNCTION sys.fitsload SYSTEM FUNCTION sys.floor SYSTEM FUNCTION sys.flush_log SYSTEM FUNCTION sys.fuse @@ -481,7 +513,12 @@ SYSTEM FUNCTION sys.left_shift SYSTEM FUNCTION sys.left_shift_assign SYSTEM FUNCTION sys.length SYSTEM FUNCTION sys.levenshtein +SYSTEM FUNCTION sys.lidarattach +SYSTEM FUNCTION sys.lidarexport +SYSTEM FUNCTION sys.lidarload SYSTEM FUNCTION sys.like +SYSTEM FUNCTION sys.listdir +SYSTEM FUNCTION sys.listdirpat SYSTEM FUNCTION sys.local_timezone SYSTEM FUNCTION sys.localtime SYSTEM FUNCTION sys.localtimestamp @@ -518,6 +555,8 @@ SYSTEM FUNCTION sys.ms_round SYSTEM FUNCTION sys.ms_str SYSTEM FUNCTION sys.ms_stuff SYSTEM FUNCTION sys.ms_trunc +SYSTEM FUNCTION sys.netcdf_attach +SYSTEM FUNCTION sys.netcdf_importvar SYSTEM FUNCTION sys.netmask SYSTEM FUNCTION sys.network SYSTEM FUNCTION sys.newurl @@ -574,6 +613,8 @@ SYSTEM FUNCTION sys.sessions SYSTEM FUNCTION sys.setmasklen SYSTEM FUNCTION sys.setsession SYSTEM FUNCTION sys.settimeout +SYSTEM FUNCTION sys.shpattach +SYSTEM FUNCTION sys.shpload SYSTEM FUNCTION sys.shrink SYSTEM FUNCTION sys.shutdown SYSTEM FUNCTION sys.sign @@ -718,10 +759,16 @@ SYSTEM FUNCTION sys.weekofyear SYSTEM FUNCTION sys.xor SYSTEM FUNCTION sys.year SYSTEM FUNCTION sys.zero_or_one +CREATE SCHEMA "bam" AUTHORIZATION "monetdb"; CREATE SCHEMA "json" AUTHORIZATION "monetdb"; CREATE SCHEMA "profiler" AUTHORIZATION "monetdb"; CREATE SCHEMA "sys"; CREATE SCHEMA "tmp"; +CREATE TABLE "bam"."export" ("qname" CHARACTER LARGE OBJECT NOT NULL, "flag" SMALLINT NOT NULL, "rname" CHARACTER LARGE OBJECT NOT NULL, "pos" INTEGER NOT NULL, "mapq" SMALLINT NOT NULL, "cigar" CHARACTER LARGE OBJECT NOT NULL, "rnext" CHARACTER LARGE OBJECT NOT NULL, "pnext" INTEGER NOT NULL, "tlen" INTEGER NOT NULL, "seq" CHARACTER LARGE OBJECT NOT NULL, "qual" CHARACTER LARGE OBJECT NOT NULL); +CREATE TABLE "bam"."files" ("file_id" BIGINT NOT NULL, "file_location" CHARACTER LARGE OBJECT NOT NULL, "dbschema" SMALLINT NOT NULL, "format_version" VARCHAR(7), "sorting_order" VARCHAR(10), "comments" CHARACTER LARGE OBJECT, CONSTRAINT "files_pkey_file_id" PRIMARY KEY ("file_id")); +CREATE TABLE "bam"."pg" ("id" CHARACTER LARGE OBJECT NOT NULL, "file_id" BIGINT NOT NULL, "pn" CHARACTER LARGE OBJECT, "cl" CHARACTER LARGE OBJECT, "pp" CHARACTER LARGE OBJECT, "vn" CHARACTER LARGE OBJECT, CONSTRAINT "pg_pkey_id_file_id" PRIMARY KEY ("id", "file_id"), CONSTRAINT "pg_fkey_file_id" FOREIGN KEY ("file_id") REFERENCES "bam"."files" ("file_id")); +CREATE TABLE "bam"."rg" ("id" CHARACTER LARGE OBJECT NOT NULL, "file_id" BIGINT NOT NULL, "cn" CHARACTER LARGE OBJECT, "ds" CHARACTER LARGE OBJECT, "dt" TIMESTAMP, "fo" CHARACTER LARGE OBJECT, "ks" CHARACTER LARGE OBJECT, "lb" CHARACTER LARGE OBJECT, "pg" CHARACTER LARGE OBJECT, "pi" INTEGER, "pl" CHARACTER LARGE OBJECT, "pu" CHARACTER LARGE OBJECT, "sm" CHARACTER LARGE OBJECT, CONSTRAINT "rg_pkey_id_file_id" PRIMARY KEY ("id", "file_id"), CONSTRAINT "rg_fkey_file_id" FOREIGN KEY ("file_id") REFERENCES "bam"."files" ("file_id")); +CREATE TABLE "bam"."sq" ("sn" CHARACTER LARGE OBJECT NOT NULL, "file_id" BIGINT NOT NULL, "ln" INTEGER, "as" INTEGER, "m5" CHARACTER LARGE OBJECT, "sp" CHARACTER LARGE OBJECT, "ur" CHARACTER LARGE OBJECT, CONSTRAINT "sq_pkey_sn_file_id" PRIMARY KEY ("sn", "file_id"), CONSTRAINT "sq_fkey_file_id" FOREIGN KEY ("file_id") REFERENCES "bam"."files" ("file_id")); 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, "access" SMALLINT); CREATE TABLE "sys"."args" ("id" INTEGER, "func_id" INTEGER, "name" VARCHAR(256), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale" INTEGER, "inout" TINYINT, "number" INTEGER); @@ -734,6 +781,11 @@ CREATE TABLE "sys"."functions" ("id" INT CREATE TABLE "sys"."idxs" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER, "name" VARCHAR(1024)); CREATE TABLE "sys"."keys" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER, "name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER); CREATE TABLE "sys"."keywords" ("keyword" VARCHAR(40) NOT NULL, CONSTRAINT "keywords_keyword_pkey" PRIMARY KEY ("keyword")); +CREATE TABLE "sys"."netcdf_attrs" ("obj_name" VARCHAR(256), "att_name" VARCHAR(256), "att_type" VARCHAR(64), "value" CHARACTER LARGE OBJECT, "file_id" INTEGER, "gr_name" VARCHAR(256)); +CREATE TABLE "sys"."netcdf_dims" ("dim_id" INTEGER, "file_id" INTEGER, "name" VARCHAR(64), "length" INTEGER); +CREATE TABLE "sys"."netcdf_files" ("file_id" INTEGER, "location" CHAR(256)); +CREATE TABLE "sys"."netcdf_vardim" ("var_id" INTEGER, "dim_id" INTEGER, "file_id" INTEGER, "dimpos" INTEGER); +CREATE TABLE "sys"."netcdf_vars" ("var_id" INTEGER, "file_id" INTEGER, "name" VARCHAR(64), "vartype" VARCHAR(64), "ndim" INTEGER, "coord_dim_id" INTEGER); CREATE TABLE "sys"."objects" ("id" INTEGER, "name" VARCHAR(1024), "nr" INTEGER); CREATE TABLE "sys"."privileges" ("obj_id" INTEGER, "auth_id" INTEGER, "privileges" INTEGER, "grantor" INTEGER, "grantable" INTEGER); CREATE TABLE "sys"."schemas" ("id" INTEGER, "name" VARCHAR(1024), "authorization" INTEGER, "owner" INTEGER, "system" BOOLEAN); @@ -776,6 +828,7 @@ create procedure sys.analyze(minmax int, create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; create function sys.bbp () returns table (id int, name string, ttype string, count bigint, refcnt int, lrefcnt int, location string, heat int, dirty string, status string, kind string) external name bbp.get; create function "broadcast" (p inet) returns inet external name inet."broadcast"; +create function sys.chi2prob(chi2 double, datapoints double) returns double external name gsl."chi2prob"; create procedure sys.clearrejects() external name sql.copy_rejects_clear; create function sys.columnsize(nme string, i bigint, d bigint) returns bigint begin case when nme = 'boolean' then return i; when nme = 'char' then return 2*i; 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 when cast(d as bigint) << 8 then return i; when cast(d as bigint) << 16 then return 2 * i; when cast(d as bigint) << 32 then return 4 * i; else return 8 * i; end case; else return 8 * i; end case; end; create function contains(a geometry, x double, y double) returns boolean external name geom."Contains"; @@ -816,6 +869,8 @@ create function sys."epoch"(sec int) ret create function sys."epoch"(ts timestamp) returns int external name timestamp."epoch"; create function sys."epoch"(ts timestamp with time zone) returns int external name timestamp."epoch"; create procedure sys.evalalgebra(ra_stmt string, opt bool) external name sql."evalAlgebra"; +create procedure fitsattach(fname string) external name fits.attach; +create procedure fitsload(tname string) external name fits.load; create procedure sys.flush_log () external name sql."flush_log"; create function fuse(one tinyint, two tinyint) returns smallint external name udf.fuse; create function fuse(one smallint, two smallint) returns integer external name udf.fuse; @@ -865,8 +920,13 @@ create function isaurl(theurl url) retur create function sys.isauuid(s string) returns boolean external name uuid."isaUUID"; create function "left_shift"(i1 inet, i2 inet) returns boolean external name inet."<<"; create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; +create procedure lidarattach(fname string) external name lidar.attach; +create procedure lidarexport(tname string, fname string, format string) external name lidar.export; +create procedure lidarload(tname string) external name lidar.load; create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; +create procedure listdir(dirname string) external name fits.listdir; +create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; create function sys.malfunctions() returns table("module" string, "function" string, "signature" string, "address" string, "comment" string) external name "manual"."functions"; create function "masklen" (p inet) returns int external name inet."masklen"; create function mbr(geom geometry) returns mbr external name geom."mbr"; @@ -886,6 +946,8 @@ create function ms_round(num double, prc create function ms_str(num float, prc int, truncat int) returns string begin return cast(num as string); end; create function ms_stuff(s1 varchar(32), st int, len int, s3 varchar(32)) returns varchar(32) begin declare res varchar(32), aux varchar(32); declare ofset int; if (st < 0 or st > length(s1)) then return ''; end if; set ofset = 1; set res = substring(s1,ofset,st-1); set res = res || s3; set ofset = st + len; set aux = substring(s1,ofset,length(s1)-ofset+1); set res = res || aux; return res; end; create function ms_trunc(num double, prc int) returns double external name sql.ms_trunc; +create procedure netcdf_attach(fname varchar(256)) external name netcdf.attach; +create procedure netcdf_importvar(fid integer, varnname varchar(256)) external name netcdf.importvariable; create function "netmask" (p inet) returns inet external name inet."netmask"; create function "network" (p inet) returns inet external name inet."network"; create function newurl(protocol string, hostname string, "port" int, file string) returns url external name url."new"; @@ -928,6 +990,9 @@ create function "setmasklen" (p inet, ma create procedure sys.setsession("timeout" bigint) external name sql.setsession; create procedure sys.settimeout("query" bigint) external name sql.settimeout; create procedure sys.settimeout("query" bigint, "session" bigint) external name sql.settimeout; +create procedure shpattach(fname string) external name shp.attach; +create procedure shpload(fid integer) external name shp.load; +create procedure shpload(fid integer, filter geometry) external name shp.import; create procedure shrink(sys string, tab string) external name sql.shrink; create procedure sys.shutdown(delay tinyint) external name sql.shutdown; create procedure sys.shutdown(delay tinyint, force bool) external name sql.shutdown; @@ -1196,17 +1261,21 @@ drop function pcre_replace(string, strin % name, authorization, owner, system # name % varchar, int, int, boolean # type % 8, 1, 1, 5 # length +[ "bam", 3, 3, true ] [ "json", 3, 3, true ] [ "profiler", 3, 3, true ] [ "sys", 2, 3, true ] [ "tmp", 2, 3, true ] -#select s.name, t.name, replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.* -#', '', ''), '[ -#]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, t.type, t.system, t.commit_action, t.access from sys._tables t left outer join sys.schemas s on t.schema_id = s.id order by s.name, t.name; -% .s, .t, .L, .t, .t, .t, .t # table_name +#select s.name, t.name, replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '', ''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, t.type, t.system, t.commit_action, t.access from sys._tables t left outer join sys.schemas s on t.schema_id = s.id order by s.name, t.name; +% .s, .t, .L1, .t, .t, .t, .t # table_name % name, name, query, type, system, commit_action, access # name % varchar, varchar, varchar, smallint, boolean, smallint, smallint # type % 3, 17, 597, 1, 5, 1, 1 # length +[ "bam", "export", NULL, 0, true, 0, 0 ] +[ "bam", "files", NULL, 0, true, 0, 0 ] +[ "bam", "pg", NULL, 0, true, 0, 0 ] +[ "bam", "rg", NULL, 0, true, 0, 0 ] +[ "bam", "sq", NULL, 0, true, 0, 0 ] [ "sys", "_columns", NULL, 0, true, 0, 0 ] [ "sys", "_tables", NULL, 0, true, 0, 0 ] [ "sys", "args", NULL, 0, true, 0, 0 ] @@ -1222,6 +1291,11 @@ drop function pcre_replace(string, strin [ "sys", "idxs", NULL, 0, true, 0, 0 ] [ "sys", "keys", NULL, 0, true, 0, 0 ] [ "sys", "keywords", NULL, 0, true, 0, 0 ] +[ "sys", "netcdf_attrs", NULL, 0, true, 0, 0 ] +[ "sys", "netcdf_dims", NULL, 0, true, 0, 0 ] +[ "sys", "netcdf_files", NULL, 0, true, 0, 0 ] +[ "sys", "netcdf_vardim", NULL, 0, true, 0, 0 ] +[ "sys", "netcdf_vars", NULL, 0, true, 0, 0 ] [ "sys", "objects", NULL, 0, true, 0, 0 ] [ "sys", "optimizers", "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, 0 ] [ "sys", "privileges", NULL, 0, true, 0, 0 ] @@ -1333,6 +1407,23 @@ drop function pcre_replace(string, strin [ "dependency_types", "dependency_type_name", "varchar", 15, 0, NULL, false, 1, NULL ] [ "environment", "name", "clob", 0, 0, NULL, true, 0, NULL ] [ "environment", "value", "clob", 0, 0, NULL, true, 1, NULL ] +[ "export", "qname", "clob", 0, 0, NULL, false, 0, NULL ] +[ "export", "flag", "smallint", 16, 0, NULL, false, 1, NULL ] +[ "export", "rname", "clob", 0, 0, NULL, false, 2, NULL ] +[ "export", "pos", "int", 32, 0, NULL, false, 3, NULL ] +[ "export", "mapq", "smallint", 16, 0, NULL, false, 4, NULL ] +[ "export", "cigar", "clob", 0, 0, NULL, false, 5, NULL ] +[ "export", "rnext", "clob", 0, 0, NULL, false, 6, NULL ] +[ "export", "pnext", "int", 32, 0, NULL, false, 7, NULL ] +[ "export", "tlen", "int", 32, 0, NULL, false, 8, NULL ] +[ "export", "seq", "clob", 0, 0, NULL, false, 9, NULL ] +[ "export", "qual", "clob", 0, 0, NULL, false, 10, NULL ] +[ "files", "file_id", "bigint", 64, 0, NULL, false, 0, NULL ] +[ "files", "file_location", "clob", 0, 0, NULL, false, 1, NULL ] +[ "files", "dbschema", "smallint", 16, 0, NULL, false, 2, NULL ] +[ "files", "format_version", "varchar", 7, 0, NULL, true, 3, NULL ] +[ "files", "sorting_order", "varchar", 10, 0, NULL, true, 4, NULL ] +[ "files", "comments", "clob", 0, 0, NULL, true, 5, NULL ] [ "functions", "id", "int", 32, 0, NULL, true, 0, NULL ] [ "functions", "name", "varchar", 256, 0, NULL, true, 1, NULL ] [ "functions", "func", "varchar", 8196, 0, NULL, true, 2, NULL ] @@ -1371,6 +1462,28 @@ drop function pcre_replace(string, strin [ "keys", "action", "int", 32, 0, NULL, true, 5, NULL ] [ "keys", "action", "int", 32, 0, NULL, true, 5, NULL ] [ "keywords", "keyword", "varchar", 40, 0, NULL, false, 0, NULL ] +[ "netcdf_attrs", "obj_name", "varchar", 256, 0, NULL, true, 0, NULL ] +[ "netcdf_attrs", "att_name", "varchar", 256, 0, NULL, true, 1, NULL ] +[ "netcdf_attrs", "att_type", "varchar", 64, 0, NULL, true, 2, NULL ] +[ "netcdf_attrs", "value", "clob", 0, 0, NULL, true, 3, NULL ] +[ "netcdf_attrs", "file_id", "int", 32, 0, NULL, true, 4, NULL ] +[ "netcdf_attrs", "gr_name", "varchar", 256, 0, NULL, true, 5, NULL ] +[ "netcdf_dims", "dim_id", "int", 32, 0, NULL, true, 0, NULL ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list