Changeset: 1fca972457c2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1fca972457c2 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 common/stream/stream.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/10_math.sql sql/scripts/12_url.sql sql/scripts/14_inet.sql sql/scripts/15_querylog.sql sql/scripts/16_tracelog.sql sql/scripts/21_dependency_functions.sql sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/39_analytics.sql sql/scripts/40_json.sql sql/scripts/51_sys_schema_extension.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/trace.sql sql/test/Tests/trace.stable.out.int128 sql/test/bugs/Tests/case_cast-bug-sf-1019506.stable.out sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/without_oid.sql sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: transaction-replication Log Message:
Merge with the default branch diffs (truncated from 14906 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -40409,25 +40409,15 @@ command sql.alpha(dec:dbl,theta:dbl):dbl address SQLcst_alpha_cst; comment Implementation of astronomy alpha function: expands the radius theta depending on the declination -pattern sql.analyze(sch:str,tbl:str,col:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str,col:str):void address sql_analyze; comment Update the database statistics table -pattern sql.analyze(sch:str,tbl:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str):void address sql_analyze; -pattern sql.analyze(sch:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str):void address sql_analyze; -pattern sql.analyze(sample:lng):void -address sql_analyze; -pattern sql.analyze(sch:str,tbl:str,col:str):void -address sql_analyze; -comment Update the database statistics table - -pattern sql.analyze(sch:str,tbl:str):void -address sql_analyze; -pattern sql.analyze(sch:str):void -address sql_analyze; -pattern sql.analyze():void +pattern sql.analyze(minmax:int,sample:lng):void address sql_analyze; pattern sql.argRecord(a:any...):str address SQLargRecord; diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -51344,25 +51344,15 @@ command sql.alpha(dec:dbl,theta:dbl):dbl address SQLcst_alpha_cst; comment Implementation of astronomy alpha function: expands the radius theta depending on the declination -pattern sql.analyze(sch:str,tbl:str,col:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str,col:str):void address sql_analyze; comment Update the database statistics table -pattern sql.analyze(sch:str,tbl:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str):void address sql_analyze; -pattern sql.analyze(sch:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str):void address sql_analyze; -pattern sql.analyze(sample:lng):void -address sql_analyze; -pattern sql.analyze(sch:str,tbl:str,col:str):void -address sql_analyze; -comment Update the database statistics table - -pattern sql.analyze(sch:str,tbl:str):void -address sql_analyze; -pattern sql.analyze(sch:str):void -address sql_analyze; -pattern sql.analyze():void +pattern sql.analyze(minmax:int,sample:lng):void address sql_analyze; pattern sql.argRecord(a:any...):str address SQLargRecord; 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 @@ -65,9 +65,11 @@ SYSTEM TABLE sys.auths SYSTEM TABLE sys.connections SYSTEM TABLE sys.db_user_info SYSTEM TABLE sys.dependencies +SYSTEM TABLE sys.dependency_types 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 @@ -80,6 +82,7 @@ SYSTEM TABLE sys.sequences SYSTEM TABLE sys.statistics SYSTEM TABLE sys.storagemodelinput SYSTEM TABLE sys.systemfunctions +SYSTEM TABLE sys.table_types SYSTEM TABLE sys.triggers SYSTEM TABLE sys.types SYSTEM TABLE sys.user_role @@ -445,7 +448,7 @@ create view sys.queue as select * from s create view sys.sessions as select * from sys.sessions(); create view sys."storage" as select * from sys."storage"(); create view sys.storagemodel as select * from sys.storagemodel(); -SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; +SELECT * FROM (SELECT p.*, 0 AS "temporary", CAST(CASE WHEN system THEN type + 10 /* system table/view */ ELSE (CASE WHEN commit_action = 0 THEN type /* table/view */ ELSE type + 20 /* global temp table */ END) END AS SMALLINT) AS table_type FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary", CAST(type + 30 /* local temp table */ AS SMALLINT) AS table_type FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; -- A summary of the table storage requirement is is available as a table view. -- The auxiliary column denotes the maximum space if all non-sorted columns -- would be augmented with a hash (rare situation) @@ -463,22 +466,13 @@ create function "abbrev" (p inet) return external name inet."abbrev"; create function alpha(pdec double, pradius double) returns double external name sql.alpha; -create procedure analyze() +create procedure analyze(minmax int, "sample" bigint) external name sql.analyze; -create procedure analyze(tbl string) +create procedure analyze(minmax int, "sample" bigint, sch string) external name sql.analyze; -create procedure analyze(sch string, tbl string) +create procedure analyze(minmax int, "sample" bigint, sch string, tbl string) external name sql.analyze; -create procedure analyze(sch string, tbl string, col string) -external name sql.analyze; --- control the sample size -create procedure analyze("sample" bigint) -external name sql.analyze; -create procedure analyze(tbl string, "sample" bigint) -external name sql.analyze; -create procedure analyze(sch string, tbl string, "sample" bigint) -external name sql.analyze; -create procedure analyze(sch string, tbl string, col string, "sample" bigint) +create procedure analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; -- ogc Spatial Analysis methods @@ -1340,7 +1334,7 @@ CREATE TABLE "sys"."_columns" ( "number" INTEGER, "storage" VARCHAR(2048) ); -COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; +COPY 358 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; 2002 "id" "int" 32 0 2001 NULL true 0 NULL 2003 "name" "varchar" 1024 0 2001 NULL true 1 NULL 2004 "authorization" "int" 32 0 2001 NULL true 2 NULL @@ -1483,215 +1477,222 @@ 5207 "system" "boolean" 1 0 5201 NULL tr 5208 "commit_action" "smallint" 16 0 5201 NULL true 6 NULL 5209 "access" "smallint" 16 0 5201 NULL true 7 NULL 5210 "temporary" "smallint" 16 0 5201 NULL true 8 NULL -5212 "id" "int" 32 0 5211 NULL true 0 NULL -5213 "name" "varchar" 1024 0 5211 NULL true 1 NULL -5214 "type" "varchar" 1024 0 5211 NULL true 2 NULL -5215 "type_digits" "int" 32 0 5211 NULL true 3 NULL -5216 "type_scale" "int" 32 0 5211 NULL true 4 NULL -5217 "table_id" "int" 32 0 5211 NULL true 5 NULL -5218 "default" "varchar" 2048 0 5211 NULL true 6 NULL -5219 "null" "boolean" 1 0 5211 NULL true 7 NULL -5220 "number" "int" 32 0 5211 NULL true 8 NULL -5221 "storage" "varchar" 2048 0 5211 NULL true 9 NULL -5228 "name" "varchar" 1024 0 5227 NULL true 0 NULL -5229 "fullname" "varchar" 2048 0 5227 NULL true 1 NULL -5230 "default_schema" "int" 9 0 5227 NULL true 2 NULL -5234 "name" "varchar" 1024 0 5233 NULL true 0 NULL -5235 "fullname" "varchar" 2024 0 5233 NULL true 1 NULL -5236 "default_schema" "int" 9 0 5233 NULL true 2 NULL -5238 "login_id" "int" 32 0 5237 NULL true 0 NULL -5239 "role_id" "int" 32 0 5237 NULL true 1 NULL -5241 "id" "int" 32 0 5240 NULL true 0 NULL -5242 "name" "varchar" 1024 0 5240 NULL true 1 NULL -5243 "grantor" "int" 32 0 5240 NULL true 2 NULL -5245 "obj_id" "int" 32 0 5244 NULL true 0 NULL -5246 "auth_id" "int" 32 0 5244 NULL true 1 NULL -5247 "privileges" "int" 32 0 5244 NULL true 2 NULL -5248 "grantor" "int" 32 0 5244 NULL true 3 NULL -5249 "grantable" "int" 32 0 5244 NULL true 4 NULL -5443 "id" "oid" 63 0 5451 NULL true 0 NULL -5444 "owner" "clob" 0 0 5451 NULL true 1 NULL -5445 "defined" "timestamp" 7 0 5451 NULL true 2 NULL -5446 "query" "clob" 0 0 5451 NULL true 3 NULL -5447 "pipe" "clob" 0 0 5451 NULL true 4 NULL -5448 "plan" "clob" 0 0 5451 NULL true 5 NULL -5449 "mal" "int" 32 0 5451 NULL true 6 NULL -5450 "optimize" "bigint" 64 0 5451 NULL true 7 NULL -5453 "id" "oid" 63 0 5462 NULL true 0 NULL -5454 "start" "timestamp" 7 0 5462 NULL true 1 NULL -5455 "stop" "timestamp" 7 0 5462 NULL true 2 NULL -5456 "arguments" "clob" 0 0 5462 NULL true 3 NULL -5457 "tuples" "wrd" 64 0 5462 NULL true 4 NULL -5458 "run" "bigint" 64 0 5462 NULL true 5 NULL -5459 "ship" "bigint" 64 0 5462 NULL true 6 NULL -5460 "cpu" "int" 32 0 5462 NULL true 7 NULL -5461 "io" "int" 32 0 5462 NULL true 8 NULL -5464 "id" "oid" 63 0 5480 NULL true 0 NULL -5465 "owner" "clob" 0 0 5480 NULL true 1 NULL -5466 "defined" "timestamp" 7 0 5480 NULL true 2 NULL -5467 "query" "clob" 0 0 5480 NULL true 3 NULL -5468 "pipe" "clob" 0 0 5480 NULL true 4 NULL -5469 "plan" "clob" 0 0 5480 NULL true 5 NULL -5470 "mal" "int" 32 0 5480 NULL true 6 NULL -5471 "optimize" "bigint" 64 0 5480 NULL true 7 NULL -5472 "start" "timestamp" 7 0 5480 NULL true 8 NULL -5473 "stop" "timestamp" 7 0 5480 NULL true 9 NULL -5474 "arguments" "clob" 0 0 5480 NULL true 10 NULL -5475 "tuples" "wrd" 64 0 5480 NULL true 11 NULL -5476 "run" "bigint" 64 0 5480 NULL true 12 NULL -5477 "ship" "bigint" 64 0 5480 NULL true 13 NULL -5478 "cpu" "int" 32 0 5480 NULL true 14 NULL -5479 "io" "int" 32 0 5480 NULL true 15 NULL -5506 "event" "int" 32 0 5519 NULL true 0 NULL -5507 "clk" "varchar" 20 0 5519 NULL true 1 NULL -5508 "pc" "varchar" 50 0 5519 NULL true 2 NULL -5509 "thread" "int" 32 0 5519 NULL true 3 NULL -5510 "ticks" "bigint" 64 0 5519 NULL true 4 NULL -5511 "rrsmb" "bigint" 64 0 5519 NULL true 5 NULL -5512 "vmmb" "bigint" 64 0 5519 NULL true 6 NULL -5513 "reads" "bigint" 64 0 5519 NULL true 7 NULL -5514 "writes" "bigint" 64 0 5519 NULL true 8 NULL -5515 "minflt" "bigint" 64 0 5519 NULL true 9 NULL -5516 "majflt" "bigint" 64 0 5519 NULL true 10 NULL -5517 "nvcsw" "bigint" 64 0 5519 NULL true 11 NULL -5518 "stmt" "clob" 0 0 5519 NULL true 12 NULL -5649 "user" "clob" 0 0 5655 NULL true 0 NULL -5650 "login" "timestamp" 7 0 5655 NULL true 1 NULL -5651 "sessiontimeout" "bigint" 64 0 5655 NULL true 2 NULL -5652 "lastcommand" "timestamp" 7 0 5655 NULL true 3 NULL -5653 "querytimeout" "bigint" 64 0 5655 NULL true 4 NULL -5654 "active" "boolean" 1 0 5655 NULL true 5 NULL -5732 "name" "clob" 0 0 5735 NULL true 0 NULL -5733 "def" "clob" 0 0 5735 NULL true 1 NULL -5734 "status" "clob" 0 0 5735 NULL true 2 NULL -5741 "name" "clob" 0 0 5743 NULL true 0 NULL -5742 "value" "clob" 0 0 5743 NULL true 1 NULL -5773 "qtag" "bigint" 64 0 5781 NULL true 0 NULL -5774 "user" "clob" 0 0 5781 NULL true 1 NULL -5775 "started" "timestamp" 7 0 5781 NULL true 2 NULL -5776 "estimate" "timestamp" 7 0 5781 NULL true 3 NULL -5777 "progress" "int" 32 0 5781 NULL true 4 NULL -5778 "status" "clob" 0 0 5781 NULL true 5 NULL -5779 "tag" "oid" 63 0 5781 NULL true 6 NULL -5780 "query" "clob" 0 0 5781 NULL true 7 NULL -6424 "file_id" "int" 32 0 6426 NULL true 0 NULL -6425 "location" "char" 256 0 6426 NULL true 1 NULL -6428 "dim_id" "int" 32 0 6432 NULL true 0 NULL -6429 "file_id" "int" 32 0 6432 NULL true 1 NULL -6430 "name" "varchar" 64 0 6432 NULL true 2 NULL -6431 "length" "int" 32 0 6432 NULL true 3 NULL -6434 "var_id" "int" 32 0 6440 NULL true 0 NULL -6435 "file_id" "int" 32 0 6440 NULL true 1 NULL -6436 "name" "varchar" 64 0 6440 NULL true 2 NULL -6437 "vartype" "varchar" 64 0 6440 NULL true 3 NULL -6438 "ndim" "int" 32 0 6440 NULL true 4 NULL -6439 "coord_dim_id" "int" 32 0 6440 NULL true 5 NULL -6442 "var_id" "int" 32 0 6446 NULL true 0 NULL -6443 "dim_id" "int" 32 0 6446 NULL true 1 NULL -6444 "file_id" "int" 32 0 6446 NULL true 2 NULL -6445 "dimpos" "int" 32 0 6446 NULL true 3 NULL -6448 "obj_name" "varchar" 256 0 6454 NULL true 0 NULL -6449 "att_name" "varchar" 256 0 6454 NULL true 1 NULL -6450 "att_type" "varchar" 64 0 6454 NULL true 2 NULL -6451 "value" "clob" 0 0 6454 NULL true 3 NULL -6452 "file_id" "int" 32 0 6454 NULL true 4 NULL -6453 "gr_name" "varchar" 256 0 6454 NULL true 5 NULL -6478 "schema" "clob" 0 0 6491 NULL true 0 NULL -6479 "table" "clob" 0 0 6491 NULL true 1 NULL -6480 "column" "clob" 0 0 6491 NULL true 2 NULL -6481 "type" "clob" 0 0 6491 NULL true 3 NULL -6482 "mode" "clob" 0 0 6491 NULL true 4 NULL -6483 "location" "clob" 0 0 6491 NULL true 5 NULL -6484 "count" "bigint" 64 0 6491 NULL true 6 NULL -6485 "typewidth" "int" 32 0 6491 NULL true 7 NULL -6486 "columnsize" "bigint" 64 0 6491 NULL true 8 NULL -6487 "heapsize" "bigint" 64 0 6491 NULL true 9 NULL -6488 "hashes" "bigint" 64 0 6491 NULL true 10 NULL -6489 "imprints" "bigint" 64 0 6491 NULL true 11 NULL -6490 "sorted" "boolean" 1 0 6491 NULL true 12 NULL -6493 "schema" "clob" 0 0 6503 NULL true 0 NULL -6494 "table" "clob" 0 0 6503 NULL true 1 NULL -6495 "column" "clob" 0 0 6503 NULL true 2 NULL -6496 "type" "clob" 0 0 6503 NULL true 3 NULL -6497 "typewidth" "int" 32 0 6503 NULL true 4 NULL -6498 "count" "bigint" 64 0 6503 NULL true 5 NULL -6499 "distinct" "bigint" 64 0 6503 NULL true 6 NULL -6500 "atomwidth" "int" 32 0 6503 NULL true 7 NULL -6501 "reference" "boolean" 1 0 6503 NULL true 8 NULL -6502 "sorted" "boolean" 1 0 6503 NULL true 9 NULL -6541 "schema" "clob" 0 0 6551 NULL true 0 NULL -6542 "table" "clob" 0 0 6551 NULL true 1 NULL -6543 "column" "clob" 0 0 6551 NULL true 2 NULL -6544 "type" "clob" 0 0 6551 NULL true 3 NULL -6545 "count" "bigint" 64 0 6551 NULL true 4 NULL -6546 "columnsize" "bigint" 64 0 6551 NULL true 5 NULL -6547 "heapsize" "bigint" 64 0 6551 NULL true 6 NULL -6548 "hashes" "bigint" 64 0 6551 NULL true 7 NULL -6549 "imprints" "bigint" 64 0 6551 NULL true 8 NULL -6550 "sorted" "boolean" 1 0 6551 NULL true 9 NULL -6553 "schema" "clob" 0 0 6561 NULL true 0 NULL -6554 "table" "clob" 0 0 6561 NULL true 1 NULL -6555 "count" "bigint" 64 0 6561 NULL true 2 NULL -6556 "columnsize" "bigint" 64 0 6561 NULL true 3 NULL -6557 "heapsize" "bigint" 64 0 6561 NULL true 4 NULL -6558 "hashes" "bigint" 64 0 6561 NULL true 5 NULL -6559 "imprints" "bigint" 64 0 6561 NULL true 6 NULL -6560 "auxiliary" "bigint" 64 0 6561 NULL true 7 NULL -6563 "column_id" "int" 32 0 6574 NULL true 0 NULL -6564 "type" "clob" 0 0 6574 NULL true 1 NULL -6565 "width" "int" 32 0 6574 NULL true 2 NULL -6566 "stamp" "timestamp" 7 0 6574 NULL true 3 NULL -6567 "sample" "bigint" 64 0 6574 NULL true 4 NULL -6568 "count" "bigint" 64 0 6574 NULL true 5 NULL -6569 "unique" "bigint" 64 0 6574 NULL true 6 NULL -6570 "nils" "bigint" 64 0 6574 NULL true 7 NULL _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list