Changeset: e4ea18ea641e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4ea18ea641e Added Files: sql/jdbc/tests/Tests/Test_CisValid.stable.err sql/jdbc/tests/Tests/Test_CisValid.stable.out Modified Files: NT/monetdb_config.h.in sql/storage/store.c sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 Branch: default Log Message:
Merge with Jun2016 branch. diffs (212 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -1135,11 +1135,11 @@ typedef __uint128_t uhge; #ifdef HAVE_EMBEDDED_R #define _MSC_EXTENSIONS 1 #undef HAVE_CTIME_R -#define PROMPT1 "\001\001\n" /* prompt: ready for new query */ -#define PROMPT2 "\001\002\n" /* prompt: more data needed */ #else #define HAVE_MAPI 1 #endif +#define PROMPT1 "\001\001\n" /* prompt: ready for new query */ +#define PROMPT2 "\001\002\n" /* prompt: more data needed */ #endif /* _SEEN_MONETDB_CONFIG_H */ diff --git a/sql/jdbc/tests/Tests/Test_CisValid.stable.err b/sql/jdbc/tests/Tests/Test_CisValid.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_CisValid.stable.err @@ -0,0 +1,48 @@ +stderr of test 'Test_CisValid` in directory 'sql/jdbc/tests` itself: + + +# 23:03:07 > +# 23:03:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36086" "--set" "mapi_usock=/var/tmp/mtest-9079/.s.monetdb.36086" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_jdbc_tests" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 23:03:07 > + +# builtin opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 36086 +# cmdline opt mapi_usock = /var/tmp/mtest-9079/.s.monetdb.36086 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_jdbc_tests +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 23:03:08 > +# 23:03:08 > "./Test_CisValid.SQL.sh" "Test_CisValid" +# 23:03:08 > + + +# 23:03:08 > +# 23:03:08 > java Test_CisValid "jdbc:monetdb://toulouse:36086/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" +# 23:03:08 > + +java.sql.SQLException: SELECT: no such table 'doesnotexist' + at nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.executeQuery(MonetConnection.java:2603) + at nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.processQuery(MonetConnection.java:2351) + at nl.cwi.monetdb.jdbc.MonetStatement.internalExecute(MonetStatement.java:507) + at nl.cwi.monetdb.jdbc.MonetStatement.execute(MonetStatement.java:345) + at Test_CisValid.main(Test_CisValid.java:23) + +# 23:03:08 > +# 23:03:08 > "Done." +# 23:03:08 > + diff --git a/sql/jdbc/tests/Tests/Test_CisValid.stable.out b/sql/jdbc/tests/Tests/Test_CisValid.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_CisValid.stable.out @@ -0,0 +1,77 @@ +stdout of test 'Test_CisValid` in directory 'sql/jdbc/tests` itself: + + +# 23:03:07 > +# 23:03:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36086" "--set" "mapi_usock=/var/tmp/mtest-9079/.s.monetdb.36086" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_jdbc_tests" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 23:03:07 > + +# MonetDB 5 server v11.21.20 +# This is an unreleased version +# Serving database 'mTests_sql_jdbc_tests', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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 +# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:36086/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-9079/.s.monetdb.36086 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 23:03:08 > +# 23:03:08 > "./Test_CisValid.SQL.sh" "Test_CisValid" +# 23:03:08 > + + +# 23:03:08 > +# 23:03:08 > java Test_CisValid "jdbc:monetdb://toulouse:36086/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" +# 23:03:08 > + +Validating connection: conn.isValid? false + +# 23:03:08 > +# 23:03:08 > "Done." +# 23:03:08 > + diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -1363,7 +1363,6 @@ store_load(void) { sqlid id = 0; sa = sa_create(); - MT_lock_unset(&bs_lock); types_init(sa, logger_debug); #define FUNC_OIDS 2000 @@ -1612,6 +1611,7 @@ store_init(int debug, store_type store, } /* create the initial store structure or re-load previous data */ + MT_lock_unset(&bs_lock); return store_load(); } @@ -1745,9 +1745,9 @@ store_manager(void) /* re-set the store_oid */ store_oid = 0; /* reload the store and the global transactions */ + MT_lock_unset(&bs_lock); res = store_load(); if (res < 0) { - MT_lock_unset(&bs_lock); GDKfatal("shared write-ahead log store re-load failure"); } MT_lock_set(&bs_lock); diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -820,9 +820,9 @@ Ready. [ "sys", "internaltransform", 5, "clob", "" ] [ "sys", "isaurl", 0, "boolean", "create function isaurl(theurl url) returns bool\n external name url.\"isaURL\";" ] [ "sys", "isaurl", 1, "url", "" ] -[ "sys", "isauuid", 0, "uuid", "create function sys.isauuid(u uuid)\nreturns uuid external name uuid.\"isaUUID\";" ] +[ "sys", "isauuid", 0, "boolean", "create function sys.isauuid(u uuid)\nreturns boolean begin return true; end;" ] [ "sys", "isauuid", 1, "uuid", "" ] -[ "sys", "isauuid", 0, "uuid", "create function sys.isauuid(u string)\nreturns uuid external name uuid.\"isaUUID\";" ] +[ "sys", "isauuid", 0, "boolean", "create function sys.isauuid(s string)\nreturns boolean external name uuid.\"isaUUID\";" ] [ "sys", "isauuid", 1, "clob", "" ] [ "sys", "isnull", 0, "boolean", "isnil" ] [ "sys", "isnull", 1, "any", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -862,9 +862,9 @@ Ready. [ "sys", "internaltransform", 5, "clob", "" ] [ "sys", "isaurl", 0, "boolean", "create function isaurl(theurl url) returns bool\n external name url.\"isaURL\";" ] [ "sys", "isaurl", 1, "url", "" ] -[ "sys", "isauuid", 0, "uuid", "create function sys.isauuid(u uuid)\nreturns uuid external name uuid.\"isaUUID\";" ] +[ "sys", "isauuid", 0, "boolean", "create function sys.isauuid(u uuid)\nreturns boolean begin return true; end;" ] [ "sys", "isauuid", 1, "uuid", "" ] -[ "sys", "isauuid", 0, "uuid", "create function sys.isauuid(u string)\nreturns uuid external name uuid.\"isaUUID\";" ] +[ "sys", "isauuid", 0, "boolean", "create function sys.isauuid(s string)\nreturns boolean external name uuid.\"isaUUID\";" ] [ "sys", "isauuid", 1, "clob", "" ] [ "sys", "isnull", 0, "boolean", "isnil" ] [ "sys", "isnull", 1, "any", "" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
