Changeset: 8fc583f5b5f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fc583f5b5f2
Added Files:
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.sql
Removed Files:
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092-src.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194-src.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257-src.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
Modified Files:
sql/backends/monet5/CMakeLists.txt
sql/test/BugDay_2005-10-06_2.9.3/Tests/All
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out
Branch: mtest
Log Message:
Updated tests to to not use mclient
diffs (truncated from 1103 to 300 lines):
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -28,6 +28,7 @@ set(include_sql_files
25_debug
26_sysmon
27_rejects
+ 30_describe
39_analytics
40_json
41_md5sum
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/All
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/All
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/All
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/All
@@ -26,7 +26,7 @@ drop_index.SF-929243
create_table_default.SF-931573
comment_only.SF-931619
set_types.SF-932360
-HAVE_JDBCCLIENT_JAR?not_null.SF-933194
+not_null.SF-933194
create_drop_schema.SF-933546
singleton_view.SF-933573
foreign_key_in_frontend_crashes_backend.SF-935578
@@ -37,7 +37,7 @@ multiple_select_cast.SF-938419
view_on_deleted_table.SF-938583
reserved_words.SF-939112
div_by_zero.SF-987304
-HAVE_JDBCCLIENT_JAR?type_dump_test.SF-989257
+type_dump_test.SF-989257
sesamstr_parser_error.SF-993366
simple_union.SF-1005596
BATpropcheck_error.SF-1012739
@@ -46,7 +46,7 @@ cast_to_interval.SF-1019079
error_in_sql_parser.SF-1019122
cross_product.SF-1122802
max_min_sum_null.SF-1123132
-alter_table_describe-mclient.SF-1146092
+alter_table_describe.SF-1146092
affected_rows_count.SF-1149757
var_char_cast_truncate.SF-1150907
foreign_key_null.SF-1164646
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
deleted file mode 100755
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
-
-prompt # $t $g
-echo on
-
-call %SQLCLIENT% -h%HOST% -p%MAPIPORT% -d%TSTDB% -i -e <
"%TSTSRCDIR%\alter_table_describe.SF-1146092-src.sql"
-
-@del .monetdb
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
deleted file mode 100755
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-Mlog -x "$SQLCLIENT -h$HOST -p$MAPIPORT -d$TSTDB -i -e <
\"$TSTSRCDIR/alter_table_describe.SF-1146092-src.sql\""
-
-rm -f .monetdb
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.err
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.err
deleted file mode 100644
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.err
+++ /dev/null
@@ -1,82 +0,0 @@
-stderr of test 'alter_table_describe-mclient.SF-1146092` in directory
'sql/test/BugDay_2005-10-06_2.9.3` itself:
-
-
-# 15:55:29 >
-# 15:55:29 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39554 --set
xrpc_port=49068 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugDay_2005-10-06_2.9.3" --set mal_listing=0 ; echo ;
echo Over..
-# 15:55:29 >
-
-# builtin opt gdk_arch = 64bitx86_64-pc-linux-gnu
-# builtin opt gdk_version = 1.38.4
-# builtin opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB
-# builtin opt monet_daemon = no
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_clients = 2
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_debug = 0
-# builtin opt standoff_ns =
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt sql_optimizer = default_pipe
-# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
-# cmdline opt config =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 39554
-# cmdline opt xrpc_port = 49068
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_test_BugDay_2005-10-06_2.9.3
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf)
-
-# 15:55:29 >
-# 15:55:29 > ./alter_table_describe-mclient.SF-1146092.SQL.sh
alter_table_describe-mclient.SF-1146092
-# 15:55:29 >
-
-
-# 15:55:29 >
-# 15:55:29 > Mtimeout -timeout 60 mclient -lsql -ftest -hvolund -p39554
-dmTests_src_test_BugDay_2005-10-06_2.9.3 -ftest -i -e <
"/net/volund.ins.cwi.nl/export/scratch1/fabian/monetdb/Jun2010/hgrepo/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092-src.sql"
-# 15:55:29 >
-
-
-# 15:55:30 >
-# 15:55:30 > Done.
-# 15:55:30 >
-
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out
deleted file mode 100644
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out
+++ /dev/null
@@ -1,237 +0,0 @@
-stdout of test 'alter_table_describe-mclient.SF-1146092` in directory
'sql/test/BugDay_2005-10-06_2.9.3` itself:
-
-
-# 15:55:29 >
-# 15:55:29 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39554 --set
xrpc_port=49068 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugDay_2005-10-06_2.9.3" --set mal_listing=0 ; echo ;
echo Over..
-# 15:55:29 >
-
-# MonetDB server v5.20.4, based on kernel v1.38.4
-# Not released
-# Serving database 'mTests_src_test_BugDay_2005-10-06_2.9.3', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Found 7.751 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:39554/
-# MonetDB/SQL module v2.38.4 loaded
-# MonetDB/GIS module v0.18.0 loaded
-
-
-
-# 16:01:58 >
-# 16:01:58 > ./alter_table_describe-mclient.SF-1146092.SQL.sh
alter_table_describe-mclient.SF-1146092
-# 16:01:58 >
-
-
-# 16:01:58 >
-# 16:01:58 > Mtimeout -timeout 60 mclient -lsql -ftest -half -p35388
-dmTests_test_BugDay_2005-10-06_2.9.3 -ftest -i -e <
"/net/alf.ins.cwi.nl/export/scratch1/niels/current/clean/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092-src.sql"
-# 16:01:58 >
-
-#CREATE TABLE "experiment" (
-# "exp_id" int PRIMARY KEY,
-# "user_id" int,
-# "config_id" int,
-# "table_id" int,
-# "result_id" int
-#);
-#CREATE TABLE "tapestry_user" (
-# "user_id" int PRIMARY KEY,
-# "name" varchar(25),
-# "email" varchar(50),
-# "createdate" date,
-# "passwd" varchar(50)
-#);
-#CREATE TABLE "config" (
-# "config_id" int PRIMARY KEY,
-# "name" varchar(25),
-# "target_id" int,
-# "sysinf_id" int
-#);
-#CREATE TABLE "tapestry_table" (
-# "table_id" int PRIMARY KEY,
-# "nrrows" int,
-# "nrcols" int,
-# "seed" int,
-# "fast" int
-#);
-#CREATE TABLE "result" (
-# "result_id" int PRIMARY KEY,
-# "type" varchar(10),
-# "description" varchar(256)
-#);
-#CREATE TABLE "target" (
-# "target_id" int PRIMARY KEY,
-# "name" varchar(50),
-# "permission" varchar(10),
-# "comment" varchar(256)
-#);
-#CREATE TABLE "sysinf" (
-# "sysinf_id" int PRIMARY KEY,
-# "platform_id" int,
-# "cpu_id" int,
-# "memory_id" int,
-# "disk_id" int
-#);
-#CREATE TABLE "platform" (
-# "platform_id" int PRIMARY KEY,
-# "name" varchar(50),
-# "comment" varchar(256)
-#);
-#CREATE TABLE "cpu" (
-# "cpu_id" int PRIMARY KEY,
-# "type" varchar(50)
-#);
-#CREATE TABLE "memory" (
-# "memory_id" int PRIMARY KEY,
-# "type" varchar(50),
-# "size" int
-#);
-#CREATE TABLE "disk" (
-# "disk_id" int PRIMARY KEY,
-# "type" varchar(50),
-# "size" int
-#);
-#CREATE TABLE "query_walk" (
-# "walk_id" int PRIMARY KEY,
-# "begin_x" int,
-# "begin_y" int,
-# "nr_runs" int,
-# "nr_steps" int,
-# "step_size" int,
-# "end_x" int,
-# "end_y" int
-#);
-#ALTER TABLE "experiment" ADD FOREIGN KEY ("user_id")
-# REFERENCES "tapestry_user" ("user_id");
-#ALTER TABLE "experiment" ADD FOREIGN KEY ("config_id")
-# REFERENCES "config" ("config_id");
-#ALTER TABLE "experiment" ADD FOREIGN KEY ("table_id")
-# REFERENCES "tapestry_table" ("table_id");
-#ALTER TABLE "experiment" ADD FOREIGN KEY ("result_id")
-# REFERENCES "result" ("result_id");
-#ALTER TABLE "config" ADD FOREIGN KEY ("target_id")
-# REFERENCES "target" ("target_id");
-#ALTER TABLE "config" ADD FOREIGN KEY ("sysinf_id")
-# REFERENCES "sysinf" ("sysinf_id");
-#ALTER TABLE "sysinf" ADD FOREIGN KEY ("platform_id")
-# REFERENCES "platform" ("platform_id");
-#ALTER TABLE "sysinf" ADD FOREIGN KEY ("cpu_id")
-# REFERENCES "cpu" ("cpu_id");
-#ALTER TABLE "sysinf" ADD FOREIGN KEY ("memory_id")
-# REFERENCES "memory" ("memory_id");
-#ALTER TABLE "sysinf" ADD FOREIGN KEY ("disk_id")
-# REFERENCES "disk" ("disk_id");
-CREATE TABLE "sys"."experiment" (
- "exp_id" INTEGER NOT NULL,
- "user_id" INTEGER,
- "config_id" INTEGER,
- "table_id" INTEGER,
- "result_id" INTEGER,
- CONSTRAINT "experiment_exp_id_pkey" PRIMARY KEY ("exp_id"),
- CONSTRAINT "experiment_config_id_fkey" FOREIGN KEY ("config_id")
REFERENCES "sys"."config" ("config_id"),
- CONSTRAINT "experiment_result_id_fkey" FOREIGN KEY ("result_id")
REFERENCES "sys"."result" ("result_id"),
- CONSTRAINT "experiment_table_id_fkey" FOREIGN KEY ("table_id")
REFERENCES "sys"."tapestry_table" ("table_id"),
- CONSTRAINT "experiment_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES
"sys"."tapestry_user" ("user_id")
-);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
