Changeset: 0163b866b68f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0163b866b68f
Removed Files:
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.err
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.sql.src
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.err
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.test
Modified Files:
sql/test/bugs/Tests/All
Branch: default
Log Message:
Use unicode_varchar-bug-sf-1041324 test for this bug. The mapi and jdbc clients
are no longer required
diffs (273 lines):
diff --git a/sql/test/bugs/Tests/All b/sql/test/bugs/Tests/All
--- a/sql/test/bugs/Tests/All
+++ b/sql/test/bugs/Tests/All
@@ -46,11 +46,10 @@ trimtest-bug-sf-1023588
savepoint_rollback-bug-sf-1023652
select_orderby_alias-bug-sf-1024615
like-bug-sf-1031435
-unicode_varchar-bug-sf-1041324_MapiClient
-HAVE_JDBCCLIENT_JAR?unicode_varchar-bug-sf-1041324_JdbcClient
+unicode_varchar-bug-sf-1041324
unique-bug-sf-1043512
# like-bug-sf-1043521 # covered by like_tests
-HAVE_JDBCCLIENT_JAR?except-union-intersect-bug-sf-1146079
+except-union-intersect-bug-sf-1146079
timestamp_comparison-bug-sf-1158581
selectlist_subquery-sf-1208599
interval_data_commutative_add_bug-sf-1263928
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat
deleted file mode 100755
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
-
-prompt # $t $g
-echo on
-
-call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\unicode_varchar-bug-sf-1041324.sql"
-
-@del .monetdb
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
deleted file mode 100755
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`"
-export LC_ALL
-
-java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
"$RELSRCDIR/unicode_varchar-bug-sf-1041324.sql"
-
-rm -f .monetdb
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.err
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.err
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.err
+++ /dev/null
@@ -1,22 +0,0 @@
-stderr of test 'unicode_varchar-bug-sf-1041324_JdbcClient` in directory
'sql/test/bugs` itself:
-
-
-# 19:28:39 >
-# 19:28:39 > Mtimeout -timeout 180 Mserver
"--config=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/var/tmp/_4.4.0_PREFIX_SQL_GNU_32_d_--enable-debug_/lib/MonetDB:/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/lib/MonetDB"
--set
"gdk_dbfarm=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/var/MonetDB/dbfarm"
--set
"sql_logdir=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/var/MonetDB/log"
--set mapi_port=46000 --set sql_port=56954 --set monet_prompt= --trace
"--dbname=mTests_src_test_bugs"
"/var/tmp/_4.4.0_BUILD_SQL_GNU_32_d_--enable-debug_/src/backends/monet4/sql_server.mil"
; echo ; echo Over..
-# 19:28:39 >
-
-
-# 19:28:41 >
-# 19:28:41 > Mtimeout -timeout 60
./unicode_varchar-bug-sf-1041324_JdbcClient.SQL bug-sf-1041324_JdbcClient
-# 19:28:41 >
-
-
-# 19:59:40 >
-# 19:59:40 > Mtimeout -timeout 9 java -jar
/var/tmp/_4.4.0_BUILD_SQL_GNU_32_d_--enable-debug_/src/jdbc/MonetDB_JDBC.jar -p
50830 -f
../../../../../../../ufs/manegold/Monet/4.4.0/sql/src/test/bugs/Tests/../bug-sf-1041324_weird-char.sql
-# 19:59:40 >
-
-
-# 19:59:41 >
-# 19:59:41 > Done.
-# 19:59:41 >
-
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
+++ /dev/null
@@ -1,52 +0,0 @@
-stdout of test 'unicode_varchar-bug-sf-1041324_JdbcClient` in directory
'sql/test/bugs` itself:
-
-
-# 14:10:32 >
-# 14:10:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36720" "--set"
"mapi_usock=/var/tmp/mtest-4024/.s.monetdb.36720" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_sql_test_bugs" "--set"
"embedded_r=yes"
-# 14:10:32 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_bugs', 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://madrid.da.cwi.nl:36720/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-4024/.s.monetdb.36720
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.25'
-# Finished reading the write-ahead log 'sql_logs/sql/log.25'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 14:10:32 >
-# 14:10:32 > "./unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh"
"unicode_varchar-bug-sf-1041324_JdbcClient"
-# 14:10:32 >
-
-
-# 14:10:32 >
-# 14:10:32 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
madrid -p 36720 -d mTests_sql_test_bugs -f
"../../../../../../../../scratch1/sjoerd/src/MonetDB/devel/sql/test/bugs/Tests/../unicode_varchar-bug-sf-1041324.sql"
-# 14:10:32 >
-
-+--------------------------------------------------------------------------------------------------------------------------------+
-| %2
|
-+================================================================================================================================+
-|
http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija
|
-+--------------------------------------------------------------------------------------------------------------------------------+
-1 row
-+-----------------------+
-| %2 |
-+=======================+
-| SAVE 25¢ ON ICE CREAM |
-+-----------------------+
-1 row
-
-# 14:10:33 >
-# 14:10:33 > "Done."
-# 14:10:33 >
-
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
deleted file mode 100644
---
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
+++ /dev/null
@@ -1,41 +0,0 @@
-stdout of test 'unicode_varchar-bug-sf-1041324_JdbcClient` in directory
'sql/test/bugs` itself:
-
-
-# 01:18:14 >
-# 01:18:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30476" "--set" "monet_prompt="
"--forcemito"
"--dbpath=C:\monettesting\Mic-Windows7-i386-installer-43dd41a6d90e-Jul2017\tests\sql\dbfarm\mTests_sql_test_bugs"
"--dbextra=C:\monettesting\Mic-Windows7-i386-installer-43dd41a6d90e-Jul2017\tests\sql\dbfarm\mTests_sql_test_bugs_transient"
-# 01:18:14 >
-
-# MonetDB 5 server v11.27.6 "Jul2017-43dd41a6d90e"
-# Serving database 'mTests_sql_test_bugs', using 4 threads
-# Compiled for i686-pc-winnt/32bit
-# Found 3.991 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://lab03:30476/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 01:18:14 >
-# 01:18:14 > ".\unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat"
"unicode_varchar-bug-sf-1041324_JdbcClient"
-# 01:18:14 >
-
-
-# 1:18:14.82 > call java nl.cwi.monetdb.client.JdbcClient -h LAB03 -p 30476
-d mTests_sql_test_bugs -f
"..\..\..\..\..\..\MonetDB\sql\test\bugs\Tests\..\unicode_varchar-bug-sf-1041324.sql"
-=+----------------------------------------------------------------------------------------------------------------------------------+
-| %2
|
-=+==================================================================================================================================+
-|
http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija
|
-=+----------------------------------------------------------------------------------------------------------------------------------+
-1 row
-=+------------------------+
-| %2 |
-=+========================+
-| SAVE 25¢ ON ICE CREAM |
-=+------------------------+
-1 row
-
-# 01:18:15 >
-# 01:18:15 > "Done."
-# 01:18:15 >
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.sql.src
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.sql.src
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.sql.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/unicode_varchar-bug-sf-1041324.sql
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.err
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.err
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.err
+++ /dev/null
@@ -1,17 +0,0 @@
-stderr of test 'unicode_varchar-bug-sf-1041324_MapiClient` in directory
'sql/test/bugs` itself:
-
-
-# 19:03:17 >
-# 19:03:17 > Mtimeout -timeout 180 Mserver
"--config=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/var/tmp/_4.4.0_PREFIX_SQL_GNU_32_d_--enable-debug_/lib/MonetDB:/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/lib/MonetDB"
--set
"gdk_dbfarm=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/var/MonetDB/dbfarm"
--set
"sql_logdir=/var/tmp/_4.4.0_PREFIX_MONETDB_GNU_32_d_--enable-debug_/var/MonetDB/log"
--set mapi_port=40341 --set sql_port=54072 --set monet_prompt= --trace
"--dbname=mTests_src_test_bugs"
"/var/tmp/_4.4.0_BUILD_SQL_GNU_32_d_--enable-debug_/src/backends/monet4/sql_server.mil"
; echo ; echo Over..
-# 19:03:17 >
-
-
-# 19:03:19 >
-# 19:03:19 > Mtimeout -timeout 60 MapiClient --language=sql -u monetdb -P
monetdb --host=draco --port=54072 <
unicode_varchar-bug-sf-1041324_MapiClient.sql
-# 19:03:19 >
-
-
-# 19:03:19 >
-# 19:03:19 > Done.
-# 19:03:19 >
-
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
+++ /dev/null
@@ -1,43 +0,0 @@
-stdout of test 'unicode_varchar-bug-sf-1041324_MapiClient` in directory
'sql/test/bugs` itself:
-
-
-# 15:13:44 >
-# 15:13:44 > Mtimeout -timeout 180 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set mapi_port=38254 --set xrpc_port=43092 --set
monet_prompt= --trace "--dbname=mTests_src_test_bugs" --dbinit=' include sql;'
; echo ; echo Over..
-# 15:13:44 >
-
-
-
-# MonetDB server v5.1.0, based on kernel v1.19.0
-# Serving database 'mTests_src_test_bugs'
-# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://pegasus.ins.cwi.nl:38254/
-# MonetDB/SQL module v2.19.0 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 11:55:44 >
-# 11:55:44 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35185 < unicode_varchar-bug-sf-1041324_MapiClient.sql
-# 11:55:44 >
-
-#select
'http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija';
-% .%2 # table_name
-% %2 # name
-% char # type
-% 126 # length
-[
"http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija";
]
-#select 'SAVE 25¢ ON ICE CREAM';
-% .%2 # table_name
-% %2 # name
-% char # type
-% 21 # length
-[ "SAVE 25¢ ON ICE CREAM" ]
-
-# 12:55:03 >
-# 12:55:03 > Done.
-# 12:55:03 >
-
diff --git a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.test
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.test
deleted file mode 100644
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.test
+++ /dev/null
@@ -1,11 +0,0 @@
-query T rowsort
-select
'http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija'
-----
-http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi@a+produkcija
-
-query T rowsort
-select 'SAVE 25¢ ON ICE CREAM'
-----
-SAVE 25@ ON ICE CREAM
-
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
