Changeset: f4280bc65958 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4280bc65958
Added Files:
sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh
sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh.src
sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.err
sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.out
Modified Files:
sql/jdbc/tests/Tests/All
Branch: bamloader
Log Message:
Adjusted jdbc tests to comply with bamloader branch
diffs (truncated from 590 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -5,7 +5,8 @@ HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
HAVE_JDBCTESTS?Test_Ctransaction
#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
-HAVE_JDBCTESTS?Test_Dobjects
+HAVE_JDBCTESTS&!HAVE_SAMTOOLS?Test_Dobjects
+HAVE_JDBCTESTS&HAVE_SAMTOOLS?Test_Dobjects_bam
HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PSsomeamount
HAVE_JDBCTESTS?Test_PSlargebatchval
@@ -21,7 +22,8 @@ HAVE_JDBCTESTS?Test_Rpositioning
HAVE_JDBCTESTS?Test_Rtimedate
HAVE_JDBCTESTS?Test_Rsqldata
HAVE_JDBCTESTS?Test_Sbatching
-HAVE_JDBCCLIENT_JAR?Test_JdbcClient
+HAVE_JDBCCLIENT_JAR&!HAVE_SAMTOOLS?Test_JdbcClient
+HAVE_JDBCCLIENT_JAR&HAVE_SAMTOOLS?Test_JdbcClient_bam
HAVE_JDBCTESTS?BugConcurrent_clients_SF_1504657
HAVE_JDBCTESTS?BugConcurrent_sequences
HAVE_JDBCTESTS?BugDatabaseMetaData_Bug_3356
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh
b/sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+TST=${TST/_bam}
+$TSTSRCDIR/Test.SQL.sh ${*/_bam}
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err
b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'Test_Dobjects_bam` in directory 'sql/jdbc/tests` itself:
+
+
+# 15:28:55 >
+# 15:28:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37247" "--set"
"mapi_usock=/var/tmp/mtest-21432/.s.monetdb.37247" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_jdbc_tests" "--set"
"mal_listing=0"
+# 15:28:55 >
+
+# builtin opt gdk_dbpath = /home/robin/MonetDB/PREFIX/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 = 37247
+# cmdline opt mapi_usock = /var/tmp/mtest-21432/.s.monetdb.37247
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_jdbc_tests
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 15:28:56 >
+# 15:28:56 > "./Test_Dobjects_bam.SQL.sh" "Test_Dobjects_bam"
+# 15:28:56 >
+
+
+# 15:28:56 >
+# 15:28:56 > java Test_Dobjects
"jdbc:monetdb://robin-xps13:37247/mTests_sql_jdbc_tests?user=monetdb&password=monetdb"
+# 15:28:56 >
+
+
+# 15:28:56 >
+# 15:28:56 > "Done."
+# 15:28:56 >
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
@@ -0,0 +1,133 @@
+stdout of test 'Test_Dobjects_bam` in directory 'sql/jdbc/tests` itself:
+
+
+# 15:28:55 >
+# 15:28:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37247" "--set"
"mapi_usock=/var/tmp/mtest-21432/.s.monetdb.37247" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_jdbc_tests" "--set"
"mal_listing=0"
+# 15:28:55 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_jdbc_tests', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://robin-xps13:37247/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21432/.s.monetdb.37247
+# MonetDB/SQL 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: 19_cluster.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: 39_analytics.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 99_system.sql
+
+# 15:28:56 >
+# 15:28:56 > "./Test_Dobjects_bam.SQL.sh" "Test_Dobjects_bam"
+# 15:28:56 >
+
+
+# 15:28:56 >
+# 15:28:56 > java Test_Dobjects
"jdbc:monetdb://robin-xps13:37247/mTests_sql_jdbc_tests?user=monetdb&password=monetdb"
+# 15:28:56 >
+
+Resultset with 1 columns
+TABLE_TYPE
+mTests_sql_jdbc_tests
+Resultset with 3 columns
+TABLE_SCHEM TABLE_CATALOG TABLE_CAT
+bam mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+json mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+tmp mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+Resultset with 3 columns
+TABLE_SCHEM TABLE_CATALOG TABLE_CAT
+sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+Resultset with 10 columns
+TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
+mTests_sql_jdbc_tests sys _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys _tables SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys args SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys auths SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys connections SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys db_user_info SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys dependencies SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys functions SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys idxs SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys keys SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys objects SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys privileges SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys schemas SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys sequences SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys statistics SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys storagemodelinput SYSTEM TABLE null
null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys systemfunctions SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys triggers SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys types SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys user_role SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests tmp _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests tmp _tables SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests tmp idxs SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests tmp keys SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys environment SYSTEM VIEW create view
sys.environment as select * from sys.environment(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys optimizers SYSTEM VIEW create view
sys.optimizers as select * from sys.optimizers(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys querylog_calls SYSTEM VIEW create view
sys.querylog_calls as select * from sys.querylog_calls(); null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys querylog_catalog SYSTEM VIEW --
create table views for convenience
+create view sys.querylog_catalog as select * from sys.querylog_catalog();
null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys querylog_history SYSTEM VIEW create
view sys.querylog_history as
+select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
+from sys.querylog_catalog() qd, sys.querylog_calls() ql
+where qd.id = ql.id and qd.owner = user; null null null rowid
SYSTEM
+mTests_sql_jdbc_tests sys queue SYSTEM VIEW create view sys.queue
as select * from sys.queue(); null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys sessions SYSTEM VIEW create view
sys.sessions as select * from sys.sessions(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys storage SYSTEM VIEW create view sys.storage
as select * from sys.storage(); null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys storagemodel SYSTEM VIEW create view
sys.storagemodel as select * from sys.storagemodel(); null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys tables SYSTEM VIEW 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;
null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
+-- The auxillary column denotes the maximum space if all non-sorted columns
+-- would be augmented with a hash (rare situation)
+create view sys.tablestoragemodel
+as select "schema","table",max(count) as "count",
+ sum(columnsize) as columnsize,
+ sum(heapsize) as heapsize,
+ sum(hashes) as hashes,
+ sum(imprints) as imprints,
+ sum(case when sorted = false then 8 * count else 0 end) as auxillary
+from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys tracelog SYSTEM VIEW create view
sys.tracelog as select * from sys.tracelog(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS
"name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
+mTests_sql_jdbc_tests bam export TABLE null null null null
rowid SYSTEM
+mTests_sql_jdbc_tests bam files TABLE null null null null
rowid SYSTEM
+mTests_sql_jdbc_tests bam pg TABLE null null null null
rowid SYSTEM
+mTests_sql_jdbc_tests bam rg TABLE null null null null
rowid SYSTEM
+mTests_sql_jdbc_tests bam sq TABLE null null null null
rowid SYSTEM
+
+# 15:28:56 >
+# 15:28:56 > "Done."
+# 15:28:56 >
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+$TSTSRCDIR/Test_JdbcClient.SQL.sh
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+$TSTSRCDIR/Test_JdbcClient.SQL.sh
\ No newline at end of file
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh.src
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh.src
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/Test_JdbcClient.SQL.sh
\ No newline at end of file
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.err
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.err
@@ -0,0 +1,50 @@
+stderr of test 'Test_JdbcClient_bam` in directory 'sql/jdbc/tests` itself:
+
+
+# 16:02:31 >
+# 16:02:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31685" "--set"
"mapi_usock=/var/tmp/mtest-22539/.s.monetdb.31685" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_jdbc_tests" "--set"
"mal_listing=0"
+# 16:02:31 >
+
+# builtin opt gdk_dbpath = /home/robin/MonetDB/PREFIX/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 = 31685
+# cmdline opt mapi_usock = /var/tmp/mtest-22539/.s.monetdb.31685
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_jdbc_tests
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 16:02:31 >
+# 16:02:31 > "./Test_JdbcClient_bam.SQL.sh" "Test_JdbcClient_bam"
+# 16:02:31 >
+
+
+# 16:02:31 >
+# 16:02:31 > java nl.cwi.monetdb.client.JdbcClient -h robin-xps13 -p 31685 -d
mTests_sql_jdbc_tests -f
/home/robin/MonetDB/SOURCE/sql/jdbc/tests/JdbcClient_create_tables.sql
+# 16:02:31 >
+
+
+# 16:02:32 >
+# 16:02:32 > java nl.cwi.monetdb.client.JdbcClient -h robin-xps13 -p 31685 -d
mTests_sql_jdbc_tests -f
/home/robin/MonetDB/SOURCE/sql/jdbc/tests/JdbcClient_inserts_selects.sql
+# 16:02:32 >
+
+
+# 16:02:32 >
+# 16:02:32 > java nl.cwi.monetdb.client.JdbcClient -h robin-xps13 -p 31685 -d
mTests_sql_jdbc_tests -D
+# 16:02:32 >
+
+
+# 16:02:32 >
+# 16:02:32 > "Done."
+# 16:02:32 >
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.out
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.out
@@ -0,0 +1,291 @@
+stdout of test 'Test_JdbcClient_bam` in directory 'sql/jdbc/tests` itself:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
