Changeset: 05566f4d9ed8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05566f4d9ed8 Added Files: sql/test/orderidx/Tests/simpletable.stable.err sql/test/orderidx/Tests/simpletable.stable.out sql/test/orderidx/Tests/smalltable.stable.err sql/test/orderidx/Tests/smalltable.stable.out Modified Files: sql/test/orderidx/Tests/simpletable.sql sql/test/orderidx/Tests/smalltable.sql Branch: leftmart Log Message:
Fix tests and approve output. diffs (truncated from 383 to 300 lines): diff --git a/sql/test/orderidx/Tests/simpletable.sql b/sql/test/orderidx/Tests/simpletable.sql --- a/sql/test/orderidx/Tests/simpletable.sql +++ b/sql/test/orderidx/Tests/simpletable.sql @@ -2,11 +2,11 @@ create table xtmp1( i integer); insert into xtmp1 values (1),(2),(4),(0); select * from xtmp1; -select * from storage where "table"= 'xtmp1'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table" = 'xtmp1'; alter table xtmp1 set READ ONLY; create ordered index sys_xtmp1_i_oidx on xtmp1 (i); -select * from storage where "table"= 'xtmp1'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table" = 'xtmp1'; select * from xtmp1 where i <0; select * from xtmp1 where i <1; @@ -17,4 +17,5 @@ select * from xtmp1 where i <8; select * from xtmp1 where i>=0 and i <8; select * from xtmp1 where i>=2 and i <=2; +drop index sys_xtmp1_i_oidx; drop table xtmp1; diff --git a/sql/test/orderidx/Tests/simpletable.stable.err b/sql/test/orderidx/Tests/simpletable.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/simpletable.stable.err @@ -0,0 +1,37 @@ +stderr of test 'simpletable` in directory 'sql/test/orderidx` itself: + + +# 11:38:21 > +# 11:38:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33382" "--set" "mapi_usock=/var/tmp/mtest-25471/.s.monetdb.33382" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-mosaic/var/MonetDB/mTests_sql_test_orderidx" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 11:38:21 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-mosaic/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 = 33382 +# cmdline opt mapi_usock = /var/tmp/mtest-25471/.s.monetdb.33382 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-mosaic/var/MonetDB/mTests_sql_test_orderidx +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 11:38:22 > +# 11:38:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25471" "--port=33382" +# 11:38:22 > + + +# 11:38:22 > +# 11:38:22 > "Done." +# 11:38:22 > + diff --git a/sql/test/orderidx/Tests/simpletable.stable.out b/sql/test/orderidx/Tests/simpletable.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/simpletable.stable.out @@ -0,0 +1,152 @@ +stdout of test 'simpletable` in directory 'sql/test/orderidx` itself: + + +# 11:38:21 > +# 11:38:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33382" "--set" "mapi_usock=/var/tmp/mtest-25471/.s.monetdb.33382" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-mosaic/var/MonetDB/mTests_sql_test_orderidx" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 11:38:21 > + +# MonetDB 5 server v11.22.0 (hg id: 9e2e28139f1b+) +# This is an unreleased version +# Serving database 'mTests_sql_test_orderidx', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.590 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.ins.cwi.nl:33382/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25471/.s.monetdb.33382 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R 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: 17_temporal.sql +# loading sql script: 18_index.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: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 11:38:22 > +# 11:38:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25471" "--port=33382" +# 11:38:22 > + +#create table xtmp1( i integer); +#insert into xtmp1 values (1),(2),(4),(0); +[ 4 ] +#select * from xtmp1; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table" = 'xtmp1'; +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx # name +% clob, clob, clob, clob, clob, bigint, bigint, boolean, bigint, boolean, bigint # type +% 3, 5, 1, 3, 8, 1, 1, 5, 1, 5, 1 # length +[ "sys", "xtmp1", "i", "int", "writable", 4, 0, false, 0, false, 0 ] +#alter table xtmp1 set READ ONLY; +#create ordered index sys_xtmp1_i_oidx on xtmp1 (i); +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table" = 'xtmp1'; +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx # name +% clob, clob, clob, clob, clob, bigint, bigint, boolean, bigint, boolean, bigint # type +% 3, 5, 16, 3, 8, 1, 1, 5, 1, 5, 1 # length +[ "sys", "xtmp1", "i", "int", "readonly", 4, 0, false, 0, false, 0 ] +[ "sys", "xtmp1", "sys_xtmp1_i_oidx", "oid", "readonly", 4, 0, false, 0, false, 0 ] +#select * from xtmp1 where i <0; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +#select * from xtmp1 where i <1; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 0 ] +#select * from xtmp1 where i <2; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 0 ] +#select * from xtmp1 where i <5; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +#select * from xtmp1 where i <8; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +#select * from xtmp1 where i>=0 and i <8; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +#select * from xtmp1 where i>=2 and i <=2; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 2 ] +#drop index sys_xtmp1_i_oidx; +#drop table xtmp1; + +# 11:38:22 > +# 11:38:22 > "Done." +# 11:38:22 > + diff --git a/sql/test/orderidx/Tests/smalltable.sql b/sql/test/orderidx/Tests/smalltable.sql --- a/sql/test/orderidx/Tests/smalltable.sql +++ b/sql/test/orderidx/Tests/smalltable.sql @@ -1,19 +1,21 @@ -- test robustness against small tables create table xtmp2( i integer); -select * from storage where "table"= 'xtmp2'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp2'; alter table xtmp2 set read only; create ordered index sys_xtmp2_i_oidx on xtmp2(i); -select * from storage where "table"= 'xtmp2'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp2'; select * from xtmp2 where i>=0 and i <8; create table xtmp3( i integer); insert into xtmp3 values(3); -select * from storage where "table"= 'xtmp3'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp3'; alter table xtmp3 set read only; create ordered index sys_xtmp3_i_oidx on xtmp3(i); -select * from storage where "table"= 'xtmp3'; +select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp3'; select * from xtmp3 where i>=0 and i <8; +drop index sys_xtmp2_i_oidx; +drop index sys_xtmp3_i_oidx; drop table xtmp2; drop table xtmp3; diff --git a/sql/test/orderidx/Tests/smalltable.stable.err b/sql/test/orderidx/Tests/smalltable.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/smalltable.stable.err @@ -0,0 +1,37 @@ +stderr of test 'smalltable` in directory 'sql/test/orderidx` itself: + + +# 11:38:22 > +# 11:38:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33382" "--set" "mapi_usock=/var/tmp/mtest-25471/.s.monetdb.33382" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-mosaic/var/MonetDB/mTests_sql_test_orderidx" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 11:38:22 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-mosaic/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 = 33382 +# cmdline opt mapi_usock = /var/tmp/mtest-25471/.s.monetdb.33382 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-mosaic/var/MonetDB/mTests_sql_test_orderidx +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 11:38:23 > +# 11:38:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25471" "--port=33382" +# 11:38:23 > + + +# 11:38:23 > +# 11:38:23 > "Done." +# 11:38:23 > + diff --git a/sql/test/orderidx/Tests/smalltable.stable.out b/sql/test/orderidx/Tests/smalltable.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/smalltable.stable.out @@ -0,0 +1,85 @@ +stdout of test 'smalltable` in directory 'sql/test/orderidx` itself: + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
