Changeset: a149ec32813b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a149ec32813b Added Files: sql/test/orderidx/Tests/simpletable.stable.out.32bit.Windows sql/test/orderidx/Tests/smalltable.stable.out.32bit.Windows Branch: Jul2017 Log Message:
Merge heads diffs (truncated from 307 to 300 lines): diff --git a/sql/test/orderidx/Tests/simpletable.stable.out.32bit.Windows b/sql/test/orderidx/Tests/simpletable.stable.out.32bit.Windows new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/simpletable.stable.out.32bit.Windows @@ -0,0 +1,187 @@ +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),(10),(7),(3),(1),(1),(-4),(-9),(-1); +[ 12 ] +#SELECT * FROM xtmp1; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +[ 10 ] +[ 7 ] +[ 3 ] +[ 1 ] +[ 1 ] +[ -4 ] +[ -9 ] +[ -1 ] +#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, 2, 1, 5, 1, 5, 1 # length +[ "sys", "xtmp1", "i", "int", "writable", 12, 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, 1, 3, 8, 2, 1, 5, 1, 5, 2 # length +[ "sys", "xtmp1", "i", "int", "readonly", 12, 0, false, 0, false, 60 ] +#SELECT * FROM xtmp1 WHERE i<0; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ -4 ] +[ -9 ] +[ -1 ] +#SELECT * FROM xtmp1 WHERE i<1; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ 0 ] +[ -4 ] +[ -9 ] +[ -1 ] +#SELECT * FROM xtmp1 WHERE i<2; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ 1 ] +[ 0 ] +[ 1 ] +[ 1 ] +[ -4 ] +[ -9 ] +[ -1 ] +#SELECT * FROM xtmp1 WHERE i<5; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +[ 3 ] +[ 1 ] +[ 1 ] +[ -4 ] +[ -9 ] +[ -1 ] +#SELECT * FROM xtmp1 WHERE i<8; +% sys.xtmp1 # table_name +% i # name +% int # type +% 2 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +[ 7 ] +[ 3 ] +[ 1 ] +[ 1 ] +[ -4 ] +[ -9 ] +[ -1 ] +#SELECT * FROM xtmp1 WHERE i>=0 AND i<8; +% sys.xtmp1 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 4 ] +[ 0 ] +[ 7 ] +[ 3 ] +[ 1 ] +[ 1 ] +#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.stable.out.32bit.Windows b/sql/test/orderidx/Tests/smalltable.stable.out.32bit.Windows new file mode 100644 --- /dev/null +++ b/sql/test/orderidx/Tests/smalltable.stable.out.32bit.Windows @@ -0,0 +1,110 @@ +stdout 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 > + +# 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 +# Start reading the write-ahead log 'sql_logs/sql/log.3' +# Finished reading the write-ahead log 'sql_logs/sql/log.3' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 11:38:23 > +# 11:38:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25471" "--port=33382" +# 11:38:23 > + +#create table xtmp2( i integer); +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp2'; +% .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", "xtmp2", "i", "int", "writable", 0, 0, false, 0, true, 0 ] +#alter table xtmp2 set read only; +#create ordered index sys_xtmp2_i_oidx on xtmp2(i); +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp2'; +% .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", "xtmp2", "i", "int", "readonly", 0, 0, false, 0, true, 0 ] +#select * from xtmp2 where i>=0 and i <8; +% sys.xtmp2 # table_name +% i # name +% int # type +% 1 # length +#create table xtmp3( i integer); +#insert into xtmp3 values(3); +[ 1 ] +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp3'; +% .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", "xtmp3", "i", "int", "writable", 1, 0, false, 0, true, 0 ] +#alter table xtmp3 set read only; +#create ordered index sys_xtmp3_i_oidx on xtmp3(i); +#select schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp3'; +% .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", "xtmp3", "i", "int", "readonly", 1, 0, false, 0, true, 0 ] +#select * from xtmp3 where i>=0 and i <8; +% sys.xtmp3 # table_name +% i # name +% int # type +% 1 # length +[ 3 ] +#CREATE TABLE xtmp4(i integer); +#INSERT INTO xtmp4 VALUES (3),(0),(2); +[ 3 ] +#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx FROM storage WHERE "table"= 'xtmp4'; +% .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", "xtmp4", "i", "int", "writable", 3, 0, false, 0, false, 0 ] +#ALTER TABLE xtmp4 SET read only; +#CREATE ORDERED INDEX sys_xtmp4_i_oidx ON xtmp4(i); +#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, sorted, orderidx from storage where "table"= 'xtmp4'; +% .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, 2 # length +[ "sys", "xtmp4", "i", "int", "readonly", 3, 0, false, 0, false, 24 ] +#SELECT * FROM xtmp4 WHERE i>=0 AND i<8; +% sys.xtmp4 # table_name +% i # name +% int # type +% 1 # length +[ 3 ] +[ 0 ] +[ 2 ] +#DROP INDEX sys_xtmp2_i_oidx; +#DROP INDEX sys_xtmp3_i_oidx; +#DROP INDEX sys_xtmp4_i_oidx; +#DROP TABLE xtmp2; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
