Changeset: 048f9571b293 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=048f9571b293 Added Files: sql/backends/monet5/vaults/72_fits.sql Removed Files: sql/backends/monet5/vaults/fits.sql Modified Files: clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/exports.stable.out sql/backends/monet5/vaults/Makefile.ag Branch: default Log Message:
Install fits functions in SQL catalog when creating a new database. diffs (truncated from 3373 to 300 lines): 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 @@ -141,6 +141,8 @@ 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 @@ -173,6 +175,8 @@ SYSTEM FUNCTION sys.issimple 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 @@ -1792,101 +1796,101 @@ 5745 "progress" "int" 32 0 5749 NULL tru 5746 "status" "clob" 0 0 5749 NULL true 5 NULL 5747 "tag" "oid" 63 0 5749 NULL true 6 NULL 5748 "query" "clob" 0 0 5749 NULL true 7 NULL -6393 "schema" "clob" 0 0 6405 NULL true 0 NULL -6394 "table" "clob" 0 0 6405 NULL true 1 NULL -6395 "column" "clob" 0 0 6405 NULL true 2 NULL -6396 "type" "clob" 0 0 6405 NULL true 3 NULL -6397 "location" "clob" 0 0 6405 NULL true 4 NULL -6398 "count" "bigint" 64 0 6405 NULL true 5 NULL -6399 "typewidth" "int" 32 0 6405 NULL true 6 NULL -6400 "columnsize" "bigint" 64 0 6405 NULL true 7 NULL -6401 "heapsize" "bigint" 64 0 6405 NULL true 8 NULL -6402 "hashes" "bigint" 64 0 6405 NULL true 9 NULL -6403 "imprints" "bigint" 64 0 6405 NULL true 10 NULL -6404 "sorted" "boolean" 1 0 6405 NULL true 11 NULL -6407 "schema" "clob" 0 0 6417 NULL true 0 NULL -6408 "table" "clob" 0 0 6417 NULL true 1 NULL -6409 "column" "clob" 0 0 6417 NULL true 2 NULL -6410 "type" "clob" 0 0 6417 NULL true 3 NULL -6411 "typewidth" "int" 32 0 6417 NULL true 4 NULL -6412 "count" "bigint" 64 0 6417 NULL true 5 NULL -6413 "distinct" "bigint" 64 0 6417 NULL true 6 NULL -6414 "atomwidth" "int" 32 0 6417 NULL true 7 NULL -6415 "reference" "boolean" 1 0 6417 NULL true 8 NULL -6416 "sorted" "boolean" 1 0 6417 NULL true 9 NULL -6455 "schema" "clob" 0 0 6465 NULL true 0 NULL -6456 "table" "clob" 0 0 6465 NULL true 1 NULL -6457 "column" "clob" 0 0 6465 NULL true 2 NULL -6458 "type" "clob" 0 0 6465 NULL true 3 NULL -6459 "count" "bigint" 64 0 6465 NULL true 4 NULL -6460 "columnsize" "bigint" 64 0 6465 NULL true 5 NULL -6461 "heapsize" "bigint" 64 0 6465 NULL true 6 NULL -6462 "hashes" "bigint" 64 0 6465 NULL true 7 NULL -6463 "imprints" "bigint" 64 0 6465 NULL true 8 NULL -6464 "sorted" "boolean" 1 0 6465 NULL true 9 NULL -6467 "schema" "clob" 0 0 6475 NULL true 0 NULL -6468 "table" "clob" 0 0 6475 NULL true 1 NULL -6469 "count" "bigint" 64 0 6475 NULL true 2 NULL -6470 "columnsize" "bigint" 64 0 6475 NULL true 3 NULL -6471 "heapsize" "bigint" 64 0 6475 NULL true 4 NULL -6472 "hashes" "bigint" 64 0 6475 NULL true 5 NULL -6473 "imprints" "bigint" 64 0 6475 NULL true 6 NULL -6474 "auxiliary" "bigint" 53 0 6475 NULL true 7 NULL -6477 "column_id" "int" 32 0 6488 NULL true 0 NULL -6478 "type" "clob" 0 0 6488 NULL true 1 NULL -6479 "width" "int" 32 0 6488 NULL true 2 NULL -6480 "stamp" "timestamp" 7 0 6488 NULL true 3 NULL -6481 "sample" "bigint" 64 0 6488 NULL true 4 NULL -6482 "count" "bigint" 64 0 6488 NULL true 5 NULL -6483 "unique" "bigint" 64 0 6488 NULL true 6 NULL -6484 "nils" "bigint" 64 0 6488 NULL true 7 NULL -6485 "minval" "clob" 0 0 6488 NULL true 8 NULL -6486 "maxval" "clob" 0 0 6488 NULL true 9 NULL -6487 "sorted" "boolean" 1 0 6488 NULL true 10 NULL -6583 "file_id" "bigint" 64 0 6591 NULL false 0 NULL -6584 "file_location" "clob" 0 0 6591 NULL false 1 NULL -6585 "dbschema" "smallint" 16 0 6591 NULL false 2 NULL -6586 "format_version" "varchar" 7 0 6591 NULL true 3 NULL -6587 "sorting_order" "varchar" 10 0 6591 NULL true 4 NULL -6588 "comments" "clob" 0 0 6591 NULL true 5 NULL -6593 "sn" "clob" 0 0 6604 NULL false 0 NULL -6594 "file_id" "bigint" 64 0 6604 NULL false 1 NULL -6595 "ln" "int" 32 0 6604 NULL true 2 NULL -6596 "as" "int" 32 0 6604 NULL true 3 NULL -6597 "m5" "clob" 0 0 6604 NULL true 4 NULL -6598 "sp" "clob" 0 0 6604 NULL true 5 NULL -6599 "ur" "clob" 0 0 6604 NULL true 6 NULL -6606 "id" "clob" 0 0 6623 NULL false 0 NULL -6607 "file_id" "bigint" 64 0 6623 NULL false 1 NULL -6608 "cn" "clob" 0 0 6623 NULL true 2 NULL -6609 "ds" "clob" 0 0 6623 NULL true 3 NULL -6610 "dt" "timestamp" 7 0 6623 NULL true 4 NULL -6611 "fo" "clob" 0 0 6623 NULL true 5 NULL -6612 "ks" "clob" 0 0 6623 NULL true 6 NULL -6613 "lb" "clob" 0 0 6623 NULL true 7 NULL -6614 "pg" "clob" 0 0 6623 NULL true 8 NULL -6615 "pi" "int" 32 0 6623 NULL true 9 NULL -6616 "pl" "clob" 0 0 6623 NULL true 10 NULL -6617 "pu" "clob" 0 0 6623 NULL true 11 NULL -6618 "sm" "clob" 0 0 6623 NULL true 12 NULL -6625 "id" "clob" 0 0 6635 NULL false 0 NULL -6626 "file_id" "bigint" 64 0 6635 NULL false 1 NULL -6627 "pn" "clob" 0 0 6635 NULL true 2 NULL -6628 "cl" "clob" 0 0 6635 NULL true 3 NULL -6629 "pp" "clob" 0 0 6635 NULL true 4 NULL -6630 "vn" "clob" 0 0 6635 NULL true 5 NULL -6637 "qname" "clob" 0 0 6648 NULL false 0 NULL -6638 "flag" "smallint" 16 0 6648 NULL false 1 NULL -6639 "rname" "clob" 0 0 6648 NULL false 2 NULL -6640 "pos" "int" 32 0 6648 NULL false 3 NULL -6641 "mapq" "smallint" 16 0 6648 NULL false 4 NULL -6642 "cigar" "clob" 0 0 6648 NULL false 5 NULL -6643 "rnext" "clob" 0 0 6648 NULL false 6 NULL -6644 "pnext" "int" 32 0 6648 NULL false 7 NULL -6645 "tlen" "int" 32 0 6648 NULL false 8 NULL -6646 "seq" "clob" 0 0 6648 NULL false 9 NULL -6647 "qual" "clob" 0 0 6648 NULL false 10 NULL -6718 "function_id" "int" 32 0 6719 NULL true 0 NULL +6406 "schema" "clob" 0 0 6418 NULL true 0 NULL +6407 "table" "clob" 0 0 6418 NULL true 1 NULL +6408 "column" "clob" 0 0 6418 NULL true 2 NULL +6409 "type" "clob" 0 0 6418 NULL true 3 NULL +6410 "location" "clob" 0 0 6418 NULL true 4 NULL +6411 "count" "bigint" 64 0 6418 NULL true 5 NULL +6412 "typewidth" "int" 32 0 6418 NULL true 6 NULL +6413 "columnsize" "bigint" 64 0 6418 NULL true 7 NULL +6414 "heapsize" "bigint" 64 0 6418 NULL true 8 NULL +6415 "hashes" "bigint" 64 0 6418 NULL true 9 NULL +6416 "imprints" "bigint" 64 0 6418 NULL true 10 NULL +6417 "sorted" "boolean" 1 0 6418 NULL true 11 NULL +6420 "schema" "clob" 0 0 6430 NULL true 0 NULL +6421 "table" "clob" 0 0 6430 NULL true 1 NULL +6422 "column" "clob" 0 0 6430 NULL true 2 NULL +6423 "type" "clob" 0 0 6430 NULL true 3 NULL +6424 "typewidth" "int" 32 0 6430 NULL true 4 NULL +6425 "count" "bigint" 64 0 6430 NULL true 5 NULL +6426 "distinct" "bigint" 64 0 6430 NULL true 6 NULL +6427 "atomwidth" "int" 32 0 6430 NULL true 7 NULL +6428 "reference" "boolean" 1 0 6430 NULL true 8 NULL +6429 "sorted" "boolean" 1 0 6430 NULL true 9 NULL +6468 "schema" "clob" 0 0 6478 NULL true 0 NULL +6469 "table" "clob" 0 0 6478 NULL true 1 NULL +6470 "column" "clob" 0 0 6478 NULL true 2 NULL +6471 "type" "clob" 0 0 6478 NULL true 3 NULL +6472 "count" "bigint" 64 0 6478 NULL true 4 NULL +6473 "columnsize" "bigint" 64 0 6478 NULL true 5 NULL +6474 "heapsize" "bigint" 64 0 6478 NULL true 6 NULL +6475 "hashes" "bigint" 64 0 6478 NULL true 7 NULL +6476 "imprints" "bigint" 64 0 6478 NULL true 8 NULL +6477 "sorted" "boolean" 1 0 6478 NULL true 9 NULL +6480 "schema" "clob" 0 0 6488 NULL true 0 NULL +6481 "table" "clob" 0 0 6488 NULL true 1 NULL +6482 "count" "bigint" 64 0 6488 NULL true 2 NULL +6483 "columnsize" "bigint" 64 0 6488 NULL true 3 NULL +6484 "heapsize" "bigint" 64 0 6488 NULL true 4 NULL +6485 "hashes" "bigint" 64 0 6488 NULL true 5 NULL +6486 "imprints" "bigint" 64 0 6488 NULL true 6 NULL +6487 "auxiliary" "bigint" 53 0 6488 NULL true 7 NULL +6490 "column_id" "int" 32 0 6501 NULL true 0 NULL +6491 "type" "clob" 0 0 6501 NULL true 1 NULL +6492 "width" "int" 32 0 6501 NULL true 2 NULL +6493 "stamp" "timestamp" 7 0 6501 NULL true 3 NULL +6494 "sample" "bigint" 64 0 6501 NULL true 4 NULL +6495 "count" "bigint" 64 0 6501 NULL true 5 NULL +6496 "unique" "bigint" 64 0 6501 NULL true 6 NULL +6497 "nils" "bigint" 64 0 6501 NULL true 7 NULL +6498 "minval" "clob" 0 0 6501 NULL true 8 NULL +6499 "maxval" "clob" 0 0 6501 NULL true 9 NULL +6500 "sorted" "boolean" 1 0 6501 NULL true 10 NULL +6596 "file_id" "bigint" 64 0 6604 NULL false 0 NULL +6597 "file_location" "clob" 0 0 6604 NULL false 1 NULL +6598 "dbschema" "smallint" 16 0 6604 NULL false 2 NULL +6599 "format_version" "varchar" 7 0 6604 NULL true 3 NULL +6600 "sorting_order" "varchar" 10 0 6604 NULL true 4 NULL +6601 "comments" "clob" 0 0 6604 NULL true 5 NULL +6606 "sn" "clob" 0 0 6617 NULL false 0 NULL +6607 "file_id" "bigint" 64 0 6617 NULL false 1 NULL +6608 "ln" "int" 32 0 6617 NULL true 2 NULL +6609 "as" "int" 32 0 6617 NULL true 3 NULL +6610 "m5" "clob" 0 0 6617 NULL true 4 NULL +6611 "sp" "clob" 0 0 6617 NULL true 5 NULL +6612 "ur" "clob" 0 0 6617 NULL true 6 NULL +6619 "id" "clob" 0 0 6636 NULL false 0 NULL +6620 "file_id" "bigint" 64 0 6636 NULL false 1 NULL +6621 "cn" "clob" 0 0 6636 NULL true 2 NULL +6622 "ds" "clob" 0 0 6636 NULL true 3 NULL +6623 "dt" "timestamp" 7 0 6636 NULL true 4 NULL +6624 "fo" "clob" 0 0 6636 NULL true 5 NULL +6625 "ks" "clob" 0 0 6636 NULL true 6 NULL +6626 "lb" "clob" 0 0 6636 NULL true 7 NULL +6627 "pg" "clob" 0 0 6636 NULL true 8 NULL +6628 "pi" "int" 32 0 6636 NULL true 9 NULL +6629 "pl" "clob" 0 0 6636 NULL true 10 NULL +6630 "pu" "clob" 0 0 6636 NULL true 11 NULL +6631 "sm" "clob" 0 0 6636 NULL true 12 NULL +6638 "id" "clob" 0 0 6648 NULL false 0 NULL +6639 "file_id" "bigint" 64 0 6648 NULL false 1 NULL +6640 "pn" "clob" 0 0 6648 NULL true 2 NULL +6641 "cl" "clob" 0 0 6648 NULL true 3 NULL +6642 "pp" "clob" 0 0 6648 NULL true 4 NULL +6643 "vn" "clob" 0 0 6648 NULL true 5 NULL +6650 "qname" "clob" 0 0 6661 NULL false 0 NULL +6651 "flag" "smallint" 16 0 6661 NULL false 1 NULL +6652 "rname" "clob" 0 0 6661 NULL false 2 NULL +6653 "pos" "int" 32 0 6661 NULL false 3 NULL +6654 "mapq" "smallint" 16 0 6661 NULL false 4 NULL +6655 "cigar" "clob" 0 0 6661 NULL false 5 NULL +6656 "rnext" "clob" 0 0 6661 NULL false 6 NULL +6657 "pnext" "int" 32 0 6661 NULL false 7 NULL +6658 "tlen" "int" 32 0 6661 NULL false 8 NULL +6659 "seq" "clob" 0 0 6661 NULL false 9 NULL +6660 "qual" "clob" 0 0 6661 NULL false 10 NULL +6731 "function_id" "int" 32 0 6732 NULL true 0 NULL COMMIT; START TRANSACTION; CREATE TABLE "sys"."_tables" ( @@ -1934,17 +1938,17 @@ 5623 "sessions" 2000 "create view sys.se 5703 "optimizers" 2000 "create view sys.optimizers as select * from sys.optimizers();" 1 true 0 false 5711 "environment" 2000 "create view sys.environment as select * from sys.environment();" 1 true 0 false 5749 "queue" 2000 "create view sys.queue as select * from sys.queue();" 1 true 0 false -6405 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false -6417 "storagemodelinput" 2000 NULL 0 true 0 false -6465 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false -6475 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false -6488 "statistics" 2000 NULL 0 true 0 false -6591 "files" 6540 NULL 0 true 0 false -6604 "sq" 6540 NULL 0 true 0 false -6623 "rg" 6540 NULL 0 true 0 false -6635 "pg" 6540 NULL 0 true 0 false -6648 "export" 6540 NULL 0 true 0 false -6719 "systemfunctions" 2000 NULL 0 true 0 false +6418 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false +6430 "storagemodelinput" 2000 NULL 0 true 0 false +6478 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false +6488 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false +6501 "statistics" 2000 NULL 0 true 0 false +6604 "files" 6553 NULL 0 true 0 false +6617 "sq" 6553 NULL 0 true 0 false +6636 "rg" 6553 NULL 0 true 0 false +6648 "pg" 6553 NULL 0 true 0 false +6661 "export" 6553 NULL 0 true 0 false +6732 "systemfunctions" 2000 NULL 0 true 0 false COMMIT; START TRANSACTION; CREATE TABLE "sys"."args" ( @@ -1957,7 +1961,7 @@ CREATE TABLE "sys"."args" ( "inout" TINYINT, "number" INTEGER ); -COPY 3746 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"'; +COPY 3751 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"'; 2155 28 "res_0" "oid" 63 0 0 0 2156 28 "arg_1" "wrd" 64 0 1 1 2157 29 "res_0" "oid" 63 0 0 0 @@ -5576,134 +5580,139 @@ 6372 6370 "u" "clob" 0 0 1 1 6375 6374 "result" "double" 53 0 0 0 6376 6374 "chi2" "double" 53 0 1 1 6377 6374 "datapoints" "double" 53 0 1 2 -6380 6379 "schema" "clob" 0 0 0 0 -6381 6379 "table" "clob" 0 0 0 1 -6382 6379 "column" "clob" 0 0 0 2 -6383 6379 "type" "clob" 0 0 0 3 -6384 6379 "location" "clob" 0 0 0 4 -6385 6379 "count" "bigint" 64 0 0 5 -6386 6379 "typewidth" "int" 32 0 0 6 -6387 6379 "columnsize" "bigint" 64 0 0 7 -6388 6379 "heapsize" "bigint" 64 0 0 8 -6389 6379 "hashes" "bigint" 64 0 0 9 -6390 6379 "imprints" "bigint" 64 0 0 10 -6391 6379 "sorted" "boolean" 1 0 0 11 -6422 6421 "result" "bigint" 64 0 0 0 -6423 6421 "nme" "clob" 0 0 1 1 -6424 6421 "i" "bigint" 64 0 1 2 -6425 6421 "d" "bigint" 64 0 1 3 -6428 6427 "result" "bigint" 64 0 0 0 -6429 6427 "tpe" "clob" 0 0 1 1 -6430 6427 "i" "bigint" 64 0 1 2 -6431 6427 "w" "int" 32 0 1 3 -6434 6433 "result" "bigint" 64 0 0 0 -6435 6433 "b" "boolean" 1 0 1 1 -6436 6433 "i" "bigint" 64 0 1 2 -6439 6438 "result" "bigint" 64 0 0 0 -6440 6438 "i" "bigint" 64 0 1 1 -6441 6438 "nme" "clob" 0 0 1 2 -6444 6443 "schema" "clob" 0 0 0 0 -6445 6443 "table" "clob" 0 0 0 1 -6446 6443 "column" "clob" 0 0 0 2 -6447 6443 "type" "clob" 0 0 0 3 -6448 6443 "count" "bigint" 64 0 0 4 -6449 6443 "columnsize" "bigint" 64 0 0 5 -6450 6443 "heapsize" "bigint" 64 0 0 6 -6451 6443 "hashes" "bigint" 64 0 0 7 -6452 6443 "imprints" "bigint" 64 0 0 8 -6453 6443 "sorted" "boolean" 1 0 0 9 -6493 6492 "tbl" "clob" 0 0 1 0 -6496 6495 "sch" "clob" 0 0 1 0 -6497 6495 "tbl" "clob" 0 0 1 1 -6500 6499 "sch" "clob" 0 0 1 0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list