Changeset: f2b06c5f474d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2b06c5f474d
Added Files:
sql/test/prepare/Tests/limit_in_prepare.Bug-2552.SQL.py
sql/test/prepare/Tests/limit_in_prepare.Bug-2552.sql
sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.err
sql/test/prepare/Tests/limit_in_prepare.Bug-2552.stable.out
Removed Files:
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.test
Modified Files:
sql/test/BugTracker-2010/Tests/All
sql/test/prepare/Tests/All
Branch: mtest
Log Message:
moved limit_in_prepare.Bug-2552
diffs (truncated from 712 to 300 lines):
diff --git a/sql/test/BugTracker-2010/Tests/All
b/sql/test/BugTracker-2010/Tests/All
--- a/sql/test/BugTracker-2010/Tests/All
+++ b/sql/test/BugTracker-2010/Tests/All
@@ -15,7 +15,6 @@ connectto.Bug-2548
copy-into-too-long-string.Bug-2358
in_column_exp.Bug-2561
multiple-updates-in-transaction.Bug-2543
-limit_in_prepare.Bug-2552
select_star.Bug-2563
delete_insert.Bug-2529
decimal_div_whole_nrs.Bug-2579
diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-CREATE TABLE "sys"."tbls" (
- "id" INTEGER,
- "name" VARCHAR(1024),
- "schema_id" INTEGER,
- "query" VARCHAR(2048),
- "type" SMALLINT,
- "system" BOOLEAN,
- "commit_action" SMALLINT,
- "readonly" BOOLEAN,
- "temporary" SMALLINT
-);
-COPY 40 RECORDS INTO "sys"."tbls" FROM stdin USING DELIMITERS E'\t',E'\n','"';
-2001 "schemas" 2000 NULL 0 true 0 false 0
-2007 "types" 2000 NULL 0 true 0 false 0
-2016 "functions" 2000 NULL 0 true 0 false 0
-2027 "args" 2000 NULL 0 true 0 false 0
-2036 "sequences" 2000 NULL 0 true 0 false 0
-2046 "dependencies" 2000 NULL 0 true 0 false 0
-2050 "connections" 2000 NULL 0 true 0 false 0
-2059 "_tables" 2000 NULL 0 true 0 false 0
-2068 "_columns" 2000 NULL 0 true 0 false 0
-2079 "keys" 2000 NULL 0 true 0 false 0
-2086 "idxs" 2000 NULL 0 true 0 false 0
-2091 "triggers" 2000 NULL 0 true 0 false 0
-2102 "objects" 2000 NULL 0 true 0 false 0
-2107 "_tables" 2106 NULL 0 true 2 false 0
-2116 "_columns" 2106 NULL 0 true 2 false 0
-2127 "keys" 2106 NULL 0 true 2 false 0
-2134 "idxs" 2106 NULL 0 true 2 false 0
-2139 "triggers" 2106 NULL 0 true 2 false 0
-2150 "objects" 2106 NULL 0 true 2 false 0
-5183 "tables" 2000 "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;" 1 true 0
false 0
-5193 "columns" 2000 "SELECT * FROM (SELECT p.* FROM
""sys"".""_columns"" AS p UNION ALL SELECT t.* FROM ""tmp"".""_columns"" AS t)
AS columns;" 1 true 0 false 0
-5209 "db_user_info" 2000 NULL 0 true 0 false 0
-5215 "users" 2000 "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"" ;" 1 true 0 false 0
-5219 "user_role" 2000 NULL 0 true 0 false 0
-5222 "auths" 2000 NULL 0 true 0 false 0
-5226 "privileges" 2000 NULL 0 true 0 false 0
-5399 "querylog_catalog" 2000 "-- create table views for
convenience\ncreate view sys.querylog_catalog as select * from
sys.querylog_catalog();" 1 true 0 false 0
-5411 "querylog_calls" 2000 "create view sys.querylog_calls as
select * from sys.querylog_calls();" 1 true 0 false 0
-5429 "querylog_history" 2000 "create view sys.querylog_history
as\nselect qd.*, ql.""start"",ql.""stop"", ql.arguments, ql.tuples, ql.run,
ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd,
sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;" 1
true 0 false 0
-5466 "tracelog" 2000 "create view sys.tracelog as select * from
sys.tracelog();" 1 true 0 false 0
-5591 "sessions" 2000 "create view sys.sessions as select * from
sys.sessions();" 1 true 0 false 0
-5671 "optimizers" 2000 "create view sys.optimizers as select * from
sys.optimizers();" 1 true 0 false 0
-5679 "environment" 2000 "create view sys.environment as select * from
sys.environment();" 1 true 0 false 0
-5717 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false 0
-6368 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false 0
-6380 "storagemodelinput" 2000 NULL 0 true 0 false 0
-6428 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false 0
-6438 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(""imprints"") as ""imprints"",\n\tsum(case when sorted = false
then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false 0
-6453 "statistics" 2000 NULL 0 true 0 false 0
-6616 "systemfunctions" 2000 NULL 0 true 0 false 0
-
-create table rr (id int);
-insert into rr values (1),(2),(3);
-prepare select * from rr limit ?;
-exec ** (1);
-
-drop table rr;
-
-prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tbls limit 24;
-exec ** ();
-
-drop table tbls;
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
+++ /dev/null
@@ -1,77 +0,0 @@
-stderr of test 'limit_in_prepare.Bug-2552` in directory
'sql/test/BugTracker-2010` itself:
-
-
-# 08:45:11 >
-# 08:45:11 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35663 --set
xrpc_port=48610 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
-# 08:45:11 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.38.0
-# builtin opt prefix = /ufs/niels/scratch/rc/Linux-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 = ${exec_prefix}/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/niels/scratch/rc/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/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/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 35663
-# cmdline opt xrpc_port = 48610
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
-
-# 08:45:11 >
-# 08:45:11 > mclient -lsql -ftest -i -e --host=alf --port=35663
-# 08:45:11 >
-
-
-# 08:45:11 >
-# 08:45:11 > Done.
-# 08:45:11 >
-
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
+++ /dev/null
@@ -1,140 +0,0 @@
-stdout of test 'limit_in_prepare.Bug-2552` in directory
'sql/test/BugTracker-2010` itself:
-
-
-# 08:45:11 >
-# 08:45:11 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35663 --set
xrpc_port=48610 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
-# 08:45:11 >
-
-# MonetDB server v5.20.0, based on kernel v1.38.0
-# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.754 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://alf.ins.cwi.nl:35663/
-# MonetDB/SQL module v2.38.0 loaded
-
-# 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_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.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
-
-# 22:28:06 >
-# 22:28:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10173" "--port=36549"
-# 22:28:06 >
-
-#CREATE TABLE "sys"."tbls" (
-# "id" INTEGER,
-# "name" VARCHAR(1024),
-# "schema_id" INTEGER,
-# "query" VARCHAR(2048),
-# "type" SMALLINT,
-# "system" BOOLEAN,
-# "commit_action" SMALLINT,
-# "readonly" BOOLEAN,
-# "temporary" SMALLINT
-#);
-#COPY 40 RECORDS INTO "sys"."tbls" FROM stdin USING DELIMITERS '\t','\n','"';
-#2001 "schemas" 2000 NULL 0 true 0 false 0
-#2007 "types" 2000 NULL 0 true 0 false 0
-#2016 "functions" 2000 NULL 0 true 0 false 0
-#2027 "args" 2000 NULL 0 true 0 false 0
-#2036 "sequences" 2000 NULL 0 true 0 false 0
-#2046 "dependencies" 2000 NULL 0 true 0 false 0
-#2050 "connections" 2000 NULL 0 true 0 false 0
-#2059 "_tables" 2000 NULL 0 true 0 false 0
-#2068 "_columns" 2000 NULL 0 true 0 false 0
-#2079 "keys" 2000 NULL 0 true 0 false 0
-#2086 "idxs" 2000 NULL 0 true 0 false 0
-[ 40 ]
-#create table rr (id int);
-#insert into rr values (1),(2),(3);
-[ 3 ]
-#prepare select * from rr limit ?;
-#prepare select * from rr limit ?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 6, 3, 1, 0, 2, 2 # length
-[ "int", 32, 0, "", "rr", "id" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
-#exec 5 (1);
-% sys.rr # table_name
-% id # name
-% int # type
-% 1 # length
-[ 1 ]
-#drop table rr;
-#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
-#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 8, 4, 1, 0, 4, 13 # length
-[ "varchar", 1024, 0, "", "tbls", "name" ]
-[ "int", 32, 0, "", "tbls", "schema_id" ]
-[ "varchar", 2048, 0, "", "tbls", "query" ]
-[ "smallint", 16, 0, "", "tbls", "type" ]
-[ "boolean", 1, 0, "", "tbls", "system" ]
-[ "smallint", 16, 0, "", "tbls", "commit_action" ]
-[ "boolean", 1, 0, "", "tbls", "readonly" ]
-[ "smallint", 16, 0, "", "tbls", "temporary" ]
-#exec 7 ();
-% sys.tbls, sys.tbls, sys.tbls, sys.tbls, sys.tbls,
sys.tbls, sys.tbls, sys.tbls # table_name
-% name, schema_id, query, type, system, commit_action,
readonly, temporary # name
-% varchar, int, varchar, smallint, boolean,
smallint, boolean, smallint # type
-% 12, 4, 169, 1, 5, 1, 5, 1 # length
-[ "schemas", 2000, NULL, 0, true, 0, false, 0 ]
-[ "types", 2000, NULL, 0, true, 0, false, 0 ]
-[ "functions", 2000, NULL, 0, true, 0, false, 0 ]
-[ "args", 2000, NULL, 0, true, 0, false, 0 ]
-[ "sequences", 2000, NULL, 0, true, 0, false, 0 ]
-[ "dependencies", 2000, NULL, 0, true, 0, false, 0
]
-[ "connections", 2000, NULL, 0, true, 0, false, 0
]
-[ "_tables", 2000, NULL, 0, true, 0, false, 0 ]
-[ "_columns", 2000, NULL, 0, true, 0, false, 0 ]
-[ "keys", 2000, NULL, 0, true, 0, false, 0 ]
-[ "idxs", 2000, NULL, 0, true, 0, false, 0 ]
-[ "triggers", 2000, NULL, 0, true, 0, false, 0 ]
-[ "objects", 2000, NULL, 0, true, 0, false, 0 ]
-[ "_tables", 2106, NULL, 0, true, 2, false, 0 ]
-[ "_columns", 2106, NULL, 0, true, 2, false, 0 ]
-[ "keys", 2106, NULL, 0, true, 2, false, 0 ]
-[ "idxs", 2106, NULL, 0, true, 2, false, 0 ]
-[ "triggers", 2106, NULL, 0, true, 2, false, 0 ]
-[ "objects", 2106, NULL, 0, true, 2, false, 0 ]
-[ "tables", 2000, "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;", 1,
true, 0, false, 0 ]
-[ "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS
p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1,
true, 0, false, 0 ]
-[ "db_user_info", 2000, NULL, 0, true, 0, false, 0
]
-[ "users", 2000, "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\" ;", 1, true, 0, false, 0
]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
