Changeset: 414c573b979c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=414c573b979c Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 geom/sql/conformance/Tests/conformance_load.stable.out geom/sql/functions/Tests/loadTestWKT.stable.out geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/UDF/capi/Tests/capi00.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/sql.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out sql/benchmarks/nobench/Tests/nobench.stable.out sql/benchmarks/ssbm/Tests/create.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.stable.out sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out sql/test/BugTracker-2013/Tests/php-size-limit-bug.stable.out sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128 sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dump/Tests/dump-empty.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out sql/test/LSST/Tests/schema_3_1_88.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128 sql/test/Tests/comment-dump.stable.out sql/test/Update_Delete_action/Tests/delete_cascade.stable.out sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/Via-m/Tests/event_s01.stable.out sql/test/copy/Tests/ingestion.stable.out sql/test/emptydb/Tests/load.stable.out sql/test/group-concat/Tests/groupconcat01.stable.out sql/test/json/Tests/spaceissue.stable.out sql/test/lateral/Tests/lateral.stable.out sql/test/mergetables/Tests/mergeinit.stable.out sql/test/miscellaneous/Tests/trace_test.stable.out sql/test/orderidx/Tests/simpletable.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/quantiles/Tests/quantiles.stable.out sql/test/rdf/Tests/create_tables_t.stable.out sql/test/snodgrass/Tests/cast_select.stable.out sql/test/ssqq/Tests/ssqq.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb/Tests/testdb-load.stable.out Branch: default Log Message:
moved sql initialisation, loading modules/scripts and upgrades into the server startup (SQLprelude), instead of the first client. diffs (truncated from 17611 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 @@ -8,13 +8,14 @@ stdout of test 'MAL-signatures` in direc # MonetDB 5 server v11.20.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 7.734 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 - -Ready. +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.386 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://xps13:39285/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 +# MonetDB/GIS module loaded # SQL catalog created, loading sql scripts once # loading sql script: 09_like.sql # loading sql script: 10_math.sql @@ -10872,7 +10873,7 @@ Ready. [ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void ", "SQLoptimizersUpdate;", "" ] [ "sql", "optimizers", "command sql.optimizers() (X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "getPipeCatalog;", "" ] [ "sql", "password", "pattern sql.password(user:str):str ", "db_password_wrap;", "Return password hash of user" ] -[ "sql", "prelude", "command sql.prelude():void ", "SQLprelude;", "" ] +[ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "project", "command sql.project(col:bat[:oid], l:bat[:oid], r:bat[:oid]):bat[:oid] ", "BATleftproject;", "Last step of a left outer join, ie project the inner join (l,r) over the left input side (col)" ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAproject2;", "Return column bat with delta's applied." ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ", "DELTAproject;", "Return column bat with delta's applied." ] @@ -11124,13 +11125,7 @@ Ready. [ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create an URL from a string literal" ] [ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create an URL from a string literal" ] [ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] [ "user", "s2_1", "function user.s2_1():void;", "", "" ] -[ "user", "sql.init", "function user.sql.init():void;", "", "" ] [ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", "" ] [ "uuid", "#fromstr", "command uuid.#fromstr():void ", "UUIDfromString;", "" ] [ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;", "" ] 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 @@ -8,13 +8,14 @@ stdout of test 'MAL-signatures` in direc # MonetDB 5 server v11.20.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 7.734 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 - -Ready. +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.386 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://xps13:39285/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.39285 +# MonetDB/GIS module loaded # SQL catalog created, loading sql scripts once # loading sql script: 09_like.sql # loading sql script: 10_math.sql @@ -56,9 +57,11 @@ Ready. # loading sql script: 90_generator_hge.sql # loading sql script: 99_system.sql -# 12:57:39 > -# 12:57:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21549" "--port=35702" -# 12:57:39 > +Ready. + +# 16:09:44 > +# 16:09:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1158" "--port=39285" +# 16:09:44 > #select * from sys.malfunctions() order by module, "function", address, signature, comment; % .L1, .L1, .L1, .L1, .L1 # table_name @@ -15084,7 +15087,7 @@ Ready. [ "sql", "optimizer_updates", "pattern sql.optimizer_updates():void ", "SQLoptimizersUpdate;", "" ] [ "sql", "optimizers", "command sql.optimizers() (X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "getPipeCatalog;", "" ] [ "sql", "password", "pattern sql.password(user:str):str ", "db_password_wrap;", "Return password hash of user" ] -[ "sql", "prelude", "command sql.prelude():void ", "SQLprelude;", "" ] +[ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "project", "command sql.project(col:bat[:oid], l:bat[:oid], r:bat[:oid]):bat[:oid] ", "BATleftproject;", "Last step of a left outer join, ie project the inner join (l,r) over the left input side (col)" ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAproject2;", "Return column bat with delta's applied." ] [ "sql", "projectdelta", "command sql.projectdelta(select:bat[:oid], col:bat[:any_3], uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ", "DELTAproject;", "Return column bat with delta's applied." ] @@ -15338,13 +15341,7 @@ Ready. [ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create an URL from a string literal" ] [ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create an URL from a string literal" ] [ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] -[ "user", "main", "function user.main():void;", "", "" ] [ "user", "s2_1", "function user.s2_1():void;", "", "" ] -[ "user", "sql.init", "function user.sql.init():void;", "", "" ] [ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", "" ] [ "uuid", "#fromstr", "command uuid.#fromstr():void ", "UUIDfromString;", "" ] [ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;", "" ] diff --git a/geom/sql/conformance/Tests/conformance_load.stable.out b/geom/sql/conformance/Tests/conformance_load.stable.out --- a/geom/sql/conformance/Tests/conformance_load.stable.out +++ b/geom/sql/conformance/Tests/conformance_load.stable.out @@ -16,9 +16,6 @@ stdout of test 'conformance_load` in dir # Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:36548/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-11646/.s.monetdb.36548 # MonetDB/GIS 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 @@ -51,6 +48,9 @@ Ready. # loading sql script: 89_generator_hge.sql # loading sql script: 90_generator.sql # loading sql script: 99_system.sql +# MonetDB/SQL module loaded + +Ready. # 13:34:33 > # 13:34:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-11646" "--port=36548" diff --git a/geom/sql/functions/Tests/loadTestWKT.stable.out b/geom/sql/functions/Tests/loadTestWKT.stable.out --- a/geom/sql/functions/Tests/loadTestWKT.stable.out +++ b/geom/sql/functions/Tests/loadTestWKT.stable.out @@ -16,9 +16,6 @@ stdout of test 'loadTestWKT` in director # Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:35467/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-15511/.s.monetdb.35467 # MonetDB/GIS 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 @@ -51,6 +48,9 @@ Ready. # loading sql script: 89_generator_hge.sql # loading sql script: 90_generator.sql # loading sql script: 99_system.sql +# MonetDB/SQL module loaded + +Ready. # 16:29:35 > # 16:29:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15511" "--port=35467" diff --git a/geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out b/geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out --- a/geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out +++ b/geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out @@ -16,9 +16,6 @@ stdout of test 'regress_ogc_cover` in di # Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:37341/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-15092/.s.monetdb.37341 # MonetDB/GIS 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 @@ -51,116 +48,119 @@ Ready. # loading sql script: 89_generator_hge.sql # loading sql script: 90_generator.sql # loading sql script: 99_system.sql +# MonetDB/SQL module loaded + +Ready. # 17:00:02 > # 17:00:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15092" "--port=37341" # 17:00:02 > #SELECT 'covers100', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 9 10, 9 8)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers100", true ] #SELECT 'covers101', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'LINESTRING(1 10, 10 10, 10 8)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers101", true ] #SELECT 'covers102', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(5 5)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers102", true ] #SELECT 'covers103', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 0)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers103", true ] #SELECT 'covers104', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(-1 0)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers104", false ] #SELECT 'covers105', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 5)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers105", true ] #SELECT 'covers106', ST_Covers('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))', 'POINT(0 12)'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers106", false ] #SELECT 'covers107', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631)); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers107", true ] #SELECT 'covers108', ST_Covers(ST_GeomFromText('POLYGON((521526 5377783, 521482 5377811, 521481 5377811, 521494 5377832, 521539 5377804, 521526 5377783))', 32631), ST_GeomFromText('POINT(521513 5377804)', 32631)); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 9, 5 # length [ "covers108", true ] #SELECT 'coveredby100', ST_CoveredBy('LINESTRING(1 10, 9 10, 9 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 12, 5 # length [ "coveredby100", true ] #SELECT 'coveredby101', ST_CoveredBy('LINESTRING(1 10, 10 10, 10 8)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 12, 5 # length [ "coveredby101", true ] #SELECT 'coveredby102', ST_CoveredBy('POINT(5 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 12, 5 # length [ "coveredby102", true ] #SELECT 'coveredby103', ST_CoveredBy('POINT(0 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 12, 5 # length [ "coveredby103", true ] #SELECT 'coveredby104', ST_CoveredBy('POINT(-1 0)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type % 12, 5 # length [ "coveredby104", false ] #SELECT 'coveredby105', ST_CoveredBy('POINT(0 5)', 'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'); -% .L1, .L2 # table_name -% L1, L2 # name +% .L2, .L4 # table_name +% L2, L4 # name % char, boolean # type _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
