Changeset: 343e57209700 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=343e57209700
Removed Files:
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:
clients/examples/php/sqlsample.php
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
sql/test/BugConstraints/add_constraint_1643522.sql
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.sql
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.sql
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
sql/test/DropCascade/Tests/drop_columns_cascade.sql
sql/test/DropCascade/Tests/drop_pkey_cascade.sql
sql/test/Tests/All
sql/test/bugs/Tests/crash_order_by.sql
sql/test/bugs/Tests/crash_order_by.stable.err
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/simple_view.sql
sql/test/bugs/Tests/simple_view.stable.out
sql/test/bugs/insert_delete-bug-sf-904025.sql
sql/test/leaks/Tests/All
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: bamloader
Log Message:
Fixing tests: try not to depend on sys.tables, or add conditional.
Mostly, don't use sys.tables as an easy table with contents.
In some cases, we need a conditional to turn off tests if samtools is
enabled. Also, one test is taken from changeset b95d9e5134d0.
diffs (truncated from 2122 to 300 lines):
diff --git a/clients/examples/php/sqlsample.php
b/clients/examples/php/sqlsample.php
--- a/clients/examples/php/sqlsample.php
+++ b/clients/examples/php/sqlsample.php
@@ -23,12 +23,12 @@
require 'monetdb/php_monetdb.php';
$db = monetdb_connect("sql", "localhost", $argv[1], "monetdb", "monetdb",
$argv[2]);
-$tables = monetdb_query('SELECT name FROM tables');
+$tables = monetdb_query('SELECT name FROM tables LIMIT 10');
for ($i = 0; $line = @monetdb_fetch_assoc($tables); $i++) {
print($line['name']."\n");
}
-$result = monetdb_query('SELECT name, schema_id, query, type, system,
commit_action, readonly, temporary FROM tables');
+$result = monetdb_query('SELECT name, schema_id, query, type, system,
commit_action, readonly, temporary FROM tables LIMIT 10');
$cols = monetdb_num_fields($result);
for ($i = 0; $i < $cols; $i++) {
print(monetdb_field_name($result, $i)."\t");
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
@@ -22,8 +22,7 @@ HAVE_JDBCTESTS?Test_Rpositioning
HAVE_JDBCTESTS?Test_Rtimedate
HAVE_JDBCTESTS?Test_Rsqldata
HAVE_JDBCTESTS?Test_Sbatching
-HAVE_JDBCCLIENT_JAR&!HAVE_SAMTOOLS?Test_JdbcClient
-HAVE_JDBCCLIENT_JAR&HAVE_SAMTOOLS?Test_JdbcClient_bam
+HAVE_JDBCCLIENT_JAR?Test_JdbcClient
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.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
@@ -68,6 +68,11 @@ 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 bam export SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests bam files SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests bam pg SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests bam rg SYSTEM TABLE null null null
null rowid SYSTEM
+mTests_sql_jdbc_tests bam sq SYSTEM TABLE null null null
null rowid SYSTEM
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
@@ -122,12 +127,8 @@ as select "schema","table",max(count) as
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 >
+# 21:45:39 >
+# 21:45:39 > "Done."
+# 21:45:39 >
+
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.SQL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
--- a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
--- a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.sh.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$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
deleted file mode 100644
--- a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.err
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
--- a/sql/jdbc/tests/Tests/Test_JdbcClient_bam.stable.out
+++ /dev/null
@@ -1,291 +0,0 @@
-stdout 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 >
-
-# 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:31685/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22539/.s.monetdb.31685
-# 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
-
-# 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 >
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-Operation successful
-
-
-# 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 >
-
-Operation successful
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-1 affected row
-
-+----+---------+-----------+--------+----------+
-| id | subject | predicate | object | explicit |
-+====+=========+===========+========+==========+
-| 1 | 1 | 1 | 1 | false |
-| 2 | 1 | 1 | 2 | false |
-| 3 | 1 | 2 | 1 | false |
-| 4 | 2 | 1 | 1 | false |
-| 5 | 1 | 2 | 2 | false |
-| 6 | 2 | 2 | 1 | false |
-| 7 | 2 | 2 | 2 | false |
-+----+---------+-----------+--------+----------+
-7 rows
-
-+----+---------+-----------+--------+
-| id | subject | predicate | object |
-+====+=========+===========+========+
-| 1 | 1 | 1 | 1 |
-| 2 | 2 | 2 | 2 |
-| 3 | 1 | 2 | 2 |
-| 4 | 2 | 2 | 1 |
-| 5 | 2 | 1 | 1 |
-| 6 | 1 | 2 | 1 |
-| 7 | 1 | 1 | 2 |
-+----+---------+-----------+--------+
-7 rows
-
-Operation successful
-
-
-# 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 >
-
-START TRANSACTION;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
