Changeset: 20ad77f3b1b5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20ad77f3b1b5 Removed Files: sql/test/pg_regress/Tests/oid.stable.out.oid32 sql/test/pg_regress/Tests/without_oid.stable.out.oid32 Branch: Dec2016 Log Message:
Remove old output files for 32-bit OIDs. Again. diffs (truncated from 420 to 300 lines): diff --git a/sql/test/pg_regress/Tests/oid.stable.out.oid32 b/sql/test/pg_regress/Tests/oid.stable.out.oid32 deleted file mode 100644 --- a/sql/test/pg_regress/Tests/oid.stable.out.oid32 +++ /dev/null @@ -1,237 +0,0 @@ -stdout of test 'oid` in directory 'sql/test/pg_regress` itself: - - -# 17:11:18 > -# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38959" "--set" "mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" -# 17:11:18 > - -# MonetDB 5 server v11.18.0 -# This is an unreleased version -# Serving database 'mTests_sql_test_pg_regress', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.356 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://uwakai.da.cwi.nl:38959/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - -Ready. - -# 17:11:19 > -# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" -# 17:11:19 > - -#-- -#-- OID -#-- -#CREATE TABLE OID_TBL(f1 oid); -#INSERT INTO OID_TBL(f1) VALUES ('1234'); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES ('1235'); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES ('987'); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES ('000'); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES (' '); -- in MonetDB this one is accepted -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES ('5 '); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES (' 10 '); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES (' 15 '); -[ 1 ] -#INSERT INTO OID_TBL(f1) VALUES (null); -[ 1 ] -#SELECT '' AS ten, OID_TBL.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL; -% .L2, sys.oid_tbl, sys.L6 # table_name -% ten, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 1235@0, "1235@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", NULL, NULL ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -[ "", NULL, NULL ] -#SELECT '' AS ten, OID_TBL.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL ORDER BY f1; -% .L2, sys.oid_tbl, sys.L6 # table_name -% ten, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", NULL, NULL ] -[ "", NULL, NULL ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -[ "", 987@0, "987@0" ] -[ "", 1234@0, "1234@0" ] -[ "", 1235@0, "1235@0" ] -#DELETE FROM OID_TBL WHERE f1 < '0'; -[ 0 ] -#SELECT '' AS one, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 = cast(1234 as oid); -% .L3, sys.o, sys.L7 # table_name -% one, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -#SELECT '' AS one, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 = 1234@0; -% .L2, sys.o, sys.L6 # table_name -% one, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -#SELECT '' AS one, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 = '1234'; -% .L2, sys.o, sys.L6 # table_name -% one, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -#SELECT '' AS seven, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <> cast(1234 as oid); -% .L3, sys.o, sys.L7 # table_name -% seven, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS seven, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <> 1234@0; -% .L2, sys.o, sys.L6 # table_name -% seven, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS seven, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <> '1234'; -% .L2, sys.o, sys.L6 # table_name -% seven, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS six, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <= cast(1234 as oid); -% .L3, sys.o, sys.L7 # table_name -% six, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS six, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <= 1234@0; -% .L2, sys.o, sys.L6 # table_name -% six, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS six, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 <= '1234'; -% .L2, sys.o, sys.L6 # table_name -% six, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS five, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 < cast(1234 as oid); -% .L3, sys.o, sys.L7 # table_name -% five, f1, oid2str # name -% char, oid, varchar # type -% 0, 5, 5 # length -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS five, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 < 1234@0; -% .L2, sys.o, sys.L6 # table_name -% five, f1, oid2str # name -% char, oid, varchar # type -% 0, 5, 5 # length -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS five, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 < '1234'; -% .L2, sys.o, sys.L6 # table_name -% five, f1, oid2str # name -% char, oid, varchar # type -% 0, 5, 5 # length -[ "", 987@0, "987@0" ] -[ "", 0@0, "0@0" ] -[ "", 5@0, "5@0" ] -[ "", 10@0, "10@0" ] -[ "", 15@0, "15@0" ] -#SELECT '' AS three, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 >= cast(1234 as oid); -% .L3, sys.o, sys.L7 # table_name -% three, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 1235@0, "1235@0" ] -#SELECT '' AS three, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 >= 1234@0; -% .L2, sys.o, sys.L6 # table_name -% three, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 1235@0, "1235@0" ] -#SELECT '' AS three, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 >= '1234'; -% .L2, sys.o, sys.L6 # table_name -% three, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1234@0, "1234@0" ] -[ "", 1235@0, "1235@0" ] -#SELECT '' AS two, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 > cast(1234 as oid); -% .L1, sys.o, sys.L2 # table_name -% two, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -#SELECT '' AS two, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 > 1234@0; -% .L, sys.o, sys.L1 # table_name -% two, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -#SELECT '' AS two, o.*, cast(f1 as varchar(30)) as oid2str FROM OID_TBL o WHERE o.f1 > '1234'; -% .L, sys.o, sys.L1 # table_name -% two, f1, oid2str # name -% char, oid, varchar # type -% 0, 6, 6 # length -[ "", 1235@0, "1235@0" ] -#DROP TABLE OID_TBL; - -# 17:11:19 > -# 17:11:19 > "Done." -# 17:11:19 > - diff --git a/sql/test/pg_regress/Tests/without_oid.stable.out.oid32 b/sql/test/pg_regress/Tests/without_oid.stable.out.oid32 deleted file mode 100644 --- a/sql/test/pg_regress/Tests/without_oid.stable.out.oid32 +++ /dev/null @@ -1,173 +0,0 @@ -stdout of test 'without_oid` in directory 'sql/test/pg_regress` itself: - - -# 15:25:36 > -# 15:25:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34869" "--set" "mapi_usock=/var/tmp/mtest-28380/.s.monetdb.34869" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 15:25:36 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_sql_test_pg_regress', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.356 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://uwakai.da.cwi.nl:34869/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-28380/.s.monetdb.34869 -# MonetDB/GIS module loaded -# 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: 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: 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: 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: 90_generator.sql -# loading sql script: 99_system.sql _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
